Get rid of file system "dump" operations because they weren't useful

and occasionally provoked student questions.

diff --git a/TODO b/TODO
index e3a3951cfde2dbfb4abfbd44546e9511b425f89d..e41757974b8f96bc174492772744a32ae092bf4e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -52,8 +52,6 @@
 
   - Add option to disable buffer cache.
 
-  - Get rid of "dump" commands--they're not really useful.
-
   - Sample solution.
 
   - Need a better way to measure performance improvement of buffer

diff --git a/src/filesys/directory.c b/src/filesys/directory.c
index b08e7eeba3f65947e0ffe51b097e0d7aa166d24c..fd1590254a65a30acf6b150777cd7c8d316ba61c 100644 (file)
--- a/src/filesys/directory.c
+++ b/src/filesys/directory.c
@@ -188,19 +188,3 @@ dir_list (const struct dir *d)
     if (e->in_use)
       printf ("%s\n", e->name);
 }
-
-/* Dumps the contents of D, including its files' names and their
-   contents, to the system console. */
-void
-dir_dump (const struct dir *d) 
-{
-  struct dir_entry *e;
-  
-  for (e = d->entries; e < d->entries + d->entry_cnt; e++)
-    if (e->in_use) 
-      {
-        printf ("Contents of %s:\n", e->name);
-        fsutil_print (e->name);
-        printf ("\n");
-      }
-}

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index db168672b10b8672f6074567a59ce4f49cb18a11..c773887b6b57e920d59e7ddadf50502c7cf8fe30 100644 (file)
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -21,6 +21,5 @@ bool dir_lookup (const struct dir *, const char *name, disk_sector_t *);
 bool dir_add (struct dir *, const char *name, disk_sector_t);
 bool dir_remove (struct dir *, const char *name);
 void dir_list (const struct dir *);
-void dir_dump (const struct dir *);
 
 #endif /* filesys/directory.h */

diff --git a/src/filesys/filesys.c b/src/filesys/filesys.c
index 798989065f11110135fb1200e9aa50cbd7f39477..b77d2718e824cc73315d3083255f30a0fc34a460 100644 (file)
--- a/src/filesys/filesys.c
+++ b/src/filesys/filesys.c
@@ -276,35 +276,6 @@ filesys_list (void)
   return true;
 }
 
-/* Dumps the filesystem state to the system console,
-   including the free map, the list of files, and file contents.
-   Returns true if successful, false on failure,
-   which occurs only if an internal memory allocation fails. */
-bool
-filesys_dump (void) 
-{
-  struct bitmap *free_map;
-  struct dir *dir;  
-
-  printf ("Free map:\n");
-  free_map = bitmap_create (disk_size (filesys_disk));
-  if (free_map == NULL)
-    return false;
-  bitmap_read (free_map, free_map_file);
-  bitmap_dump (free_map);
-  bitmap_destroy (free_map);
-  printf ("\n");
-  
-  dir = dir_create (NUM_DIR_ENTRIES);
-  if (dir == NULL)
-    return false;
-  dir_read (dir, root_dir_file);
-  dir_dump (dir);
-  dir_destroy (dir);
-
-  return true;
-}
-
 static void must_succeed_function (int, bool) NO_INLINE;
 #define MUST_SUCCEED(EXPR) must_succeed_function (__LINE__, EXPR)
 

diff --git a/src/filesys/filesys.h b/src/filesys/filesys.h
index 9563fbb37e2926a255d4256db8b268666e0a3870..064c5772bce39becfaeb3d0bf9eef8f5d37b0dc6 100644 (file)
--- a/src/filesys/filesys.h
+++ b/src/filesys/filesys.h
@@ -17,7 +17,6 @@ bool filesys_create (const char *name, off_t initial_size);
 struct file *filesys_open (const char *name);
 bool filesys_remove (const char *name);
 bool filesys_list (void);
-bool filesys_dump (void);
 
 void filesys_self_test (void);
 

diff --git a/src/filesys/fsutil.c b/src/filesys/fsutil.c
index 7756946587e26873a6cb5aa9f723eb91e39adfd4..81466c2a66dfa008d7d3c1415a9211a392e733c5 100644 (file)
--- a/src/filesys/fsutil.c
+++ b/src/filesys/fsutil.c
@@ -25,9 +25,6 @@ char *fsutil_remove_file;
 /* List all files in the filesystem to the system console? */
 bool fsutil_list_files;
 
-/* Dump full contents of filesystem to the system console? */
-bool fsutil_dump_filesys;
-
 /* Copies from the "scratch" disk, hdc or hd1:0,
    to a file named FILENAME in the filesystem.
    The file will be SIZE bytes in length. */
@@ -144,9 +141,6 @@ fsutil_run (void)
 
   if (fsutil_list_files)
     filesys_list ();
-
-  if (fsutil_dump_filesys)
-    filesys_dump ();
 }
 
 /* Prints the contents of file FILENAME to the system console as

diff --git a/src/filesys/fsutil.h b/src/filesys/fsutil.h
index 2d711e98db7df9e8e1b682c851b4e1f8d08efcee..307e37d1d1ce791638a245fd3915c52270d0837d 100644 (file)
--- a/src/filesys/fsutil.h
+++ b/src/filesys/fsutil.h
@@ -9,7 +9,6 @@ extern char *fsutil_copyout_file;
 extern char *fsutil_print_file;
 extern char *fsutil_remove_file;
 extern bool fsutil_list_files;
-extern bool fsutil_dump_filesys;
 
 void fsutil_run (void);
 void fsutil_print (const char *filename);

diff --git a/src/threads/init.c b/src/threads/init.c
index 589661619b056a2eb40643f2b746da5a9daff15e..4b7835800487b14c27d61a9b7cc5e2a2be7ca903 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -246,8 +246,6 @@ argv_init (void)
       fsutil_remove_file = argv[++i];
     else if (!strcmp (argv[i], "-ls"))
       fsutil_list_files = true;
-    else if (!strcmp (argv[i], "-D"))
-      fsutil_dump_filesys = true;
 #endif
     else if (!strcmp (argv[i], "-u"))
       {
@@ -267,7 +265,6 @@ argv_init (void)
           " -p FILENAME         Print the contents of FILENAME\n"
           " -r FILENAME         Delete FILENAME\n"
           " -ls                 List the files in the filesystem\n"
-          " -D                  Dump complete filesystem contents\n"
 #endif
           " -q                  Power off after doing requested actions.\n"
           " -u                  Print this help message and power off.\n"