Changeset 35509652 in mainline for libipc/generic/ipc.c

Timestamp:

2006-05-16T11:05:18Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

450cd3a

Parents:

c2b43de

Message:

Make IPC thread safe.

File:

• libipc/generic/ipc.c (modified) (10 diffs)

libipc/generic/ipc.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <futex.h>
 
 /** Structure used for keeping track of sent async msgs 
@@ -56 +57 @@
 LIST_INITIALIZE(queued_calls);
 
+static atomic_t ipc_futex;
+
+void _ipc_init(void)
+{
+        futex_initialize(&ipc_futex, 1);
+}
+
 int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, 
                   ipcarg_t *result)
@@ -138 +146 @@
                 IPC_SET_ARG1(call->u.msg.data, arg1);
                 IPC_SET_ARG2(call->u.msg.data, arg2);
-
+                
+                futex_down(&ipc_futex);
                 list_append(&call->list, &queued_calls);
+                futex_up(&ipc_futex);
                 return;
         }
         call->u.callid = callid;
         /* Add call to list of dispatched calls */
+        futex_down(&ipc_futex);
         list_append(&call->list, &dispatched_calls);
+        futex_up(&ipc_futex);
 }
 
@@ -185 +197 @@
         ipc_callid_t callid;
 
+        futex_down(&ipc_futex);
         while (!list_empty(&queued_calls)) {
                 call = list_get_instance(queued_calls.next, async_call_t,
@@ -194 +207 @@
                         break;
                 list_remove(&call->list);
+
                 if (callid == IPC_CALLRET_FATAL) {
+                        futex_up(&ipc_futex);
                         call->callback(call->private, ENOENT, NULL);
                         free(call);
+                        futex_down(&ipc_futex);
                 } else {
                         call->u.callid = callid;
@@ -202 +218 @@
                 }
         }
+        futex_up(&ipc_futex);
 }
 
@@ -217 +234 @@
         callid &= ~IPC_CALLID_ANSWERED;
         
+        futex_down(&ipc_futex);
         for (item = dispatched_calls.next; item != &dispatched_calls;
              item = item->next) {
@@ -222 +240 @@
                 if (call->u.callid == callid) {
                         list_remove(&call->list);
+                        futex_up(&ipc_futex);
                         call->callback(call->private, 
                                        IPC_GET_RETVAL(*data),
@@ -228 +247 @@
                 }
         }
+        futex_up(&ipc_futex);
         printf("Received unidentified answer: %P!!!\n", callid);
 }
@@ -302 +322 @@
 }
 
+
+/** Open shared memory connection over specified phoneid
+ *
+ * 
+ * Allocates 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 */
+
+//}
 /*
-int ipc_open_dgrconn(int pohoneid, size_t max_dgram)
-{
-        
-}
-
+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)
+{
+}
 
 */