From 778d2fa16ad84aac64f3994e175b15c28fc5b163 Mon Sep 17 00:00:00 2001 From: Godmar Back Date: Sun, 7 Jan 2007 20:55:28 +0000 Subject: [PATCH] - adjustments to scores for P3 as discussed. - increased problem size for page-* tests to force eviction --- src/tests/vm/Grading | 10 +++++----- src/tests/vm/Rubric.functionality | 20 ++++++++++---------- src/tests/vm/child-linear.c | 4 ++-- src/tests/vm/page-linear.c | 4 ++-- src/tests/vm/page-parallel.c | 4 ++-- src/tests/vm/page-parallel.ck | 2 ++ 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/tests/vm/Grading b/src/tests/vm/Grading index cb8d7cb..f0c2c13 100644 --- a/src/tests/vm/Grading +++ b/src/tests/vm/Grading @@ -5,8 +5,8 @@ # functionality should work too, and it's easy to screw it up, thus # the equal weight placed on each. -25% tests/vm/Rubric.functionality -25% tests/vm/Rubric.robustness -12.5% tests/userprog/Rubric.functionality -12.5% tests/userprog/Rubric.robustness -25% tests/filesys/base/Rubric +50% tests/vm/Rubric.functionality +15% tests/vm/Rubric.robustness +10% tests/userprog/Rubric.functionality +5% tests/userprog/Rubric.robustness +20% tests/filesys/base/Rubric diff --git a/src/tests/vm/Rubric.functionality b/src/tests/vm/Rubric.functionality index 8338e7f..8a86612 100644 --- a/src/tests/vm/Rubric.functionality +++ b/src/tests/vm/Rubric.functionality @@ -1,18 +1,18 @@ Functionality of virtual memory subsystem: -- Test page table. -4 pt-grow-stack -2 pt-grow-stk-sc -6 pt-big-stk-obj -6 pt-grow-pusha +- Test stack growth. +3 pt-grow-stack +3 pt-grow-stk-sc +3 pt-big-stk-obj +3 pt-grow-pusha - Test paging behavior. -2 page-linear +3 page-linear 3 page-parallel 3 page-shuffle -5 page-merge-seq -5 page-merge-par -5 page-merge-mm -5 page-merge-stk +4 page-merge-seq +4 page-merge-par +4 page-merge-mm +4 page-merge-stk - Test "mmap" system call. 2 mmap-read diff --git a/src/tests/vm/child-linear.c b/src/tests/vm/child-linear.c index 7515e4e..eca3e3f 100644 --- a/src/tests/vm/child-linear.c +++ b/src/tests/vm/child-linear.c @@ -1,5 +1,5 @@ /* Child process of page-parallel. - Encrypts 128 kB of zeros, then decrypts it, and ensures that + Encrypts 1 MB of zeros, then decrypts it, and ensures that the zeros are back. */ #include @@ -9,7 +9,7 @@ const char *test_name = "child-linear"; -#define SIZE (128 * 1024) +#define SIZE (1024 * 1024) static char buf[SIZE]; int diff --git a/src/tests/vm/page-linear.c b/src/tests/vm/page-linear.c index 12375a7..652a47b 100644 --- a/src/tests/vm/page-linear.c +++ b/src/tests/vm/page-linear.c @@ -1,4 +1,4 @@ -/* Encrypts, then decrypts, 1 MB of memory and verifies that the +/* Encrypts, then decrypts, 2 MB of memory and verifies that the values are as they should be. */ #include @@ -6,7 +6,7 @@ #include "tests/lib.h" #include "tests/main.h" -#define SIZE (1024 * 1024) +#define SIZE (2 * 1024 * 1024) static char buf[SIZE]; diff --git a/src/tests/vm/page-parallel.c b/src/tests/vm/page-parallel.c index 69ec619..9d619e0 100644 --- a/src/tests/vm/page-parallel.c +++ b/src/tests/vm/page-parallel.c @@ -1,10 +1,10 @@ -/* Runs 3 child-linear processes at once. */ +/* Runs 4 child-linear processes at once. */ #include #include "tests/lib.h" #include "tests/main.h" -#define CHILD_CNT 3 +#define CHILD_CNT 4 void test_main (void) diff --git a/src/tests/vm/page-parallel.ck b/src/tests/vm/page-parallel.ck index c6817b7..90c14ef 100644 --- a/src/tests/vm/page-parallel.ck +++ b/src/tests/vm/page-parallel.ck @@ -7,9 +7,11 @@ check_expected (IGNORE_EXIT_CODES => 1, [<<'EOF']); (page-parallel) exec "child-linear" (page-parallel) exec "child-linear" (page-parallel) exec "child-linear" +(page-parallel) exec "child-linear" (page-parallel) wait for child 0 (page-parallel) wait for child 1 (page-parallel) wait for child 2 +(page-parallel) wait for child 3 (page-parallel) end EOF pass; -- 2.30.2