Changeset 80649a91 in mainline for libc/generic/ipc.c

Timestamp:

2006-05-21T19:28:37Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

a410beb

Parents:

1ee11f4

Message:

Merged libadt into libc.
Made lot of psthread and thread stuff thread-safe.
Added new driver framework for easy C connection programming.
Changed FB code to use new API.

File:

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

libc/generic/ipc.c

@@ -58 +58 @@
 LIST_INITIALIZE(queued_calls);
 
-static atomic_t ipc_futex;
-
-void _ipc_init(void)
-{
-        futex_initialize(&ipc_futex, 1);
-}
+static atomic_t ipc_futex = FUTEX_INITIALIZER;
 
 int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, 
@@ -253 +248 @@
 
 
-/** Unconditionally wait for an IPC call.
+/** One cycle of ipc wait for call call
  *
  * - dispatch ASYNC reoutines in the background
  * @param call Space where the message is stored
+ * @param usec Timeout in microseconds
+ * @param flags Flags passed to SYS_IPC_WAIT (blocking, nonblocking)
  * @return Callid of the answer.
  */
-ipc_callid_t ipc_wait_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_BLOCKING);
-                /* Handle received answers */
-                if (callid & IPC_CALLID_ANSWERED)
-                        handle_answer(callid, call);
-        } while (callid & IPC_CALLID_ANSWERED);
+ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags)
+{
+        ipc_callid_t callid;
+
+        try_dispatch_queued_calls();
+        
+        callid = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags);
+        /* Handle received answers */
+        if (callid & IPC_CALLID_ANSWERED)
+                handle_answer(callid, call);
 
         return callid;
@@ -287 +282 @@
 
         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);
+                callid = ipc_wait_cycle(call, usec, SYNCH_BLOCKING);
         } while (callid & IPC_CALLID_ANSWERED);
 
@@ -309 +299 @@
 
         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)
-                        handle_answer(callid, call);
+                callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, SYNCH_NON_BLOCKING);
         } while (callid & IPC_CALLID_ANSWERED);