Changeset bd5a663 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59477e3

Parents:

bdb9ea8

Message:

Modify ipc_wait_for_call() to support all of blocking, non-blocking and timeout operation.

Location:

generic

Files:

• include/ipc/ipc.h (modified) (3 diffs)
• include/ipc/sysipc.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (4 diffs)
• src/ipc/sysipc.c (modified) (1 diff)

generic/include/ipc/ipc.h

@@ -45 +45 @@
 #define IPC_CALL_CONN_ME_TO     (1<<4) /* Identify connect_me_to */
 #define IPC_CALL_NOTIF          (1<<5) /* Interrupt notification */
-
-/* Flags for ipc_wait_for_call */
-#define IPC_WAIT_NONBLOCKING   1
 
 /* Flags of callid (the addresses are aligned at least to 4, 
@@ -201 +198 @@
 
 extern void ipc_init(void);
-extern call_t * ipc_wait_for_call(answerbox_t *box, int flags);
+extern call_t * ipc_wait_for_call(answerbox_t *box, __u32 usec, int nonblocking);
 extern void ipc_answer(answerbox_t *box, call_t *request);
 extern int ipc_call(phone_t *phone, call_t *call);
@@ -217 +214 @@
 extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
 
-
 extern answerbox_t *ipc_phone_0;
 

generic/include/ipc/sysipc.h

@@ -32 +32 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
+#include <arch/types.h>
 
 __native sys_ipc_call_sync_fast(__native phoneid, __native method, 
@@ -43 +44 @@
                              __native arg1, __native arg2);
 __native sys_ipc_answer(__native callid, ipc_data_t *data);
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __native flags);
+__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int nonblocking);
 __native sys_ipc_forward_fast(__native callid, __native phoneid,
                               __native method, __native arg1);

generic/src/ipc/ipc.c

@@ -34 +34 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
+#include <synch/synch.h>
 #include <ipc/ipc.h>
 #include <errno.h>
@@ -142 +143 @@
 
         ipc_call(phone, request);
-        ipc_wait_for_call(&sync_box, 0);
+        ipc_wait_for_call(&sync_box, SYNCH_NO_TIMEOUT, SYNCH_BLOCKING);
 }
 
@@ -302 +303 @@
 /** Wait for phone call 
  *
+ * @param box Answerbox expecting the call.
+ * @param usec Timeout in microseconds. See documentation for waitq_sleep_timeout() for
+ *             decription of its special meaning.
+ * @param nonblocking Blocking vs. non-blocking operation mode switch. See documentation
+ *                    for waitq_sleep_timeout() for description of its special meaning.
  * @return Recived message address
  * - to distinguish between call and answer, look at call->flags
  */
-call_t * ipc_wait_for_call(answerbox_t *box, int flags)
+call_t * ipc_wait_for_call(answerbox_t *box, __u32 usec, int nonblocking)
 {
         call_t *request;
         ipl_t ipl;
-
-restart:      
-        if (flags & IPC_WAIT_NONBLOCKING) {
-                if (waitq_sleep_timeout(&box->wq,0,1) == ESYNCH_WOULD_BLOCK)
-                        return NULL;
-        } else 
-                waitq_sleep(&box->wq);
+        int rc;
+
+restart:
+        rc = waitq_sleep_timeout(&box->wq, usec, nonblocking);
+        if (SYNCH_FAILED(rc))
+                return NULL;
         
         spinlock_lock(&box->lock);
@@ -408 +413 @@
         /* Wait for all async answers to arrive */
         while (atomic_get(&task->active_calls)) {
-                call = ipc_wait_for_call(&task->answerbox, 0);
+                call = ipc_wait_for_call(&task->answerbox, SYNCH_NO_TIMEOUT, SYNCH_BLOCKING);
                 ASSERT((call->flags & IPC_CALL_ANSWERED) || (call->flags & IPC_CALL_NOTIF));
                 ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));

generic/src/ipc/sysipc.c

@@ -469 +469 @@
  *
  * @param calldata Pointer to buffer where the call/answer data is stored 
- * @param flags
+ * @param usec Timeout. See waitq_sleep_timeout() for explanation.
+ * @param nonblocking See waitq_sleep_timeout() for explanation.
+ *
  * @return Callid, if callid & 1, then the call is answer
  */
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __native flags)
+__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int nonblocking)
 {
         call_t *call;
 
 restart:        
-        call = ipc_wait_for_call(&TASK->answerbox, flags);
+        call = ipc_wait_for_call(&TASK->answerbox, usec, nonblocking);
         if (!call)
                 return 0;