X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilesys%2Ffilesys.c;h=0b96c2723a1949bcaf1d2f2bb7a85334d1d8bdfb;hb=2cf38a4ba2dd965c892767b0d8ee97e67f33b274;hp=f8348ed2a2eaf4f17182507a9aebce1c47564966;hpb=04584a49656ea770c77e3eee9537e1b726118cb6;p=pintos-anon

diff --git a/src/filesys/filesys.c b/src/filesys/filesys.c
index f8348ed..0b96c27 100644
--- a/src/filesys/filesys.c
+++ b/src/filesys/filesys.c
@@ -1,65 +1,162 @@
 #include "filesys.h"
+#include "disk.h"
+#include "directory.h"
 
+static struct disk *disk;
 
-#ifdef FILESYS_STUB
-#include <stdint.h>
-#include "debug.h"
-#include "filesys-stub.h"
-#include "lib.h"
+static struct file free_map_file, root_dir_file;
 
-void
-filesys_init (bool reformat) 
+#define FREE_MAP_SECTOR 0
+#define ROOT_DIR_SECTOR 1
+
+#define NUM_DIR_ENTRIES 10
+#define ROOT_DIR_FILE_SIZE (sizeof (struct dir_entry) * NUM_DIR_ENTRIES)
+
+static void
+do_format (void)
 {
-  if (reformat)
-    printk ("filesystem stubs don't support formatting\n");
-  filesys_stub_init ();
+  struct bitmap free_map;
+  struct filehdr map_hdr, dir_hdr;
+  struct dir dir;
+
+  /* Create the initial bitmap and reserve sectors for the
+     free map and root directory file headers. */
+  bitmap_init (&free_map, disk_size (disk));
+  bitmap_mark (&free_map, FREE_MAP_SECTOR);
+  bitmap_mark (&free_map, ROOT_DIR_SECTOR);
+
+  /* Allocate data sector(s) for the free map file
+     and write its file header to disk. */
+  if (!filehdr_allocate (&map_hdr, bitmap_storage_size (&free_map)))
+    panic ("free map creation failed");
+  filehdr_write (&map_hdr, FREE_MAP_SECTOR);
+  filehdr_destroy (&map_hdr);
+
+  /* Allocate data sector(s) for the root directory file
+     and write its file header to disk. */
+  if (!filehdr_allocate (&dir_hdr, ROOT_DIR_FILE_SIZE))
+    panic ("root directory creation failed");
+  filehdr_write (&dir_hdr, FREE_MAP_SECTOR);
+  filehdr_destroy (&dir_hdr);
+
+  /* Write out the free map now that we have space reserved
+     for it. */
+  file_open (&free_map_file, FREE_MAP_SECTOR);
+  bitmapio_write (&free_map, free_map_file);
+  bitmap_destroy (&free_map);
+  file_close (&free_map_file);
+
+  /* Write out the root directory in the same way. */
+  file_open (&root_dir_file, ROOT_DIR_SECTOR);
+  if (!dir_init (&dir, NUM_DIR_ENTRIES))
+    panic ("can't initialize root directory");
+  dir_write (root_dir_file);
+  dir_destroy (&dir);
+  file_close (&free_map_file);
 }
 
-bool
-filesys_create (const char *name) 
+void
+filesys_init (bool format) 
 {
-  bool success;
-
-  filesys_stub_lock ();
-  filesys_stub_put_string ("create");
-  filesys_stub_put_string (name);
-  filesys_stub_match_string ("create");
-  success = filesys_stub_get_bool ();
-  filesys_stub_unlock ();
+  disk = disk_get (1);
+  if (disk == NULL)
+    panic ("ide1:1 not present, filesystem initialization failed");
 
-  return success;
+  if (format) 
+    do_format ();
+  
+  file_open (&free_map_file, FREE_MAP_SECTOR);
+  file_open (&root_dir_file, ROOT_DIR_SECTOR);
 }
 
-struct file *
-filesys_open (const char *name) 
+bool
+filesys_create (const char *name, off_t initial_size) 
 {
-  struct file *file;
+  struct dir dir;
+  struct bitmap free_map;
+  disk_sector_no hdr_sector;
+  struct filehdr filehdr;
+  bool success = false;
+
+  /* Read the root directory. */
+  dir_init (&dir, NUM_DIR_ENTRIES);
+  dir_read (&dir, &root_dir_file);
+  if (dir_lookup (&dir, name, NULL)) 
+    goto exit1;
+
+  /* Allocate a block for the file header. */
+  bitmap_init (&free_map, disk_size (disk));
+  bitmapio_read (&free_map, &free_map_file);
+  hdr_sector = bitmap_find_and_set (&free_map);
+  if (hdr_sector == BITMAP_ERROR)
+    goto exit2;
+
+  /* Add the file to the directory. */
+  if (!dir_add (&dir, name, hdr_sector))
+    goto exit2;
+
+  /* Allocate space for the file. */
+  if (!filehdr_allocate (&filehdr, initial_size))
+    goto exit2;
+
+  /* Write everything back. */
+  filehdr_write (&filehdr, hdr_sector);
+  dir_write (&dir, &root_dir_file);
+  bitmapio_write (&free_map, &free_map_file);
+
+  success = true;
+
+  /* Clean up. */
+  filehdr_destroy (&filehdr);
+ exit2:
+  bitmap_destroy (&free_map);
+ exit1:
+  dir_destroy (&dir);
 
-  filesys_stub_lock ();
-  filesys_stub_put_string ("open");
-  filesys_stub_put_string (name);
-  filesys_stub_match_string ("open");
-  file = filesys_stub_get_file ();
-  filesys_stub_unlock ();
-  
-  return file;
+  return success;
 }
 
 bool
 filesys_remove (const char *name) 
 {
-  bool success;
-
-  filesys_stub_lock ();
-  filesys_stub_put_string ("remove");
-  filesys_stub_put_string (name);
-  filesys_stub_match_string ("remove");
-  success = filesys_stub_get_bool ();
-  filesys_stub_unlock ();
+  struct dir dir;
+  disk_sector_no hdr_sector;
+  struct filehdr filehdr;
+  struct bitmap free_map;
+  bool success = false;
+
+  /* Read the root directory. */
+  dir_init (&dir, NUM_DIR_ENTRIES);
+  dir_read (&dir, &root_dir_file);
+  if (!dir_lookup (&dir, name, &hdr_sector))
+    goto exit;
+
+  /* Read the file header. */
+  filehdr_read (&filehdr, hdr_sector);
+
+  /* Allocate a block for the file header. */
+  bitmap_init (&free_map, disk_size (disk));
+  bitmapio_read (&free_map, &free_map_file);
+
+  /* Deallocate. */
+  filehdr_deallocate (&filehdr, &free_map);
+  bitmap_reset (&free_map, hdr_sector);
+  dir_remove (&dir, name);
+
+  /* Write everything back. */
+  bitmapio_write (&free_map, &free_map_file);
+  dir_write (&dir, &root_dir_file);
+
+  success = true;
+
+  /* Clean up. */
+  filehdr_destroy (&filehdr);
+  bitmap_destroy (&free_map);
+ exit:
+  dir_destroy (&dir);
 
   return success;
 }
-#endif /* FILESYS_STUB */
 
 #undef NDEBUG
 #include "debug.h"