Changeset c1c0184 in mainline for uspace/srv

Timestamp:

2010-12-26T17:18:36Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d3cce52

Parents:

7907cf9

Message:

Make session management explicit.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (2 diffs)
• vfs_register.c (modified) (6 diffs)

uspace/srv/vfs/vfs.h

@@ -34 +34 @@
 #define VFS_VFS_H_
 
+#include <async.h>
 #include <ipc/ipc.h>
 #include <adt/list.h>
@@ -54 +55 @@
         fs_handle_t fs_handle;
         fibril_mutex_t phone_lock;
-        sysarg_t phone;
+        async_sess_t session;
 } fs_info_t;
 

uspace/srv/vfs/vfs_register.c

@@ -111 +111 @@
 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);
@@ -186 +188 @@
                 return;
         }
-        fs_info->phone = IPC_GET_ARG5(call);
+        
+        phone = IPC_GET_ARG5(call);
+        async_session_create(&fs_info->session, phone);
         ipc_answer_0(callid, EOK);
         
@@ -200 +204 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
+                async_session_destroy(&fs_info->session);
+                ipc_hangup(phone);
                 free(fs_info);
                 ipc_answer_0(callid, EINVAL);
@@ -214 +219 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
+                async_session_destroy(&fs_info->session);
+                ipc_hangup(phone);
                 free(fs_info);
                 ipc_answer_0(callid, EINVAL);
@@ -270 +276 @@
                         fibril_mutex_unlock(&fs_head_lock);
                         fibril_mutex_lock(&fs->phone_lock);
-                        phone = async_transaction_begin(fs->phone);
+                        phone = async_transaction_begin(&fs->session);
                         fibril_mutex_unlock(&fs->phone_lock);
 
@@ -296 +302 @@
                         fibril_mutex_unlock(&fs_head_lock);
                         fibril_mutex_lock(&fs->phone_lock);
-                        async_transaction_end(fs->phone, phone);
+                        async_transaction_end(&fs->session, phone);
                         fibril_mutex_unlock(&fs->phone_lock);
                         return;