WebSVN – HelenOS – Diff – /trunk/uspace/srv/vfs/vfs_register.c

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <bool.h>
-#include <futex.h>
+#include <fibril_sync.h>
 #include <adt/list.h>
 #include <as.h>
 #include <assert.h>
 #include <atomic.h>
 #include "vfs.h"
-atomic_t fs_head_futex = FUTEX_INITIALIZER;
+FIBRIL_MUTEX_INITIALIZE(fs_head_lock);
 link_t fs_head;
 atomic_t fs_handle_next = {
     .count = 1
 };
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
+    }
     link_initialize(&fs_info->fs_link);
-    futex_initialize(&fs_info->phone_futex, 1);
+    fibril_mutex_initialize(&fs_info->phone_lock);
     rc = ipc_data_write_finalize(callid, &fs_info->vfs_info, size);
     if (rc != EOK) {
         dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
             rc);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
+    }
-    futex_down(&fs_head_futex);
+    fibril_mutex_lock(&fs_head_lock);
-    fibril_inc_sercount();
     /*
      * Check for duplicit registrations.
      */
     if (fs_name_to_handle(fs_info->vfs_info.name, false)) {
         /*
          * We already register a fs like this.
          */
         dprintf("FS is already registered.\n");
-        fibril_dec_sercount();
-        futex_up(&fs_head_futex);
+        fibril_mutex_unlock(&fs_head_lock);
         free(fs_info);
         ipc_answer_0(callid, EEXISTS);
         ipc_answer_0(rid, EEXISTS);
         return;
+    }
      */
     callid = async_get_call(&call);
     if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
         dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
         list_remove(&fs_info->fs_link);
-        fibril_dec_sercount();
-        futex_up(&fs_head_futex);
+        fibril_mutex_unlock(&fs_head_lock);
         free(fs_info);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
+    }
      */
     if (!ipc_share_in_receive(&callid, &size)) {
         dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
         list_remove(&fs_info->fs_link);
-        fibril_dec_sercount();
-        futex_up(&fs_head_futex);
+        fibril_mutex_unlock(&fs_head_lock);
         ipc_hangup(fs_info->phone);
         free(fs_info);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
      * We can only send the client address space area PLB_SIZE bytes long.
      */
     if (size != PLB_SIZE) {
         dprintf("Client suggests wrong size of PFB, size = %d\n", size);
         list_remove(&fs_info->fs_link);
-        fibril_dec_sercount();
-        futex_up(&fs_head_futex);
+        fibril_mutex_unlock(&fs_head_lock);
         ipc_hangup(fs_info->phone);
         free(fs_info);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
      * system a global file system handle.
      */
     fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
     ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
-    fibril_dec_sercount();
-    futex_up(&fs_head_futex);
+    fibril_mutex_unlock(&fs_head_lock);
     dprintf("\"%.*s\" filesystem successfully registered, handle=%d.\n",
         FS_NAME_MAXLEN, fs_info->vfs_info.name, fs_info->fs_handle);
+}
      * open any additional phones (even though that itself would be pretty
      * straightforward; housekeeping multiple open phones to a FS task would
      * be more demanding). Instead, we simply take the respective
      * phone_futex and keep it until vfs_release_phone().
      */
-    futex_down(&fs_head_futex);
+    fibril_mutex_lock(&fs_head_lock);
     link_t *cur;
     fs_info_t *fs;
     for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
         fs = list_get_instance(cur, fs_info_t, fs_link);
         if (fs->fs_handle == handle) {
-            futex_up(&fs_head_futex);
+            fibril_mutex_unlock(&fs_head_lock);
-            /*
-             * For now, take the futex unconditionally.
-             * Oh yeah, serialization rocks.
-             * It will be up'ed in vfs_release_phone().
-             */
-            futex_down(&fs->phone_futex);
+            fibril_mutex_lock(&fs->phone_lock);
-            /*
-             * Avoid deadlock with other fibrils in the same thread
-             * by disabling fibril preemption.
-             */
-            fibril_inc_sercount();
             return fs->phone;
+        }
+    }
-    futex_up(&fs_head_futex);
+    fibril_mutex_unlock(&fs_head_lock);
     return 0;
+}
 /** Tell VFS that the phone is in use for any request.
+ *
  */
 void vfs_release_phone(int phone)
+{
     bool found = false;
-    /*
-     * Undo the fibril_inc_sercount() done in vfs_grab_phone().
-     */
-    fibril_dec_sercount();
-    futex_down(&fs_head_futex);
+    fibril_mutex_lock(&fs_head_lock);
     link_t *cur;
     for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
         fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
         if (fs->phone == phone) {
             found = true;
-            futex_up(&fs_head_futex);
+            fibril_mutex_unlock(&fs_head_lock);
-            futex_up(&fs->phone_futex);
+            fibril_mutex_unlock(&fs->phone_lock);
             return;
+        }
+    }
-    futex_up(&fs_head_futex);
+    fibril_mutex_unlock(&fs_head_lock);
     /*
      * Not good to get here.
      */
     assert(found == true);
+}
 /** Convert file system name to its handle.
+ *
  * @param name      File system name.
- * @param lock      If true, the function will down and up the
+ * @param lock      If true, the function will lock and unlock the
- *          fs_head_futex.
+ *          fs_head_lock.
+ *
  * @return      File system handle or zero if file system not found.
  */
 fs_handle_t fs_name_to_handle(char *name, bool lock)
+{
     int handle = 0;
     if (lock)
-        futex_down(&fs_head_futex);
+        fibril_mutex_lock(&fs_head_lock);
     link_t *cur;
     for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
         fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
         if (str_cmp(fs->vfs_info.name, name) == 0) {
             handle = fs->fs_handle;
             break;
+        }
+    }
     if (lock)
-        futex_up(&fs_head_futex);
+        fibril_mutex_unlock(&fs_head_lock);
     return handle;
+}
 /**
  * @}

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/vfs/vfs_register.c – Rev 4509 → 4518