Remove all non-essential printfs (for code size reduction in FUZIX build)

diff --git a/core.c b/core.c
index ab704e5..8fb08da 100644 (file)
--- a/core.c
+++ b/core.c
@@ -27,13 +27,13 @@ static void core_move(struct pool_item *item, int new_base) {
 
   base = item->base;
   blocks = item->limit - base;
-  printf(
-    "core_move [%d,%d) to [%d,%d)\n",
-    base,
-    base + blocks,
-    new_base,
-    new_base + blocks
-  );
+  //printf(
+  //  "core_move [%d,%d) to [%d,%d)\n",
+  //  base,
+  //  base + blocks,
+  //  new_base,
+  //  new_base + blocks
+  //);
   assert(new_base <= base || new_base >= base + blocks);
 #ifdef INDIRECT_CORE
   for (i = 0; i < blocks; ++i) {
@@ -68,13 +68,13 @@ static void core_move_up(struct pool_item *item, int new_limit) {
 
   limit = item->limit;
   blocks = limit - item->base;
-  printf(
-    "core_move_up [%d,%d) to [%d,%d)\n",
-    limit - blocks,
-    limit,
-    new_limit - blocks,
-    new_limit
-  );
+  //printf(
+  //  "core_move_up [%d,%d) to [%d,%d)\n",
+  //  limit - blocks,
+  //  limit,
+  //  new_limit - blocks,
+  //  new_limit
+  //);
   assert(new_limit >= limit || new_limit <= limit - blocks);
 #ifdef INDIRECT_CORE
   blocks = -blocks;

diff --git a/pool_test_run.c b/pool_test_run.c
index 49ef7fd..85cda5c 100644 (file)
--- a/pool_test_run.c
+++ b/pool_test_run.c
@@ -130,7 +130,7 @@ int main(int argc, char **argv) {
         else {
           int base = items[item].base;
           rassert(items[item].limit == base + size); 
- printf("new region [%d,%d)\n", base, base + size);
+ //printf("new region [%d,%d)\n", base, base + size);
           hash_init(item, base, size, 0);
         }
       }
@@ -168,7 +168,7 @@ int main(int argc, char **argv) {
           );
           rassert(actual_old_size <= old_size);
         }
- printf("old region [%d,%d)\n", base, base + actual_old_size);
+ //printf("old region [%d,%d)\n", base, base + actual_old_size);
         hash_verify(
           item,
           base + size,
@@ -202,7 +202,7 @@ int main(int argc, char **argv) {
           else {
             base = items[item].base;
             rassert(items[item].limit == base + size);
- printf("new region [%d,%d)\n", base, base + size);
+ //printf("new region [%d,%d)\n", base, base + size);
             hash_init(
               item,
               base + actual_old_size,
@@ -246,7 +246,7 @@ int main(int argc, char **argv) {
           );
           rassert(actual_old_size <= old_size);
         }
- printf("old region [%d,%d)\n", base, base + actual_old_size);
+ //printf("old region [%d,%d)\n", base, base + actual_old_size);
         hash_verify(item, base, actual_old_size - size, 0);
         bool result = pool_alloc(
           &head,
@@ -281,7 +281,7 @@ int main(int argc, char **argv) {
           else {
             base = items[item].base;
             rassert(items[item].limit == base + size);
- printf("new region [%d,%d)\n", base, base + size);
+ //printf("new region [%d,%d)\n", base, base + size);
             if (size >= actual_old_size)
               hash_verify(
                 item,
@@ -324,7 +324,7 @@ int main(int argc, char **argv) {
           );
           rassert(actual_old_size <= old_size);
         }
- printf("old region [%d,%d)\n", base, base + actual_old_size);
+ //printf("old region [%d,%d)\n", base, base + actual_old_size);
         hash_verify(item, base, actual_old_size, 0);
         pool_free(&head, items + item);
         items[item].prev = NULL;

diff --git a/process.c b/process.c
index 0a55749..6d7a0c5 100644 (file)
--- a/process.c
+++ b/process.c
@@ -93,7 +93,7 @@ void process_init(int n, int spare) {
   if (process_avail > core_table_avail)
     process_avail = core_table_avail;
 #endif
- printf("process_avail %ld\n", process_avail);
+ //printf("process_avail %ld\n", process_avail);
 #else
   process_avail = CORE_AVAIL + SWAP_AVAIL - spare;
 #ifdef PREALLOCATE_CORE
@@ -104,7 +104,7 @@ void process_init(int n, int spare) {
   if (process_avail > swap_table.avail)
     process_avail = swap_table.avail;
 #endif
- printf("process_avail %d\n", process_avail);
+ //printf("process_avail %d\n", process_avail);
 #endif
 
   lru_head.prev = &lru_head;
@@ -159,7 +159,7 @@ static bool do_swap_out(int swap_out) {
       if (blocks > victim_core_blocks)
         blocks = victim_core_blocks;
 #endif
- printf("existing victim %d, swap out %d of %d\n", (int)(victim - processes), blocks, victim_core_blocks);
+ //printf("existing victim %d, swap out %d of %d\n", (int)(victim - processes), blocks, victim_core_blocks);
 
       // increase swap allocation
 #ifndef PREALLOCATE_SWAP
@@ -212,7 +212,7 @@ static bool do_swap_out(int swap_out) {
       if (blocks > victim_core_blocks)
         blocks = victim_core_blocks;
 #endif
- printf("new victim %d, swap out %d of %d\n", (int)(victim - processes), blocks, victim_core_blocks);
+ //printf("new victim %d, swap out %d of %d\n", (int)(victim - processes), blocks, victim_core_blocks);
 
       // add to swap pool
       victim_swap_blocks = 0;
@@ -265,9 +265,9 @@ static bool do_swap_out(int swap_out) {
       );
 #endif
 #ifdef INODE_SWAP
- printf("write core [%d,%d) to swap [%d,%d)\n", core_base, core_base + blocks, victim_swap_blocks, victim_swap_blocks + blocks);
+ //printf("write core [%d,%d) to swap [%d,%d)\n", core_base, core_base + blocks, victim_swap_blocks, victim_swap_blocks + blocks);
 #else
- printf("write core [%d,%d) to swap [%d,%d)\n", core_base, core_base + blocks, swap_base, swap_base + blocks);
+ //printf("write core [%d,%d) to swap [%d,%d)\n", core_base, core_base + blocks, swap_base, swap_base + blocks);
 #endif
 #if !defined(INDIRECT_CORE) && !defined(INDIRECT_SWAP)
 #ifdef INODE_SWAP
@@ -286,12 +286,12 @@ static bool do_swap_out(int swap_out) {
 #endif
 #else
       j = (int)(size >> BLOCK_SHIFT);
- printf("blocks");
+ //printf("blocks");
       for (i = 0; i < j; ++i) {
         core_block = core_base + i;
 #ifdef INDIRECT_CORE
         core_block = core_table_mem[core_block];
- printf(" %d", core_block);
+ //printf(" %d", core_block);
 #endif
 #ifdef INODE_SWAP
         swap_write(
@@ -305,9 +305,9 @@ static bool do_swap_out(int swap_out) {
 #ifdef INDIRECT_SWAP
         swap_block = swap_table_mem[swap_block];
 #ifdef INDIRECT_CORE
- printf(",%d", swap_block);
+ //printf(",%d", swap_block);
 #else
- printf(" %d", swap_block);
+ //printf(" %d", swap_block);
 #endif
 #endif
         core_to_swap_copy(
@@ -322,7 +322,7 @@ static bool do_swap_out(int swap_out) {
         core_block = core_base + i;
 #ifdef INDIRECT_CORE
         core_block = core_table_mem[core_block];
- printf(" %d", core_block);
+ //printf(" %d", core_block);
 #endif
 #ifdef INODE_SWAP
         swap_write(
@@ -336,9 +336,9 @@ static bool do_swap_out(int swap_out) {
 #ifdef INDIRECT_SWAP
         swap_block = swap_table_mem[swap_block];
 #ifdef INDIRECT_CORE
- printf(",%d", swap_block);
+ //printf(",%d", swap_block);
 #else
- printf(" %d", swap_block);
+ //printf(" %d", swap_block);
 #endif
 #endif
  putchar('*');
@@ -349,7 +349,7 @@ static bool do_swap_out(int swap_out) {
         );
 #endif
       }
- printf("\n");
+ //printf("\n");
 #endif
 #ifdef INDIRECT_CORE
       block_pool_free(&core_block_pool, core_table_mem + core_base, blocks);
@@ -378,7 +378,7 @@ static bool do_swap_out(int swap_out) {
         // report whether aborted due to swap space or user request
         return swap_out == blocks;
       }
- printf("victimized %d\n", (int)(victim - processes));
+ //printf("victimized %d\n", (int)(victim - processes));
 
 #ifndef PREALLOCATE_CORE
       // remove from core pool
@@ -804,9 +804,9 @@ void process_run(struct process *process) {
       block_pool_alloc(&core_block_pool, core_table_mem + core_base, blocks);
 #endif
 #ifdef INODE_SWAP
- printf("read swap [%d,%d) to core [%d,%d)\n", process_swap_blocks, process_swap_blocks + blocks, core_base, core_base + blocks);
+ //printf("read swap [%d,%d) to core [%d,%d)\n", process_swap_blocks, process_swap_blocks + blocks, core_base, core_base + blocks);
 #else
- printf("read swap [%d,%d) to core [%d,%d)\n", swap_base, swap_base + blocks, core_base, core_base + blocks);
+ //printf("read swap [%d,%d) to core [%d,%d)\n", swap_base, swap_base + blocks, core_base, core_base + blocks);
 #endif
 #if !defined(INDIRECT_CORE) && !defined(INDIRECT_SWAP)
 #ifdef INODE_SWAP
@@ -825,12 +825,12 @@ void process_run(struct process *process) {
 #endif
 #else
       j = (int)(size >> BLOCK_SHIFT);
- printf("blocks");
+ //printf("blocks");
       for (i = 0; i < j; ++i) {
         int core_block = core_base + i;
 #ifdef INDIRECT_CORE
         core_block = core_table_mem[core_block];
- printf(" %d", core_block);
+ //printf(" %d", core_block);
 #endif
 #ifdef INODE_SWAP
         swap_read(
@@ -844,9 +844,9 @@ void process_run(struct process *process) {
 #ifdef INDIRECT_SWAP
         swap_block = swap_table_mem[swap_block];
 #ifdef INDIRECT_SWAP
- printf(",%d", swap_block);
+ //printf(",%d", swap_block);
 #else
- printf(" %d", swap_block);
+ //printf(" %d", swap_block);
 #endif
 #endif
         swap_to_core_copy(
@@ -861,7 +861,7 @@ void process_run(struct process *process) {
         int core_block = core_base + i;
 #ifdef INDIRECT_CORE
         core_block = core_table_mem[core_block];
- printf(" %d", core_block);
+ //printf(" %d", core_block);
 #endif
 #ifdef INODE_SWAP
         swap_read(
@@ -875,9 +875,9 @@ void process_run(struct process *process) {
 #ifdef INDIRECT_SWAP
         swap_block = swap_table_mem[swap_block];
 #ifdef INDIRECT_SWAP
- printf(",%d", swap_block);
+ //printf(",%d", swap_block);
 #else
- printf(" %d", swap_block);
+ //printf(" %d", swap_block);
 #endif
 #endif
         swap_to_core_copy(
@@ -887,7 +887,7 @@ void process_run(struct process *process) {
         );
 #endif
       }
- printf("\n");
+ //printf("\n");
 #endif
 #ifdef INDIRECT_SWAP
       block_pool_free(&swap_block_pool, swap_table_mem + swap_base, blocks);

diff --git a/process_test_run.c b/process_test_run.c
index 31c0f22..7f41cb5 100644 (file)
--- a/process_test_run.c
+++ b/process_test_run.c
@@ -378,7 +378,7 @@ int main(int argc, char **argv) {
             processes[process].core_item.limit ==
               core_base + blocks
           );
- printf("new core [%d,%d)\n", core_base, core_base + blocks);
+ //printf("new core [%d,%d)\n", core_base, core_base + blocks);
           core_hash_init(
             process,
             (long)core_base << BLOCK_SHIFT,
@@ -386,7 +386,7 @@ int main(int argc, char **argv) {
             0L
           );
 #ifdef PREALLOCATE_SWAP
- printf("new swap [%d,%d)\n", processes[process].swap_item.base, processes[process].swap_item.limit);
+ //printf("new swap [%d,%d)\n", processes[process].swap_item.base, processes[process].swap_item.limit);
 #endif
         }
       }
@@ -430,9 +430,9 @@ int main(int argc, char **argv) {
           rassert(actual_old_blocks <= old_blocks);
         }
 #ifdef PREALLOCATE_SWAP
- printf("old core [%d,%d) swap [%d,%d)\n", core_base, core_base + actual_old_blocks, processes[process].swap_item.base, processes[process].swap_item.limit);
+ //printf("old core [%d,%d) swap [%d,%d)\n", core_base, core_base + actual_old_blocks, processes[process].swap_item.base, processes[process].swap_item.limit);
 #else
- printf("old core [%d,%d)\n", core_base, core_base + actual_old_blocks);
+ //printf("old core [%d,%d)\n", core_base, core_base + actual_old_blocks);
 #endif
         core_hash_verify(
           process,
@@ -460,9 +460,9 @@ int main(int argc, char **argv) {
                 core_base + blocks
             );
 #ifdef PREALLOCATE_SWAP
- printf("new core [%d,%d) swap [%d,%d)\n", core_base, core_base + blocks, processes[process].swap_item.base, processes[process].swap_item.limit);
+ //printf("new core [%d,%d) swap [%d,%d)\n", core_base, core_base + blocks, processes[process].swap_item.base, processes[process].swap_item.limit);
 #else
- printf("new core [%d,%d)\n", core_base, core_base + blocks);
+ //printf("new core [%d,%d)\n", core_base, core_base + blocks);
 #endif
             core_hash_init(
               process,
@@ -551,7 +551,7 @@ int main(int argc, char **argv) {
           }
         }
         rassert(core_blocks + swap_blocks == actual_old_blocks);
- 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 [%d,%d)\n", core_base, core_base + core_blocks, swap_base, swap_base + swap_blocks);
  fflush(stdout);
         core_hash_verify(
           process,