Changeset 58fe0aa in mainline

Timestamp:

2010-12-27T17:41:19Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d493830e

Parents:

f57aebc (diff), 6e5b4e7 (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.

Files:

• boot/arch/ia64/Makefile.inc (modified) (1 diff)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/async.c (modified) (1 diff)
• uspace/lib/c/generic/async_rel.c (deleted)
• uspace/lib/c/generic/async_sess.c (added)
• uspace/lib/c/generic/libc.c (modified) (2 diffs)
• uspace/lib/c/include/async.h (modified) (1 diff)
• uspace/lib/c/include/async_sess.h (moved) (moved from uspace/lib/c/include/async_rel.h ) (1 diff)
• uspace/srv/vfs/vfs.h (modified) (2 diffs)
• uspace/srv/vfs/vfs_register.c (modified) (8 diffs)

boot/arch/ia64/Makefile.inc

@@ -34 +34 @@
 ENDIANESS = LE
 PAGE_SIZE = 16384
-EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic
+EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
 
 RD_SRVS_NON_ESSENTIAL +=

uspace/lib/c/Makefile

@@ -87 +87 @@
         generic/ipc.c \
         generic/async.c \
-        generic/async_rel.c \
+        generic/async_sess.c \
         generic/loader.c \
         generic/getopt.c \

uspace/lib/c/generic/async.c

@@ -749 +749 @@
                 return ENOMEM;
         }
+
+        _async_sess_init();
         
         return 0;

uspace/lib/c/generic/libc.c

@@ -50 +50 @@
 #include <ipc/ipc.h>
 #include <async.h>
-#include <async_rel.h>
 #include <as.h>
 #include <loader/pcb.h>
@@ -66 +65 @@
         __heap_init();
         __async_init();
-        (void) async_rel_init();
         fibril_t *fibril = fibril_setup();
         __tcb_set(fibril->tcb);

uspace/lib/c/include/async.h

@@ -37 +37 @@
 
 #include <ipc/ipc.h>
+#include <async_sess.h>
 #include <fibril.h>
 #include <sys/time.h>

uspace/lib/c/include/async_sess.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_ASYNC_REL_H_
-#define LIBC_ASYNC_REL_H_
+#ifndef LIBC_ASYNC_SESS_H_
+#define LIBC_ASYNC_SESS_H_
 
-extern int async_rel_init(void);
-extern int async_relation_create(int);
-extern void async_relation_destroy(int, int);
+#include <adt/list.h>
+
+typedef struct {
+        int sess_phone;         /**< Phone for cloning off the connections. */
+        link_t conn_head;       /**< List of open data connections. */
+        link_t sess_link;       /**< Link in global list of open sessions. */
+} async_sess_t;
+
+extern void _async_sess_init(void);
+extern void async_session_create(async_sess_t *, int);
+extern void async_session_destroy(async_sess_t *);
+extern int async_exchange_begin(async_sess_t *);
+extern void async_exchange_end(async_sess_t *, int);
 
 #endif

uspace/srv/vfs/vfs.h

@@ -34 +34 @@
 #define VFS_VFS_H_
 
+#include <async.h>
 #include <ipc/ipc.h>
 #include <adt/list.h>
@@ -53 +54 @@
         vfs_info_t vfs_info;
         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

@@ -39 +39 @@
 #include <ipc/services.h>
 #include <async.h>
-#include <async_rel.h>
 #include <fibril.h>
 #include <fibril_synch.h>
@@ -111 +110 @@
 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);
@@ -136 +137 @@
         
         link_initialize(&fs_info->fs_link);
-        fibril_mutex_initialize(&fs_info->phone_lock);
         fs_info->vfs_info = *vfs_info;
         free(vfs_info);
@@ -186 +186 @@
                 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 +202 @@
                 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 +217 @@
                 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);
@@ -269 +273 @@
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_head_lock);
-                        fibril_mutex_lock(&fs->phone_lock);
-                        phone = async_relation_create(fs->phone);
-                        fibril_mutex_unlock(&fs->phone_lock);
+                        phone = async_exchange_begin(&fs->session);
 
                         assert(phone > 0);
@@ -295 +297 @@
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_head_lock);
-                        fibril_mutex_lock(&fs->phone_lock);
-                        async_relation_destroy(fs->phone, phone);
-                        fibril_mutex_unlock(&fs->phone_lock);
+                        async_exchange_end(&fs->session, phone);
                         return;
                 }