Changeset 553492be in mainline for uspace/srv/vfs/vfs_node.c

Timestamp:

2009-06-17T22:33:08Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ac47b7c2

Parents:

ca093b3

Message:

Finish converting VFS to fibril synchronization.

File:

• uspace/srv/vfs/vfs_node.c (modified) (7 diffs)

uspace/srv/vfs/vfs_node.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <string.h>
-#include <futex.h>
 #include <fibril_sync.h>
 #include <adt/hash_table.h>
@@ -46 +45 @@
 #include <errno.h>
 
-/** Futex protecting the VFS node hash table. */
-futex_t nodes_futex = FUTEX_INITIALIZER;
+/** Mutex protecting the VFS node hash table. */
+FIBRIL_MUTEX_INITIALIZE(nodes_mutex);
 
 #define NODES_BUCKETS_LOG       8
@@ -90 +89 @@
 void vfs_node_addref(vfs_node_t *node)
 {
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         _vfs_node_addref(node);
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
 }
 
@@ -106 +105 @@
         bool free_fs_node = false;
 
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         if (node->refcnt-- == 1) {
                 /*
@@ -122 +121 @@
                         free_fs_node = true;
         }
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
 
         if (free_fs_node) {
@@ -162 +161 @@
         vfs_node_t *node;
 
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         tmp = hash_table_find(&nodes, key);
         if (!tmp) {
                 node = (vfs_node_t *) malloc(sizeof(vfs_node_t));
                 if (!node) {
-                        futex_up(&nodes_futex);
+                        fibril_mutex_unlock(&nodes_mutex);
                         return NULL;
                 }
@@ -194 +193 @@
 
         _vfs_node_addref(node);
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
 
         return node;