Changeset 590:4531b8ede6e4

Timestamp:

06/08/08 00:44:14 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Parents:

589:6fed7fee381f (diff), 588:9a2f360ec1e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

default

Message:

Merge changes from devel.

Location:

nxos

Files:

• base/fs.c (deleted)
• base/fs.h (deleted)
• base/lib/fs/fs.c (modified) (5 diffs)
• base/lib/fs/fs.h (modified) (2 diffs)
• base/lib/rcmd/_rcmd.c (modified) (2 diffs)
• base/lib/rcmd/_rcmd.c (modified) (2 diffs)
• base/lib/rcmd/_rcmd.h (modified) (1 diff)
• base/lib/rcmd/_rcmd.h (modified) (2 diffs)
• base/lib/rcmd/rcmd.c (modified) (2 diffs)
• base/lib/rcmd/rcmd.c (modified) (2 diffs)
• systems/tag-route/main.c (modified) (4 diffs)
• systems/tag-route/main.c (modified) (2 diffs)

nxos/base/lib/fs/fs.c

@@ -24 +24 @@
 #define FS_FILE_METADATA_SIZE 10
 
-/* File metadata size, in bytes. */
+/** Filename offset (in U32s) in the metadata. */
+#define FS_FILENAME_OFFSET 2
+
+/** File metadata size, in bytes. */
 #define FS_FILE_METADATA_BYTES (FS_FILE_METADATA_SIZE * sizeof(U32))
 
+/** Mask to use on the first metadata U32 to get the file origin marker value. */
 #define FS_FILE_ORIGIN_MASK 0xFF000000
+
+/** Mask to use on the first metadata U32 to get the file permissions. */
 #define FS_FILE_PERMS_MASK 0x00F00000
+
+/** Mask to use on the first metadata U32 to get the file size. */
 #define FS_FILE_SIZE_MASK 0x000FFFFF
 
@@ -34 +42 @@
 #define FS_FILE_PERM_MASK_EXECUTABLE (1 << 1)
 
-#define FS_FILENAME_OFFSET 2
-
-/* U32 <-> char conversion union for filenames. */
+/** U32 <-> char conversion union for filenames. */
 union U32tochar {
   char chars[FS_FILENAME_LENGTH];
@@ -304 +310 @@
 static fs_err_t nx_fs_init_fd(U32 origin, fs_fd_t fd) {
   volatile U32 *metadata = &(FLASH_BASE_PTR[origin*EFC_PAGE_WORDS]);
+  union U32tochar nameconv;
   fs_file_t *file;
 
@@ -309 +316 @@
   NX_ASSERT(file != NULL);
 
+  memcpy(nameconv.integers,
+         (void *)(metadata + FS_FILENAME_OFFSET),
+         FS_FILENAME_LENGTH);
+
   file->origin = origin;
+  memcpy(file->name, nameconv.chars, MIN(strlen(nameconv.chars), 31));
   file->size = nx_fs_get_file_size_from_metadata(metadata);
   file->perms = nx_fs_get_file_perms_from_metadata(metadata);
@@ -679 +691 @@
 }
 
-void nx_fs_get_occupation(U16 *files, U32 *used, U32 *free_pages,
+void nx_fs_get_occupation(U32 *files, U32 *used, U32 *free_pages,
                           U32 *wasted) {
+  U32 _files = 0, _used = 0, _free_pages = 0, _wasted = 0;
+  U32 i;
+
+  for (i=FS_PAGE_START; i<FS_PAGE_END; i++) {
+    if (nx_fs_page_has_magic(i)) {
+      volatile U32 *metadata = &(FLASH_BASE_PTR[i*EFC_PAGE_WORDS]);
+      size_t size;
+      U32 pages;
+
+      size = nx_fs_get_file_size_from_metadata(metadata);
+      pages = nx_fs_get_file_page_count(size);
+
+      _files++;
+      _used += size;
+      _wasted += pages * EFC_PAGE_BYTES - size - FS_FILE_METADATA_BYTES;
+
+      i += pages - 1;
+    } else {
+      _free_pages++;
+    }
+  }
+
   if (files) {
+    *files = _files;
   }
 
   if (used) {
+    *used = _used;
   }
 
   if (free_pages) {
+    *free_pages = _free_pages;
   }
 
   if (wasted) {
+    *wasted = _wasted;
   }
 }

nxos/base/lib/fs/fs.h

@@ -22 +22 @@
 /*@{*/
 
-/** @defgroup fs Flash file system */
+/** @defgroup fs Flash file system
+ *
+ * A flash-friendly file system for the NXT on-board flash memory. This is a very simple
+ * file system implementation, allowing most of the basic features expected from a file
+ * system: open(), read(), write(), seek(), flush() and close(). Note that reading and
+ * writing use two different pointers. A seek() will move both of them.
+ *
+ * The file system also tries to minimize stress on the flash by progressively moving files
+ * needing more space towards the end of the flash medium. This relocation process happens
+ * automatically and may make one write operation rather costly (in terms of time).
+ *
+ * For more information, refer to the file system design document.
+ */
 /*@{*/
 
@@ -187 +199 @@
  * @param wasted The bytes lost by files page aligment.
  */
-void nx_fs_get_occupation(U16 *files, U32 *used, U32 *free_pages,
+void nx_fs_get_occupation(U32 *files, U32 *used, U32 *free_pages,
                           U32 *wasted);
 

nxos/base/lib/rcmd/_rcmd.c

@@ -36 +36 @@
 };
 
-rcmd_err_t nx__rcmd_find_command(const char *line, rcmd_command_def *command) {
+rcmd_err_t nx__rcmd_find_command(char *line, rcmd_command_def *command) {
   U32 i = 0;
+  char *sep;
+
+  sep = strchr(line, RCMD_TOKEN_SEPARATOR);
+  if (sep) {
+    *sep = '\0';
+  }
 
   while (rcmd_commands[i].name) {
     if (streq(line, rcmd_commands[i].name)) {
       *command = rcmd_commands[i];
+      *sep = RCMD_TOKEN_SEPARATOR;
       return RCMD_ERR_NO_ERROR;
     }
@@ -48 +55 @@
   }
 
+  *sep = RCMD_TOKEN_SEPARATOR;
   return RCMD_ERR_COMMAND_NOT_FOUND;
 }

nxos/base/lib/rcmd/_rcmd.c

@@ -1 @@
-/* Copyright (c) 2007-2008 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -10 +10 @@
 #include "base/util.h"
 #include "base/display.h"
-#include "base/fs.h"
 #include "base/nxt.h"
 #include "base/drivers/motors.h"
 #include "base/drivers/sound.h"
 #include "base/drivers/systick.h"
+#include "base/lib/fs/fs.h"
 #include "base/lib/rcmd/_rcmd.h"
 

nxos/base/lib/rcmd/_rcmd.h

@@ -40 +40 @@
  * @return An appropriate @a rcmd_err_t error code.
  */
-rcmd_err_t nx__rcmd_find_command(const char *line, rcmd_command_def *command);
+rcmd_err_t nx__rcmd_find_command(char *line, rcmd_command_def *command);
 
 rcmd_err_t nx__rcmd_move(char *line);

nxos/base/lib/rcmd/_rcmd.h

@@ -3 +3 @@
  */
 
-/* Copyright (c) 2007-2008 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -15 +15 @@
 
 #include "base/types.h"
-#include "base/fs.h"
+#include "base/lib/fs/fs.h"
 #include "base/lib/rcmd/rcmd.h"
 

nxos/base/lib/rcmd/rcmd.c

@@ -23 +23 @@
   }
 
-  err = nx__rcmd_find_command(line, &command);
+  /* Call the command actuator on a copy of the command line so
+   * it can mess around with it if it wants to.
+   */
+  memcpy(cmdline, line, strlen(line));
+
+  err = nx__rcmd_find_command(cmdline, &command);
   if (err != RCMD_ERR_NO_ERROR) {
     return err;
   }
 
-  /* Call the command actuator on a copy of the command line so
-   * it can mess around with it if it wants to.
-   */
-  memcpy(cmdline, line, strlen(line));
   return command.actuator(cmdline);
 }
@@ -37 +38 @@
 void nx_rcmd_parse(char *file) {
   rcmd_err_t err, result;
+  fs_err_t fserr;
   fs_fd_t fd;
   int n = 0;
 
-  if (nx_fs_open(file, FS_FILE_MODE_OPEN, &fd) != FS_ERR_NO_ERROR) {
+  fserr = nx_fs_open(file, FS_FILE_MODE_OPEN, &fd);
+  if (fserr != FS_ERR_NO_ERROR) {
+    nx_display_uint(fserr);
+    nx_display_end_line();
     nx__rcmd_error(RCMD_ERR_READ_ERROR, file, 0);
     return;

nxos/base/lib/rcmd/rcmd.c

@@ -1 @@
-/* Copyright (c) 2007-2008 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -10 +10 @@
 #include "base/util.h"
 #include "base/assert.h"
-#include "base/fs.h"
-#include "base/display.h"
+#include "base/lib/fs/fs.h"
 #include "base/lib/rcmd/rcmd.h"
 #include "base/lib/rcmd/_rcmd.h"

nxos/systems/tag-route/main.c

@@ -7 +7 @@
  */
 
-/** Tag-route follower.
- *
- * Replays a recorded tag route.
- */
+/** Tag-route follower. Replays a recorded tag route. */
 
 #include "base/types.h"
@@ -25 +22 @@
 #define ROUTE_FILE "tag.data"
 
-#define TEST_DATA "print hello world\nmove A,B -90 500\nwait 2000\nplay 1500 1000 sync\nprint done"
+#define TEST_DATA "print hello world\nmove A,B 100 1500\nwait 2000\nplay 1500 1000 sync\nprint done"
 #define DATA_SIZE strlen(TEST_DATA)
 
 void record(char *filename);
 void replay(char *filename);
+void defrag(void);
 
 void record(char *filename) {
@@ -85 +83 @@
 }
 
+void defrag(void) {
+  nx_display_clear();
+  nx_display_string("- Defrag -\n\n");
+  nx_fs_defrag_best_overall();
+  nx_display_string("Done.\n");
+}
+
+void stats(void) {
+  U32 files = 0, used = 0, free_pages = 0, wasted = 0;
+
+  nx_display_clear();
+  nx_display_string("- FS stats -\n\n");
+
+  nx_fs_get_occupation(&files, &used, &free_pages, &wasted);
+
+  nx_display_uint(files);
+  nx_display_string(" file(s).\n");
+
+  nx_display_uint(used);
+  nx_display_string("B used.\n");
+
+  nx_display_uint(free_pages);
+  nx_display_string(" free page(s).\n");
+
+  nx_display_uint(wasted);
+  nx_display_string("B wasted.\n");
+}
+
 void main(void) {
-  char *entries[] = {"Replay", "Record", "--", "Halt", NULL};
+  char *entries[] = {"Replay", "Record", "Stats", "Defrag", "Halt", NULL};
   gui_text_menu_t menu;
   U8 res;
@@ -108 +134 @@
         record(ROUTE_FILE);
         break;
+      case 2:
+        stats();
+        break;
+      case 3:
+        defrag();
+        break;
       default:
         continue;

nxos/systems/tag-route/main.c

@@ -1 @@
-/* Copyright (c) 2007-2008 the NxOS developers
+/* Copyright (c) 2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -12 +12 @@
 #include "base/core.h"
 #include "base/display.h"
-#include "base/fs.h"
 #include "base/util.h"
 #include "base/drivers/avr.h"
 #include "base/drivers/systick.h"
 #include "base/drivers/motors.h"
+#include "base/lib/fs/fs.h"
 #include "base/lib/gui/gui.h"
 #include "base/lib/rcmd/rcmd.h"