Changeset 592:9a867553c136

Timestamp:

06/08/08 05:28:19 (7 months ago)

Author:

Edward Nys <fleurda@…>

Children:

593:27aeec049e81, 605:00f5bffa54dd

Branch:

default

Message:

added nx_fs_defrag_best_overall functionality

Location:

nxos

Files:

• base/lib/fs/fs.c (modified) (3 diffs)
• systems/tag-route/main.c (modified) (2 diffs)

nxos/base/lib/fs/fs.c

@@ -14 +14 @@
 #include "base/assert.h"
 #include "base/util.h"
+#include "base/display.h"
 #include "base/drivers/_efc.h"
 
@@ -732 +733 @@
 }
 
+static fs_err_t nx_fs_find_next_hole(U32 start, U32 *origin) {
+  U32 i;
+
+    i = start;
+    while (i < FS_PAGE_END) {
+      if (nx_fs_page_has_magic(i)) {
+        volatile U32 *metadata = &(FLASH_BASE_PTR[i*EFC_PAGE_WORDS]);
+        i += nx_fs_get_file_page_count(nx_fs_get_file_size_from_metadata(metadata));
+      } else {
+        *origin = i;
+        return FS_ERR_NO_ERROR;
+      }
+  }
+  return FS_ERR_FILE_NOT_FOUND;
+}
+
 /* Defrag functions. */
 
@@ -758 +775 @@
 
 fs_err_t nx_fs_defrag_best_overall(void) {
-  return FS_ERR_NO_ERROR;
-}
-
+  U32 hole_start = 0, next_hole=0, freeblock_size=0, next_origin=0;
+  U32 files, used, free_pages, wasted;
+  U32 mean_space_per_file = 0;
+  U32 size = 0;
+  U32 current_location = FS_PAGE_START;
+  /* Get the number of files and freepages. */
+  nx_fs_get_occupation(&files, &used, &free_pages, &wasted);
+  /* Nothing to do here, move on */
+  if (files==0){
+    return FS_ERR_NO_ERROR;
+  }
+
+  mean_space_per_file = free_pages / files;
+  if (mean_space_per_file < 1) {
+    /*Fallback to simple defrag*/
+    nx_fs_defrag_simple();
+  } else {
+    while (current_location < FS_PAGE_END) {
+      if (nx_fs_page_has_magic(current_location)) {
+        /* calculate free space after file */
+        volatile U32 *metadata = &(FLASH_BASE_PTR[current_location*EFC_PAGE_WORDS]);
+        hole_start = current_location + nx_fs_get_file_page_count(nx_fs_get_file_size_from_metadata(metadata));
+        nx_fs_find_next_origin(hole_start, &next_origin);
+        freeblock_size = next_origin - hole_start;
+
+        /* frag operations*/
+        if (freeblock_size > mean_space_per_file) {
+          size = nx_fs_get_file_size_from_metadata(metadata);
+          nx_fs_move_region(current_location , hole_start + mean_space_per_file, nx_fs_get_file_page_count(size));
+        } else if (freeblock_size < mean_space_per_file) {
+          nx_fs_find_next_hole(next_origin, & next_hole);
+          /* TODO: fix overlapping on move */
+          nx_fs_move_region(next_origin, hole_start + mean_space_per_file, next_hole -1);
+        }
+      }
+    }
+  }
+  return FS_ERR_NO_ERROR;
+}
+

nxos/systems/tag-route/main.c

@@ -89 +89 @@
   nx_fs_defrag_best_overall();
   nx_display_string("Done.\n");
+
+        while (nx_avr_get_button() != BUTTON_CANCEL);
 }
 
@@ -127 +129 @@
   menu.active_mark = GUI_DEFAULT_TEXT_MARK;
 
-  while ((res = nx_gui_text_menu(menu)) != 3) {
+  while ((res = nx_gui_text_menu(menu)) != 4) {
     switch (res) {
       case 0: