Distinguish between swap reservation and occupation in "new core ..." printouts

diff --git a/core.c b/core.c
index f03c92c..9fe3377 100644 (file)
--- a/core.c
+++ b/core.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <stddef.h>
-//#include <stdio.h>
+#include <stdio.h> // temporary
 #include <stdlib.h>
 #include <string.h>
 #include "core.h"

diff --git a/process.c b/process.c
index 693cb68..7f3edf4 100644 (file)
--- a/process.c
+++ b/process.c
@@ -547,7 +547,7 @@ void process_run(struct process *process) {
         int core_block = core_base + i;
         int swap_block = swap_base + i;
         swap_block = swap_table_mem[swap_block];
- printf(",%d", swap_block);
+ printf(" %d", swap_block);
         swap_to_core_copy(
           swap_block << BLOCK_PARAS_SHIFT,
           core_block << BLOCK_PARAS_SHIFT,
@@ -559,7 +559,7 @@ void process_run(struct process *process) {
         int core_block = core_base + i;
         int swap_block = swap_base + i;
         swap_block = swap_table_mem[swap_block];
- printf(",%d", swap_block);
+ printf(" %d", swap_block);
         swap_to_core_copy(
           swap_block << BLOCK_PARAS_SHIFT,
           core_block << BLOCK_PARAS_SHIFT,

diff --git a/process_test_run.c b/process_test_run.c
index 5b051d8..2f8af0e 100644 (file)
--- a/process_test_run.c
+++ b/process_test_run.c
@@ -334,7 +334,7 @@ int main(int argc, char **argv) {
           processes[test.process].paras = -1;
         }
         else {
- printf("new core [%d,%d) swap [%d, %d)\n", processes[test.process].core_item.base, processes[test.process].core_item.limit, processes[test.process].swap_item.base, processes[test.process].swap_item.limit);
+ printf("new core [%d,%d) swap reservation [%d, %d)\n", processes[test.process].core_item.base, processes[test.process].core_item.limit, processes[test.process].swap_item.base, processes[test.process].swap_item.limit);
           rassert(
             processes[test.process].swap_item.limit -
               processes[test.process].swap_item.base ==
@@ -362,7 +362,7 @@ int main(int argc, char **argv) {
       if (processes[test.process].paras == -1)
         printf("... not allocated, ignore\n");
       else {
- printf("old core [%d,%d) swap [%d,%d)\n", processes[test.process].core_item.base, processes[test.process].core_item.limit, processes[test.process].swap_item.base, processes[test.process].swap_item.limit);
+ printf("old core [%d,%d) swap reservation [%d,%d)\n", processes[test.process].core_item.base, processes[test.process].core_item.limit, processes[test.process].swap_item.base, processes[test.process].swap_item.limit);
         old_paras = processes[test.process].paras;
         if (old_paras != test.old_paras) {
           printf(
@@ -405,7 +405,7 @@ int main(int argc, char **argv) {
             );
           }
           else {
- printf("new core [%d,%d) swap [%d, %d)\n", processes[test.process].core_item.base, processes[test.process].core_item.limit, processes[test.process].swap_item.base, processes[test.process].swap_item.limit);
+ printf("new core [%d,%d) swap reservation [%d, %d)\n", processes[test.process].core_item.base, processes[test.process].core_item.limit, processes[test.process].swap_item.base, processes[test.process].swap_item.limit);
             rassert(
               processes[test.process].swap_item.limit -
                 processes[test.process].swap_item.base ==
@@ -492,7 +492,7 @@ int main(int argc, char **argv) {
             swap_paras = processes[test.process].paras;
           }
         }
- printf("old core [%d,%d) swap [%d,%d)\n", core_base, core_base + core_blocks, swap_base, swap_base + swap_blocks);
+ printf("old core [%d,%d) swap occupation [%d,%d)\n", core_base, core_base + core_blocks, swap_base, swap_base + swap_blocks);
  fflush(stdout);
         core_hash_verify(
           test.process,
@@ -558,7 +558,7 @@ done:
           (processes[i].paras + (BLOCK_PARAS - 1)) >> BLOCK_PARAS_SHIFT
       );
       printf(
-        "process %d: core [%d,%d) swap [%d,%d)\n",
+        "process %d: core [%d,%d) swap occupation [%d,%d)\n",
         i,
         core_base,
         core_base + core_blocks,