Changeset b1c57a8 in mainline for uspace/lib/c/generic/ipc.c

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• uspace/lib/c/generic/ipc.c (modified) (11 diffs)

uspace/lib/c/generic/ipc.c

@@ -81 +81 @@
 LIST_INITIALIZE(queued_calls);
 
-static atomic_t ipc_futex = FUTEX_INITIALIZER;
+static futex_t ipc_futex = FUTEX_INITIALIZER;
 
 /** Send asynchronous message via syscall.
@@ -136 +136 @@
         if (!call) {
                 /* Nothing to do regardless if failed or not */
-                futex_up(&ipc_futex);
+                futex_unlock(&ipc_futex);
                 return;
         }
         
         if (callid == (ipc_callid_t) IPC_CALLRET_FATAL) {
-                futex_up(&ipc_futex);
+                futex_unlock(&ipc_futex);
                 
                 /* Call asynchronous handler with error code */
@@ -152 +152 @@
         
         if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
-                futex_up(&ipc_futex);
+                futex_unlock(&ipc_futex);
                 
                 call->u.msg.phoneid = phoneid;
@@ -175 +175 @@
         /* Add call to the list of dispatched calls */
         list_append(&call->list, &dispatched_calls);
-        futex_up(&ipc_futex);
+        futex_unlock(&ipc_futex);
 }
 
@@ -219 +219 @@
          */
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         ipc_callid_t callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid,
             imethod, arg1, arg2, arg3, arg4);
@@ -226 +226 @@
                 if (!call) {
                         call = ipc_prepare_async(private, callback);
-                        if (!call)
+                        if (!call) {
+                                futex_unlock(&ipc_futex);
                                 return;
+                        }
                 }
                 
@@ -289 +291 @@
          */
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         ipc_callid_t callid =
             ipc_call_async_internal(phoneid, &call->u.msg.data);
@@ -384 +386 @@
                         call->u.callid = callid;
                         
-                        futex_down(&ipc_futex);
+                        futex_lock(&ipc_futex);
                         list_append(&call->list, &dispatched_calls);
-                        futex_up(&ipc_futex);
+                        futex_unlock(&ipc_futex);
                 }
                 
@@ -412 +414 @@
         callid &= ~IPC_CALLID_ANSWERED;
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         
         link_t *item;
@@ -423 +425 @@
                         list_remove(&call->list);
                         
-                        futex_up(&ipc_futex);
+                        futex_unlock(&ipc_futex);
                         
                         if (call->callback)
@@ -434 +436 @@
         }
         
-        futex_up(&ipc_futex);
+        futex_unlock(&ipc_futex);
 }