Changeset 3209923 in mainline for uspace/lib/libc/generic/ipc.c

Timestamp:

2007-11-20T09:12:49Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b74959bd

Parents:

bc50fc42

Message:

Modify asynchronous IPC to make use of all six syscall arguments. The preferred
means of asynchronous communication is now via the set of ipc_call_async_m()
macros, where m is the number of payload arguments passed to the kernel. These
macros will automatically decide between the fast and the universal slow version
of ipc_call_async.

File:

• uspace/lib/libc/generic/ipc.c (modified) (9 diffs)

uspace/lib/libc/generic/ipc.c

@@ -190 +190 @@
 static ipc_callid_t _ipc_call_async(int phoneid, ipc_call_t *data)
 {
-        return __SYSCALL2(SYS_IPC_CALL_ASYNC, phoneid, (sysarg_t) data);
+        return __SYSCALL2(SYS_IPC_CALL_ASYNC_SLOW, phoneid, (sysarg_t) data);
 }
 
@@ -269 +269 @@
 /** Make a fast asynchronous call.
  *
- * This function can only handle two arguments of payload. It is, however,
- * faster than the more generic ipc_call_async_3().
+ * This function can only handle four arguments of payload. It is, however,
+ * faster than the more generic ipc_call_async_slow().
  *
  * Note that this function is a void function.
@@ -281 +281 @@
  * @param arg1          Service-defined payload argument.
  * @param arg2          Service-defined payload argument.
+ * @param arg3          Service-defined payload argument.
+ * @param arg4          Service-defined payload argument.
  * @param private       Argument to be passed to the answer/error callback.
  * @param callback      Answer or error callback.
@@ -287 +289 @@
  *                      asynchronous calls.
  */
-void ipc_call_async_2(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, void *private, ipc_async_callback_t callback,
-    int can_preempt)
+void ipc_call_async_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, void *private,
+    ipc_async_callback_t callback, int can_preempt)
 {
         async_call_t *call = NULL;
@@ -305 +307 @@
          */
         futex_down(&ipc_futex);
-        callid = __SYSCALL4(SYS_IPC_CALL_ASYNC_FAST, phoneid, method, arg1,
-            arg2);
+        callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid, method, arg1,
+            arg2, arg3, arg4);
 
         if (callid == IPC_CALLRET_TEMPORARY) {
@@ -317 +319 @@
                 IPC_SET_ARG1(call->u.msg.data, arg1);
                 IPC_SET_ARG2(call->u.msg.data, arg2);
+                IPC_SET_ARG3(call->u.msg.data, arg3);
+                IPC_SET_ARG4(call->u.msg.data, arg4);
         }
         ipc_finish_async(callid, phoneid, call, can_preempt);
@@ -333 +337 @@
  * @param arg2          Service-defined payload argument.
  * @param arg3          Service-defined payload argument.
+ * @param arg4          Service-defined payload argument.
+ * @param arg5          Service-defined payload argument.
  * @param private       Argument to be passed to the answer/error callback.
  * @param callback      Answer or error callback.
@@ -340 +346 @@
  *
  */
-void ipc_call_async_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, void *private, ipc_async_callback_t callback,
-    int can_preempt)
+void ipc_call_async_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, void *private,
+    ipc_async_callback_t callback, int can_preempt)
 {
         async_call_t *call;
@@ -355 +361 @@
         IPC_SET_ARG2(call->u.msg.data, arg2);
         IPC_SET_ARG3(call->u.msg.data, arg3);
+        IPC_SET_ARG4(call->u.msg.data, arg4);
+        IPC_SET_ARG5(call->u.msg.data, arg5);
         /*
-         * We need to make sure that we get callid before another thread accesses
-         * the queue again.
+         * We need to make sure that we get callid before another thread
+         * accesses the queue again.
          */
         futex_down(&ipc_futex);