Changeset 04a73cdf in mainline

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.

Files:

• fb/fb.c (modified) (1 diff)
• init/init.c (modified) (6 diffs)
• kbd/generic/kbd.c (modified) (1 diff)
• libc/generic/ipc.c (modified) (3 diffs)
• libc/include/ipc/ipc.h (modified) (1 diff)
• ns/ns.c (modified) (1 diff)
• pci/pci.c (modified) (1 diff)

fb/fb.c

@@ -164 +164 @@
                 static int vfb_no=1;
 
-                callid = ipc_wait_for_call(&call, 0);
+                callid = ipc_wait_for_call(&call);
         //      printf("%s:Call phone=%lX..", NAME, call.in_phone_hash);
                 switch (IPC_GET_METHOD(call)&((1<<METHOD_WIDTH)-1)) {

init/init.c

@@ -180 +180 @@
                 printf(".");
         printf("\n");
-        ipc_wait_for_call(&data, NULL);
+        ipc_wait_for_call(&data);
         printf("Received call???\n");
 }
@@ -204 +204 @@
                 ipc_call_async(PHONE_NS, NS_PING_SVC, 0, "prov",
                                got_answer_2);
-                callid = ipc_wait_for_call(&data, NULL);
+                callid = ipc_wait_for_call(&data);
                 printf("Received ping\n");
                 ipc_answer_fast(callid, 0, 0, 0);
@@ -244 +244 @@
         printf("Newphid: %d\n", phoneid);
         for (i=0; i < 1000; i++) {
-                if ((callid=ipc_wait_for_call(&data, IPC_WAIT_NONBLOCKING)))
+                if ((callid=ipc_trywait_for_call(&data)))
                         printf("callid: %d\n");
         }
@@ -267 +267 @@
         
         for (i=0; i < 1000; i++) {
-                if ((callid=ipc_wait_for_call(&data, IPC_WAIT_NONBLOCKING)))
+                if ((callid=ipc_trywait_for_call(&data)))
                         printf("callid: %d\n");
         }
@@ -276 +276 @@
         ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
                          "Pong1", got_answer);
-        ipc_wait_for_call(&data, 0);
+        ipc_wait_for_call(&data);
 }
 
@@ -395 +395 @@
 //      test_as_send();
 //      test_pci();
-//      test_kbd();
+        test_kbd();
 //      test_fb();
 

kbd/generic/kbd.c

@@ -79 +79 @@
         
         while (1) {
-                callid = ipc_wait_for_call(&call, 0);
+                callid = ipc_wait_for_call(&call);
         //      printf("%s:Call phone=%lX..", NAME, call.in_phone_hash);
                 switch (IPC_GET_METHOD(call)) {

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)

libc/include/ipc/ipc.h

@@ -54 +54 @@
 extern int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1,
                          ipcarg_t *result);
-extern ipc_callid_t ipc_wait_for_call(ipc_call_t *data, int flags);
+extern ipc_callid_t ipc_wait_for_call(ipc_call_t *data);
+extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *data, uint32_t usec);
+extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data);
+
 extern ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1,
                            ipcarg_t arg2);

ns/ns.c

@@ -92 +92 @@
                 
         while (1) {
-                callid = ipc_wait_for_call(&call, 0);
+                callid = ipc_wait_for_call(&call);
 //              printf("NS: Call in_phone_hash=%lX...", call.in_phone_hash);
                 switch (IPC_GET_METHOD(call)) {

pci/pci.c

@@ -66 +66 @@
                 int retval;
 
-                callid = ipc_wait_for_call(&call, 0);
+                callid = ipc_wait_for_call(&call);
                 switch(IPC_GET_METHOD(call)) {
                 case IPC_M_CONNECT_ME_TO: