Changeset b1f51f0 in mainline for libc/generic/ipc.c

Timestamp:

2006-06-02T16:09:18Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b917098

Parents:

a116ef22

Message:

Changed recommended way of asynchronous communication.

File:

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

libc/generic/ipc.c

@@ -134 +134 @@
 
 /** Epilogue of ipc_async_send functions */
-static inline void ipc_finish_async(ipc_callid_t callid, int phoneid, async_call_t *call)
+static inline void ipc_finish_async(ipc_callid_t callid, int phoneid, 
+                                    async_call_t *call, int can_preempt)
 {
         if (callid == IPC_CALLRET_FATAL) {
@@ -149 +150 @@
 
                 call->u.msg.phoneid = phoneid;
-
-                call->ptid = psthread_get_id();
+                
                 futex_down(&async_futex);
                 list_append(&call->list, &queued_calls);
 
-                psthread_schedule_next_adv(PS_TO_MANAGER);
-                /* Async futex unlocked by previous call */
+                if (can_preempt) {
+                        call->ptid = psthread_get_id();
+                        psthread_schedule_next_adv(PS_TO_MANAGER);
+                        /* Async futex unlocked by previous call */
+                } else {
+                        call->ptid = 0;
+                        futex_up(&async_futex);
+                }
                 return;
         }
@@ -172 +178 @@
 void ipc_call_async_2(int phoneid, ipcarg_t method, ipcarg_t arg1,
                       ipcarg_t arg2, void *private,
-                      ipc_async_callback_t callback)
+                      ipc_async_callback_t callback, int can_preempt)
 {
         async_call_t *call;
@@ -191 +197 @@
                 IPC_SET_ARG2(call->u.msg.data, arg2);
         }
-        ipc_finish_async(callid, phoneid, call);
+        ipc_finish_async(callid, phoneid, call, can_preempt);
 }
 
@@ -201 +207 @@
 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)
+                      ipc_async_callback_t callback, int can_preempt)
 {
         async_call_t *call;
@@ -219 +225 @@
         callid = _ipc_call_async(phoneid, &call->u.msg.data);
 
-        ipc_finish_async(callid, phoneid, call);
+        ipc_finish_async(callid, phoneid, call, can_preempt);
 }
 
@@ -277 +283 @@
 
                 futex_up(&async_futex);
-                psthread_add_ready(call->ptid);
+                if (call->ptid)
+                        psthread_add_ready(call->ptid);
                 
                 if (callid == IPC_CALLRET_FATAL) {
@@ -431 +438 @@
 }
 
-
-/** Open shared memory connection over specified phoneid
- *
- * 
- * Allocate as_area, notify the other side about our intention
- * to open the connection
- *
- * @return Connection id identifying this connection
- */
-//int ipc_dgr_open(int pohoneid, size_t bufsize)
-//{
-        /* Find new file descriptor in local descriptor table */
-        /* Create AS_area, initialize structures */
-        /* Send AS to other side, handle error states */
-
-//}
-/*
-void ipc_dgr_close(int cid)
-{
-}
-
-void * ipc_dgr_alloc(int cid, size_t size)
-{
-}
-
-void ipc_dgr_free(int cid, void *area)
-{
-
-}
-
-int ipc_dgr_send(int cid, void *area)
-{
-}
-
-
-int ipc_dgr_send_data(int cid, void *data, size_t size)
-{
-}
-
-*/
+/* Primitive functions for simple communication */
+void send_call_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
+                 ipcarg_t arg2, ipcarg_t arg3)
+{
+        ipc_call_async_3(phoneid, method, arg1, arg2, arg3, NULL, NULL, 1);
+}
+
+void send_call_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2)
+{
+        ipc_call_async_2(phoneid, method, arg1, arg2, NULL, NULL, 1);
+}
+
+void nsend_call_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
+                  ipcarg_t arg2, ipcarg_t arg3)
+{
+        ipc_call_async_3(phoneid, method, arg1, arg2, arg3, NULL, NULL, 0);
+}
+
+void nsend_call_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2)
+{
+        ipc_call_async_2(phoneid, method, arg1, arg2, NULL, NULL, 0);
+}
+