Changeset 230260ac in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2009-06-09T22:27:43Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0e31a2b

Parents:

041186f

Message:

Make VFS use the new synchronization for fibrils. Now there should be no (or
only secondary) fibril serialization. Code reorganized not to hold the phone
lock during async_wait_for() in most cases. Tested on ia32. On amd64, VFS
crashes, but I think it is an unrelated problem.

File:

• uspace/srv/vfs/vfs.h (modified) (5 diffs)

uspace/srv/vfs/vfs.h

@@ -36 +36 @@
 #include <ipc/ipc.h>
 #include <adt/list.h>
+#include <fibril_sync.h>
 #include <futex.h>
-#include <rwlock.h>
 #include <sys/types.h>
 #include <devmap.h>
@@ -55 +55 @@
         vfs_info_t vfs_info;
         fs_handle_t fs_handle;
-        futex_t phone_futex;    /**< Phone serializing futex. */
+        fibril_mutex_t phone_lock;
         ipcarg_t phone;
 } fs_info_t;
@@ -123 +123 @@
          * Holding this rwlock prevents modifications of the node's contents.
          */
-        rwlock_t contents_rwlock;
+        fibril_rwlock_t contents_rwlock;
 } vfs_node_t;
 
@@ -132 +132 @@
 typedef struct {
         /** Serializes access to this open file. */
-        futex_t lock;
+        fibril_mutex_t lock;
 
         vfs_node_t *node;
@@ -166 +166 @@
 
 /** Holding this rwlock prevents changes in file system namespace. */ 
-extern rwlock_t namespace_rwlock;
+extern fibril_rwlock_t namespace_rwlock;
 
 extern int vfs_grab_phone(fs_handle_t);