Changeset 04a73cdf in mainline for libc/generic/ipc.c

Timestamp:

2006-05-17T14:05:01Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

04552a80

Parents:

afa6e74

Message:

Sync with kernel.
Add ipc_wait_for_call_timeout() and ipc_trywait_for_call().
Modify ipc_wait_for_call() to be unconditional.

File:

• libc/generic/ipc.c (modified) (3 diffs)

libc/generic/ipc.c

@@ -35 +35 @@
 #include <unistd.h>
 #include <futex.h>
+#include <kernel/synch/synch.h>
 
 /** Structure used for keeping track of sent async msgs 
@@ -252 +253 @@
 
 
-/** Wait for IPC call and return
+/** Unconditionally wait for an IPC call.
  *
  * - dispatch ASYNC reoutines in the background
- * @param data Space where the message is stored
- * @return Callid or 0 if nothing available and started with 
- *         IPC_WAIT_NONBLOCKING
- */
-ipc_callid_t ipc_wait_for_call(ipc_call_t *call, int flags)
+ * @param call Space where the message is stored
+ * @return Callid of the answer.
+ */
+ipc_callid_t ipc_wait_for_call(ipc_call_t *call)
 {
         ipc_callid_t callid;
@@ -266 +266 @@
                 try_dispatch_queued_calls();
 
-                callid = __SYSCALL2(SYS_IPC_WAIT, (sysarg_t)call, flags);
+                callid = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, SYNCH_NO_TIMEOUT, SYNCH_BLOCKING);
+                /* Handle received answers */
+                if (callid & IPC_CALLID_ANSWERED)
+                        handle_answer(callid, call);
+        } while (callid & IPC_CALLID_ANSWERED);
+
+        return callid;
+}
+
+/** Wait some time for an IPC call.
+ *
+ * - dispatch ASYNC reoutines in the background
+ * @param call Space where the message is stored
+ * @param usec Timeout in microseconds.
+ * @return Callid of the answer.
+ */
+ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *call, uint32_t usec)
+{
+        ipc_callid_t callid;
+
+        do {
+                try_dispatch_queued_calls();
+
+                callid = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, SYNCH_BLOCKING);
+                /* Handle received answers */
+                if (callid & IPC_CALLID_ANSWERED)
+                        handle_answer(callid, call);
+        } while (callid & IPC_CALLID_ANSWERED);
+
+        return callid;
+}
+
+/** Check if there is an IPC call waiting to be picked up.
+ *
+ * - dispatch ASYNC reoutines in the background
+ * @param call Space where the message is stored
+ * @return Callid of the answer.
+ */
+ipc_callid_t ipc_trywait_for_call(ipc_call_t *call)
+{
+        ipc_callid_t callid;
+
+        do {
+                try_dispatch_queued_calls();
+
+                callid = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t)call, SYNCH_NO_TIMEOUT, SYNCH_NON_BLOCKING);
                 /* Handle received answers */
                 if (callid & IPC_CALLID_ANSWERED)