Changeset e1e3b26 in mainline

Timestamp:

2008-04-10T05:08:30Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e22632a9

Parents:

44882c8

Message:

Commit progress on the FAT file system server implementation.

Location:

uspace

Files:

• lib/libfs/libfs.c (modified) (2 diffs)
• lib/libfs/libfs.h (modified) (2 diffs)
• srv/fs/fat/fat.h (modified) (3 diffs)
• srv/fs/fat/fat_ops.c (modified) (7 diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)

uspace/lib/libfs/libfs.c

@@ -198 +198 @@
                                 else
                                         nodep = ops->node_get(dev_handle,
-                                            index);
+                                            index, ops->index_get(cur));
                                 if (nodep) {
                                         if (!ops->link(cur, nodep, component)) {
@@ -261 +261 @@
                                 nodep = ops->create(lflag);
                         else
-                                nodep = ops->node_get(dev_handle, index);
+                                nodep = ops->node_get(dev_handle, index,
+                                    ops->index_get(cur));
                         if (nodep) {
                                 if (!ops->link(cur, nodep, component)) {

uspace/lib/libfs/libfs.h

@@ -44 +44 @@
 typedef struct {
         void * (* match)(void *, const char *);
-        void * (* node_get)(dev_handle_t, fs_index_t);
+        void * (* node_get)(dev_handle_t, fs_index_t, fs_index_t);
         void * (* create)(int);
         void (* destroy)(void *);
@@ -67 +67 @@
 extern int fs_register(int, fs_reg_t *, vfs_info_t *, async_client_conn_t);
 
-extern int block_read(int, unsigned long, void *);
-extern int block_write(int, unsigned long, void *);
-
-extern void node_add_mp(int, unsigned long);
-extern void node_del_mp(int, unsigned long);
-extern bool node_is_mp(int, unsigned long);
-
 extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
 

uspace/srv/fs/fat/fat.h

@@ -59 +59 @@
         uint16_t        headcnt;        /**< Number of heads. */
         uint32_t        hidden_sec;     /**< Hidden sectors. */
-        uint32_t        totseci32;      /**< Total sectors. 32-bit version. */
+        uint32_t        totsec32;       /**< Total sectors. 32-bit version. */
 
         union {
@@ -141 +141 @@
 
 typedef enum {
+        FAT_INVALID,
         FAT_DIRECTORY,
         FAT_FILE
@@ -150 +151 @@
         /** VFS index is the node's first allocated cluster. */
         fs_index_t              index;
+        /** VFS index of the parent node. */
+        fs_index_t              pindex;
         dev_handle_t            dev_handle;
         /** FAT in-core node hash table link. */
         link_t                  fin_link;
+        /** FAT in-core node free list link. */
+        link_t                  ffn_link;
         size_t                  size;
         unsigned                lnkcnt;
+        unsigned                refcnt;
+        bool                    dirty;
 } fat_node_t;
 

uspace/srv/fs/fat/fat_ops.c

@@ -44 +44 @@
 #include <string.h>
 #include <byteorder.h>
+#include <libadt/hash_table.h>
+#include <libadt/list.h>
+#include <assert.h>
+
+/** Hash table of FAT in-core nodes. */
+hash_table_t fin_hash;
+
+/** List of free FAT in-core nodes. */
+link_t ffn_head;
 
 #define FAT_NAME_LEN            8
@@ -93 +102 @@
 }
 
-static block_t *fat_block_get(fat_node_t *node, off_t offset) {
+static block_t *fat_block_get(dev_handle_t dev_handle, fs_index_t index,
+    off_t offset) {
         return NULL;    /* TODO */
 }
@@ -102 +112 @@
 }
 
-static void *fat_node_get(dev_handle_t dev_handle, fs_index_t index)
-{
-        return NULL;    /* TODO */
+static void fat_node_initialize(fat_node_t *node)
+{
+        node->type = 0;
+        node->index = 0;
+        node->pindex = 0;
+        node->dev_handle = 0;
+        link_initialize(&node->fin_link);
+        link_initialize(&node->ffn_link);
+        node->size = 0;
+        node->lnkcnt = 0;
+        node->refcnt = 0;
+        node->dirty = false;
+}
+
+static void fat_sync_node(fat_node_t *node)
+{
+        /* TODO */
+}
+
+static void *
+fat_node_get(dev_handle_t dev_handle, fs_index_t index, fs_index_t pindex)
+{
+        link_t *lnk;
+        fat_node_t *node = NULL;
+        block_t *bb;
+        block_t *b;
+        fat_dentry_t *d;
+        unsigned bps;           /* bytes per sector */
+        unsigned dps;           /* dentries per sector */
+
+        unsigned long key[] = {
+                dev_handle,
+                index
+        };
+
+        lnk = hash_table_find(&fin_hash, key);
+        if (lnk) {
+                /*
+                 * The in-core node was found in the hash table.
+                 */
+                node = hash_table_get_instance(lnk, fat_node_t, fin_link);
+                if (!node->refcnt++)
+                        list_remove(&node->ffn_link);
+                return (void *) node;   
+        }
+
+        if (!list_empty(&ffn_head)) {
+                /*
+                 * We are going to reuse a node from the free list.
+                 */
+                lnk = ffn_head.next; 
+                list_remove(lnk);
+                node = list_get_instance(lnk, fat_node_t, ffn_link);
+                assert(!node->refcnt);
+                if (node->dirty)
+                        fat_sync_node(node);
+        } else {
+                /*
+                 * We need to allocate a new node.
+                 */
+                node = malloc(sizeof(fat_node_t));
+                if (!node)
+                        return NULL;
+        }
+        fat_node_initialize(node);
+
+        if (!pindex) {
+                
+        } else {
+        }
+
 }
 
@@ -131 +209 @@
                 unsigned dentries;
                 
-                b = fat_block_get(parentp, i);
+                b = fat_block_get(parentp->dev_handle, parentp->index, i);
                 if (!b) 
                         return NULL;
@@ -165 +243 @@
                                 /* hit */
                                 void *node = fat_node_get(parentp->dev_handle,
-                                    (fs_index_t)uint16_t_le2host(d->firstc));
+                                    (fs_index_t)uint16_t_le2host(d->firstc),
+                                    parentp->index);
                                 block_put(b);
                                 return node;
@@ -174 +253 @@
 
         return NULL;
+}
+
+static fs_index_t fat_index_get(void *node)
+{
+        fat_node_t *fnodep = (fat_node_t *)node;
+        if (!fnodep)
+                return 0;
+        return fnodep->index;
+}
+
+static size_t fat_size_get(void *node)
+{
+        return ((fat_node_t *)node)->size;
+}
+
+static unsigned fat_lnkcnt_get(void *node)
+{
+        return ((fat_node_t *)node)->lnkcnt;
+}
+
+static bool fat_is_directory(void *node)
+{
+        return ((fat_node_t *)node)->type == FAT_DIRECTORY;
+}
+
+static bool fat_is_file(void *node)
+{
+        return ((fat_node_t *)node)->type == FAT_FILE;
 }
 
@@ -184 +291 @@
         .link = NULL,
         .unlink = NULL,
-        .index_get = NULL,
-        .size_get = NULL,
-        .lnkcnt_get = NULL,
+        .index_get = fat_index_get,
+        .size_get = fat_size_get,
+        .lnkcnt_get = fat_lnkcnt_get,
         .has_children = NULL,
         .root_get = NULL,
         .plb_get_char = NULL,
-        .is_directory = NULL,
-        .is_file = NULL
+        .is_directory = fat_is_directory,
+        .is_file = fat_is_file
 };
 

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -71 +71 @@
 /* Forward declarations of static functions. */
 static void *tmpfs_match(void *, const char *);
-static void *tmpfs_node_get(dev_handle_t, fs_index_t);
+static void *tmpfs_node_get(dev_handle_t, fs_index_t, fs_index_t);
 static void *tmpfs_create_node(int);
 static bool tmpfs_link_node(void *, void *, const char *);
@@ -267 +267 @@
 
 void *
-tmpfs_node_get(dev_handle_t dev_handle, fs_index_t index)
+tmpfs_node_get(dev_handle_t dev_handle, fs_index_t index, fs_index_t pindex)
 {
         unsigned long key = index;