Changeset 89c57b6 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/vfs/vfs_register.c (modified) (15 diffs)

uspace/srv/vfs/vfs_register.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <async.h>
 #include <fibril.h>
+#include <fibril_synch.h>
 #include <errno.h>
 #include <stdio.h>
@@ -46 +46 @@
 #include <ctype.h>
 #include <bool.h>
-#include <fibril_synch.h>
 #include <adt/list.h>
 #include <as.h>
@@ -110 +109 @@
 void vfs_register(ipc_callid_t rid, ipc_call_t *request)
 {
+        int phone;
+        
         dprintf("Processing VFS_REGISTER request received from %p.\n",
             request->in_phone_hash);
@@ -120 +121 @@
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                ipc_answer_0(rid, rc);
+                async_answer_0(rid, rc);
                 return;
         }
@@ -130 +131 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                ipc_answer_0(rid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
                 return;
         }
         
         link_initialize(&fs_info->fs_link);
-        fibril_mutex_initialize(&fs_info->phone_lock);
         fs_info->vfs_info = *vfs_info;
         free(vfs_info);
@@ -143 +143 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -159 +159 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(rid, EEXISTS);
+                async_answer_0(rid, EEXISTS);
                 return;
         }
@@ -176 +176 @@
         ipc_call_t call;
         ipc_callid_t 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));
+        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        fs_info->phone = IPC_GET_ARG5(call);
-        ipc_answer_0(callid, EOK);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+        
+        phone = IPC_GET_ARG5(call);
+        async_session_create(&fs_info->session, phone, 0);
+        async_answer_0(callid, EOK);
         
         dprintf("Callback connection to FS created.\n");
@@ -196 +198 @@
         size_t size;
         if (!async_share_in_receive(&callid, &size)) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
+                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
-                free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_session_destroy(&fs_info->session);
+                async_hangup(phone);
+                free(fs_info);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -213 +216 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
-                free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_session_destroy(&fs_info->session);
+                async_hangup(phone);
+                free(fs_info);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -234 +238 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
+        async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);
@@ -252 +256 @@
 int vfs_grab_phone(fs_handle_t handle)
 {
+        link_t *cur;
+        fs_info_t *fs;
         int phone;
 
@@ -262 +268 @@
          */
         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);
+                        phone = async_exchange_begin(&fs->session);
 
                         assert(phone > 0);
@@ -284 +286 @@
  * @param phone         Phone to FS task.
  */
-void vfs_release_phone(int phone)
-{
-        /* TODO: implement connection caching */
-        ipc_hangup(phone);
+void vfs_release_phone(fs_handle_t handle, int phone)
+{
+        link_t *cur;
+        fs_info_t *fs;
+
+        fibril_mutex_lock(&fs_head_lock);
+        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);
+                        async_exchange_end(&fs->session, phone);
+                        return;
+                }
+        }
+        /* should not really get here */
+        abort();
+        fibril_mutex_unlock(&fs_head_lock);
 }
 
@@ -317 +332 @@
 }
 
+/** Find the VFS info structure.
+ *
+ * @param handle        FS handle for which the VFS info structure is sought.
+ * @return              VFS info structure on success or NULL otherwise.
+ */
+vfs_info_t *fs_handle_to_info(fs_handle_t handle)
+{
+        vfs_info_t *info = NULL;
+        link_t *cur;
+
+        fibril_mutex_lock(&fs_head_lock);
+        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->fs_handle == handle) { 
+                        info = &fs->vfs_info;
+                        break;
+                }
+        }
+        fibril_mutex_unlock(&fs_head_lock);
+
+        return info;
+}
+
 /**
  * @}