Changeset 3c22f70 in mainline for uspace/lib/c

Timestamp:

2011-01-24T00:14:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8c9b742

Parents:

11bb813

Message:

Pass client task hash into async_new_connection().

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (5 diffs)
• generic/net/modules.c (modified) (2 diffs)
• include/async.h (modified) (1 diff)
• include/ipc/ipc.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -139 +139 @@
         link_t link;
         
+        /** Incoming client task hash. */
+        sysarg_t in_task_hash;
         /** Incoming phone hash. */
         sysarg_t in_phone_hash;
@@ -517 +519 @@
  * particular fibrils.
  *
+ * @param in_task_hash  Identification of the incoming connection.
  * @param in_phone_hash Identification of the incoming connection.
  * @param callid        Hash of the opening IPC_M_CONNECT_ME_TO call.
@@ -529 +532 @@
  *
  */
-fid_t async_new_connection(sysarg_t in_phone_hash, ipc_callid_t callid,
-    ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
+fid_t async_new_connection(sysarg_t in_task_hash, sysarg_t in_phone_hash,
+    ipc_callid_t callid, ipc_call_t *call,
+    void (*cfibril)(ipc_callid_t, ipc_call_t *))
 {
         connection_t *conn = malloc(sizeof(*conn));
@@ -539 +543 @@
         }
         
+        conn->in_task_hash = in_task_hash;
         conn->in_phone_hash = in_phone_hash;
         list_initialize(&conn->msg_queue);
@@ -592 +597 @@
         case IPC_M_CONNECT_ME_TO:
                 /* Open new connection with fibril etc. */
-                async_new_connection(IPC_GET_ARG5(*call), callid, call,
-                    client_connection);
+                async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
+                    callid, call, client_connection);
                 goto out;
         }

uspace/lib/c/generic/net/modules.c

@@ -143 +143 @@
         if (phone >= 0) {
                 /* Request the bidirectional connection */
+                sysarg_t taskhash;
                 sysarg_t phonehash;
                 
-                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, NULL,
+                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &taskhash,
                     &phonehash);
                 if (rc != EOK) {
@@ -151 +152 @@
                         return rc;
                 }
-                async_new_connection(phonehash, 0, NULL, client_receiver);
+                async_new_connection(taskhash, phonehash, 0, NULL,
+                    client_receiver);
         }
         

uspace/lib/c/include/async.h

@@ -92 +92 @@
 extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t);
 
-extern fid_t async_new_connection(sysarg_t, ipc_callid_t, ipc_call_t *,
-    void (*)(ipc_callid_t, ipc_call_t *));
+extern fid_t async_new_connection(sysarg_t, sysarg_t, ipc_callid_t,
+    ipc_call_t *, void (*)(ipc_callid_t, ipc_call_t *));
 extern void async_usleep(suseconds_t);
 extern void async_create_manager(void);

uspace/lib/c/include/ipc/ipc.h

@@ -46 +46 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
+        sysarg_t in_task_hash;
         sysarg_t in_phone_hash;
-        sysarg_t in_task_hash;
 } ipc_call_t;