Changeset 10

Timestamp:

Apr 26, 2017, 2:24:47 PM (8 years ago)

Author:

alain

Message:

Merge all FS related files in one single directory.

Location:

trunk/kernel/vfs

Files:

• fatfs.c (modified) (1 diff)
• ramfs.c (modified) (1 diff)
• vfs.c (modified) (3 diffs)
• vfs.h (modified) (6 diffs)

trunk/kernel/vfs/fatfs.c

@@ -252 +252 @@
 
     // compute FATFS_cluster index for the accessed page
-    uint32_t cluster;
+    uint32_t cluster = 0;
     error_t  error = fatfs_cluster_from_index( fatfs_ctx,
                                                first_cluster,

trunk/kernel/vfs/ramfs.c

@@ -71 +71 @@
 void ramfs_inode_destroy( struct vfs_inode_s * inode )
 {
-    printk("\n[PANIC] %s not fully implemented yet\n", __FUNCTION__ );
-    hal_core_sleep();
-
-    return 0;
+    assert( false , __FUNCTION__ , "not fully implemented yet" );
 }
 

trunk/kernel/vfs/vfs.c

@@ -177 +177 @@
 
     // initialize inode locks 
-    remote_rwlock_init( XPTR( local_cxy , &inode->size_lock ) );
+    remote_rwlock_init( XPTR( local_cxy , &inode->data_lock ) );
     remote_spinlock_init( XPTR( local_cxy , &inode->main_lock ) );
 
@@ -238 +238 @@
 
     // get size
-    remote_rwlock_rd_lock( XPTR( cxy , &ptr->size_lock ) );
+    remote_rwlock_rd_lock( XPTR( cxy , &ptr->data_lock ) );
     uint32_t size = hal_remote_lw( XPTR( cxy , &ptr->size ) );
-    remote_rwlock_rd_unlock( XPTR( cxy , &ptr->size_lock ) );
+    remote_rwlock_rd_unlock( XPTR( cxy , &ptr->data_lock ) );
     return size;
 }
@@ -253 +253 @@
 
     // set size
-    remote_rwlock_wr_unlock( XPTR( cxy , &ptr->size_lock ) );
+    remote_rwlock_wr_unlock( XPTR( cxy , &ptr->data_lock ) );
     hal_remote_sw( XPTR( cxy , &ptr->size ) , size );
-    remote_rwlock_wr_unlock( XPTR( cxy , &ptr->size_lock ) );
+    remote_rwlock_wr_unlock( XPTR( cxy , &ptr->data_lock ) );
 }
 

trunk/kernel/vfs/vfs.h

@@ -166 +166 @@
  * The <parent> inode is unique for a directory (not hard links for directories). 
  * For a file, the parent field points to the first dentry who created this inode.
- * TODO pourquoi deux types de locks ???
- *****************************************************************************************/
+ * Syncronisation:
+ * - the main_lock (spinlock) is used during the inode tree traversal or for inode
+ *   modification (add/remove children).
+ * - the data_lock (rwlock) is used during read/write accesses to the data stored
+ *   in the mapper. 
+ * - the mapper lock (rwlock) is only used during the radix tree traversal to return
+ *   to return the relevant page for red/write.
+ *****************************************************************************************/
+
+typedef enum   
+{
+    INODE_TYPE_NORMAL,                 /*! file or directory                            */
+    INODE_TYPE_PIPE,                   /*! POSIX pipe                                   */
+    INODE_TYPE_SOCKET,                 /*! POSIX socket                                 */
+    INODE_TYPE_DEV,                    /*! peripheral channel                           */
+}
+vfs_inode_type_t;
 
 typedef enum 
@@ -176 +191 @@
     INODE_ATTR_NEW    = 0x08,
 }
-inode_attr_t;
+vfs_inode_attr_t;
 
 typedef struct vfs_inode_s
@@ -184 +199 @@
         uint32_t                inum;        /*! inode identifier (unique in file system)    */
         uint32_t                attr;        /*! inode attributes (see above)                */
+        uint32_t                type;        /*! inode type (see above)                      */
         uint32_t                size;        /*! number of bytes                             */
         uint32_t                links;       /*! number of alias dentry                      */
@@ -192 +208 @@
         xptr_t                  parent_xp;   /*! extended pointer on parent dentry           */
         xhtab_t                 children;    /*! embedded htab of dir entries (for dir type) */
-        remote_rwlock_t         size_lock;   /*! protect size field modifications            */
-        remote_spinlock_t       main_lock;   /*! protect other fields (including children)   */
+        remote_rwlock_t         data_lock;   /*! protect read/write to data and to size      */
+        remote_spinlock_t       main_lock;   /*! protect inode tree traversal and modifs     */
         xlist_entry_t           xlist;       /*! member of set of inodes in same cluster     */
         xlist_entry_t           wait_root;   /*! root of threads waiting on this inode       */
@@ -229 +245 @@
  *****************************************************************************************/
 
-typedef enum   
-{
-    VFS_FD_NORMAL,                      /*! file or directory                            */
-    VFS_FD_PIPE,                        /*! POSIX pipe                                   */
-    VFS_FD_SOCKET,                      /*! POSIX socket                                 */
-    VFS_FD_DEV,                         /*! peripheral channel                           */
-}
-vfs_fd_type_t;
 
 typedef enum
 {
-    VFS_ATTR_READ_ENABLE  = 0x01,       /*! read access possible                         */
-    VFS_ATTR_WRITE_ENABLE = 0x02,       /*! write access possible                        */
-    VFS_ATTR_APPEND       = 0x04,       /*! append on each write                         */
-    VFS_ATTR_CLOSE_EXEC   = 0x08,       /*! close file on exec                           */
-    VFS_ATTR_SYNC         = 0x10,       /*! synchronise FS on each write                 */
-    VFS_ATTR_IS_DIR       = 0x20,       /*! this is a directory                          */
+    FD_ATTR_READ_ENABLE  = 0x01,       /*! read access possible                         */
+    FD_ATTR_WRITE_ENABLE = 0x02,       /*! write access possible                        */
+    FD_ATTR_APPEND       = 0x04,       /*! append on each write                         */
+    FD_ATTR_CLOSE_EXEC   = 0x08,       /*! close file on exec                           */
+    FD_ATTR_SYNC         = 0x10,       /*! synchronise FS on each write                 */
+    FD_ATTR_IS_DIR       = 0x20,       /*! this is a directory                          */
 }
 vfs_fd_attr_t;
@@ -281 +289 @@
 vfs_types_t;
 
+typedef enum
+{
+    CTX_ATTR_READ_ONLY    = 0x01,       /*! read access possible                         */
+    CTX_ATTR_SYNC         = 0x10,       /*! synchronise FS on each write                 */
+}
+vfs_ctx_attr_t;
+
 typedef struct vfs_ctx_s
 {
         uint32_t                      type;          /*! File System type                        */
-        uint32_t                      flags;         /*! TODO ???                                */
+        uint32_t                      attr;          /*! global attributes for all files in FS   */
         uint32_t                  count;         /*! number of clusters                      */
         uint32_t                  blksize;       /*! cluster size                            */