Changeset 337 for trunk/kernel/vfs

Timestamp:

Aug 7, 2017, 12:50:17 PM (7 years ago)

Author:

alain

Message:

Introduce the delayed context switch if current thread has a lock.

File:

• trunk/kernel/vfs/vfs.c (modified) (7 diffs)

trunk/kernel/vfs/vfs.c

@@ -40 +40 @@
 #include <mapper.h>
 #include <thread.h>
+#include <chdev.h>
 #include <process.h>
 #include <vfs.h>
@@ -52 +53 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 
-extern vfs_ctx_t   fs_context[FS_TYPES_NR];    // allocated in kernel_init.c
-
+extern vfs_ctx_t          fs_context[FS_TYPES_NR];    // allocated in kernel_init.c
+
+extern chdev_directory_t  chdev_dir;                  // allocated in kernel_init.c  
   
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -534 +536 @@
     file->attr     = attr;
     file->offset   = 0;
-    file->refcount = 0;
+    file->refcount = 1;
     file->inode    = inode;
     file->ctx      = inode->ctx;
@@ -1053 +1055 @@
 //////////////////////////////////////////////////////////////////////////
 // This static function is called by the vfs_display() function.
+// that is supposed to take the TXT0 lock.
 //////////////////////////////////////////////////////////////////////////
 static void vfs_recursive_display( xptr_t   inode_xp,
@@ -1104 +1107 @@
 
     // display inode
-    printk("%s%s <%s> inode_xp = %l / dentry_xp = %l\n",
-           indent_str[indent], vfs_inode_type_str( inode_type ), 
-           name , inode_xp , dentry_xp );
+    nolock_printk("%s%s <%s> inode_xp = %l / dentry_xp = %l\n",
+                  indent_str[indent], vfs_inode_type_str( inode_type ), 
+                  name , inode_xp , dentry_xp );
 
     // scan directory entries  
@@ -1155 +1158 @@
     cxy_t          dentry_cxy;
     vfs_dentry_t * dentry_ptr;
+    uint32_t       save_sr;
 
     // get target inode cluster and local pointer 
@@ -1179 +1183 @@
     }
 
+    // get pointers on TXT0 chdev
+    xptr_t    txt0_xp  = chdev_dir.txt[0];
+    cxy_t     txt0_cxy = GET_CXY( txt0_xp );
+    chdev_t * txt0_ptr = GET_PTR( txt0_xp );
+
+    // get extended pointer on remote TXT0 chdev lock
+    xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
+
+    // get TXT0 lock in busy waiting mode
+    remote_spinlock_lock_busy( lock_xp , &save_sr );
+
     // print header
-    printk("\n*** VFS ***\n");
+    nolock_printk("\n***** file system state\n");
 
     // call recursive function
     vfs_recursive_display( inode_xp , name_xp , dentry_xp , 0 );
+
+    // release lock
+    remote_spinlock_unlock_busy( lock_xp , save_sr );
 
 }  // end vfs_display()