Changeset 619:2773d1d72455

Timestamp:

06/19/08 11:03:36 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Branch:

default

Message:

Remove debug messages, prepage best_overall demo

Location:

nxos

Files:

• base/lib/fs/fs.c (modified) (3 diffs)
• base/lib/rcmd/rcmd.c (modified) (1 diff)
• systems/tag-route/usb.c (modified) (1 diff)
• systems/tests/fs.c (modified) (1 diff)
• systems/tests/tests.c (modified) (1 diff)

nxos/base/lib/fs/fs.c

@@ -809 +809 @@
   while (nx_fs_find_next_origin(i, &origin) == FS_ERR_NO_ERROR) {
     volatile U32 *metadata = &(FLASH_BASE_PTR[origin*EFC_PAGE_WORDS]);
+    size_t npages = nx_fs_get_file_page_count(
+      nx_fs_get_file_size_from_metadata(metadata));
 
     memcpy(nameconv.integers,
@@ -817 +819 @@
     nx_display_string(":");
     nx_display_string(nameconv.chars);
+    nx_display_string(":");
+    nx_display_uint(npages);
     nx_display_end_line();
 
-    i = origin + nx_fs_get_file_page_count(nx_fs_get_file_size_from_metadata(metadata));
+    i = origin + npages;
   }
 
@@ -1126 +1130 @@
   }
 
+  nx_display_string("\nMSPF: ");
   nx_display_uint(mean_space_per_file);
   nx_display_end_line();

nxos/base/lib/rcmd/rcmd.c

@@ -143 +143 @@
   }
 
-  nx_display_string("moving?\n");
-
   return RCMD_ERR_NO_ERROR;
 }

nxos/systems/tag-route/usb.c

@@ -54 +54 @@
     // Disable local echo
     //  nx_display_string((char *)buf);
-    //  nx_display_end_line();
+    nx_display_end_line();
 
     nx_rcmd_do((char *)buf);

nxos/systems/tests/fs.c

@@ -202 +202 @@
   nx_display_string("Starting...\n");
 
-  spawn_file("test1", 106968);
-  spawn_file("test2", 12750);
-  spawn_file("test3", 106968);
-  remove_file("test2");
-
-  nx_fs_dump();
-  while (nx_avr_get_button() != BUTTON_OK);
-  nx_systick_wait_ms(500);
-
-  nx_display_clear();
-  nx_display_string("Defrag: ");
-  nx_display_uint(nx_fs_defrag_best_overall());
-  nx_display_string(" done.\n");
-  while (nx_avr_get_button() != BUTTON_OK);
-  nx_systick_wait_ms(500);
-
-  nx_display_clear();
-  nx_fs_dump();
-  while (nx_avr_get_button() != BUTTON_OK);
-  nx_systick_wait_ms(500);
-
-  destroy();
-}
+  spawn_file("test1", 4000);
+  spawn_file("test2", 7000);
+  spawn_file("test3", 8000);
+  spawn_file("test4", 300);
+  spawn_file("test5", 4000);
+  remove_file("test4");
+
+  nx_fs_dump();
+  while (nx_avr_get_button() != BUTTON_OK);
+  nx_systick_wait_ms(500);
+
+  nx_display_clear();
+  nx_display_string("Defrag: ");
+  if (nx_fs_defrag_best_overall() != FS_ERR_NO_ERROR) {
+    nx_display_string("Error!");
+  } else {
+    nx_display_string("Done.");
+  }
+  nx_display_end_line();
+
+  while (nx_avr_get_button() != BUTTON_OK);
+  nx_systick_wait_ms(500);
+
+  nx_display_clear();
+  nx_fs_dump();
+  while (nx_avr_get_button() != BUTTON_OK);
+  nx_systick_wait_ms(500);
+
+  destroy();
+}

nxos/systems/tests/tests.c

@@ -869 +869 @@
   //fs_test_defrag_simple();
   //fs_test_defrag_empty();
-  fs_test_defrag_for_file();
-  //fs_test_defrag_best_overall();
+  //fs_test_defrag_for_file();
+  fs_test_defrag_best_overall();
   goodbye();
 }