WebSVN – HelenOS – Diff – //branches/dd/uspace/srv/vfs/vfs_register.c

 #include <as.h>
 #include <assert.h>
 #include <atomic.h>
 #include "vfs.h"
+FIBRIL_CONDVAR_INITIALIZE(fs_head_cv);
 FIBRIL_MUTEX_INITIALIZE(fs_head_lock);
-link_t fs_head;
+LIST_INITIALIZE(fs_head);
 atomic_t fs_handle_next = {
     .count = 1
 };
      * 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_condvar_broadcast(&fs_head_cv);
     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);
+}
  * @return      Phone over which a multi-call request can be safely
  *          sent. Return 0 if no phone was found.
  */
 int vfs_grab_phone(fs_handle_t handle)
+{
+    int phone;
     /*
-     * For now, we don't try to be very clever and very fast.
+     * For now, we don't try to be very clever and very fast.  We simply
-     * We simply lookup the phone in the fs_head list. We currently don't
+     * lookup the phone in the fs_head list and duplicate it.  The duplicate
-     * open any additional phones (even though that itself would be pretty
+     * phone will be returned to the client and the client will use it for
-     * straightforward; housekeeping multiple open phones to a FS task would
-     * be more demanding). Instead, we simply take the respective
+     * communication.  In the future, we should cache the connections so
-     * phone_futex and keep it until vfs_release_phone().
+     * that they do not have to be reestablished over and over again.
      */
     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) {
             fibril_mutex_unlock(&fs_head_lock);
             fibril_mutex_lock(&fs->phone_lock);
+            phone = ipc_connect_me_to(fs->phone, 0, 0, 0);
+            fibril_mutex_unlock(&fs->phone_lock);
+            assert(phone > 0);
-            return fs->phone;
+            return phone;
+        }
+    }
     fibril_mutex_unlock(&fs_head_lock);
     return 0;
+}
-/** Tell VFS that the phone is in use for any request.
+/** Tell VFS that the phone is not needed anymore.
+ *
  * @param phone     Phone to FS task.
  */
 void vfs_release_phone(int phone)
+{
-    bool found = false;
-    fibril_mutex_lock(&fs_head_lock);
-    link_t *cur;
-    for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
+    /* TODO: implement connection caching */
-        fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-        if (fs->phone == phone) {
+    ipc_hangup(phone);
-            found = true;
-            fibril_mutex_unlock(&fs_head_lock);
-            fibril_mutex_unlock(&fs->phone_lock);
-            return;
-        }
-    }
-    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.

Subversion Repositories HelenOS

(root)//branches/dd/uspace/srv/vfs/vfs_register.c – Rev 4537 → 4668