File system project updates:

[pintos-anon] / src / filesys / filesys.c

diff --git a/src/filesys/filesys.c b/src/filesys/filesys.c
index 6b7710aa493b77c2df62e42adfdc7b7829ef0d87..fedda08e1d6730421a129e286117298821fd75fb 100644 (file)
--- a/src/filesys/filesys.c
+++ b/src/filesys/filesys.c
@@ -1,37 +1,104 @@
-#include "filesys.h"
+#include "filesys/filesys.h"
+#include <debug.h>
+#include <stdio.h>
+#include <string.h>
+#include "filesys/file.h"
+#include "filesys/free-map.h"
+#include "filesys/inode.h"
+#include "filesys/directory.h"
+#include "devices/disk.h"
 
-#ifdef FILESYS_STUB
+/* The disk that contains the file system. */
+struct disk *filesys_disk;
+
+static void do_format (void);
+
+/* Initializes the file system module.
+   If FORMAT is true, reformats the file system. */
 void
-filesys_init (bool reformat) 
+filesys_init (bool format) 
 {
-  if (reformat)
-    printk ("filesystem stubs don't support formatting\n");
+  filesys_disk = disk_get (0, 1);
+  if (filesys_disk == NULL)
+    PANIC ("hd0:1 (hdb) not present, file system initialization failed");
+
+  inode_init ();
+  free_map_init ();
+
+  if (format) 
+    do_format ();
+
+  free_map_open ();
 }
 
+/* Shuts down the file system module, writing any unwritten data
+   to disk. */
+void
+filesys_done (void) 
+{
+  free_map_close ();
+}
+\f
+/* Creates a file named NAME with the given INITIAL_SIZE.
+   Returns true if successful, false otherwise.
+   Fails if a file named NAME already exists,
+   or if internal memory allocation fails. */
 bool
-filesys_create (const char *name) 
+filesys_create (const char *name, off_t initial_size) 
 {
-  bool success = false;
-  filesys_stub_send ("s'create' s", name);
-  filesys_stub_receive ("s'create' b", &success);
+  disk_sector_t inode_sector = 0;
+  struct dir *dir = dir_open_root ();
+  bool success = (dir != NULL
+                  && free_map_allocate (1, &inode_sector)
+                  && inode_create (inode_sector, initial_size)
+                  && dir_add (dir, name, inode_sector));
+  if (!success && inode_sector != 0) 
+    free_map_release (inode_sector, 1);
+  dir_close (dir);
+
   return success;
 }
 
+/* Opens the file with the given NAME.
+   Returns the new file if successful or a null pointer
+   otherwise.
+   Fails if no file named NAME exists,
+   or if an internal memory allocation fails. */
 struct file *
-filesys_open (const char *name) 
+filesys_open (const char *name)
 {
-  int32_t handle = -1;
-  filesys_stub_stub ("s'open' i", name);
-  filesys_stub_receive ("s'open' i", &handle);
-  return handle == -1 ? NULL : (struct file *) handle;
+  struct dir *dir = dir_open_root ();
+  struct inode *inode = NULL;
+
+  if (dir != NULL)
+    dir_lookup (dir, name, &inode);
+  dir_close (dir);
+
+  return file_open (inode);
 }
 
+/* Deletes the file named NAME.
+   Returns true if successful, false on failure.
+   Fails if no file named NAME exists,
+   or if an internal memory allocation fails. */
 bool
 filesys_remove (const char *name) 
 {
-  bool success = false;
-  filesys_stub_send ("s'create' s", name);
-  filesys_stub_receive ("s'create' b", &success);
+  struct dir *dir = dir_open_root ();
+  bool success = dir != NULL && dir_remove (dir, name);
+  dir_close (dir); 
+
   return success;
 }
-#endif /* FILESYS_STUB */
+\f
+/* Formats the file system. */
+static void
+do_format (void)
+{
+  printf ("Formatting file system...");
+  free_map_create ();
+  if (!dir_create (ROOT_DIR_SECTOR, 16))
+    PANIC ("root directory creation failed");
+  free_map_close ();
+  printf ("done.\n");
+}