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

Timestamp:

2012-12-04T17:36:30Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

52d2603

Parents:

6c1bb0d

Message:

Converted ipc semaphore futex to a lock futex.

File:

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

uspace/lib/c/generic/ipc.c

@@ -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);
@@ -289 +289 @@
          */
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         ipc_callid_t callid =
             ipc_call_async_internal(phoneid, &call->u.msg.data);
@@ -384 +384 @@
                         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 +412 @@
         callid &= ~IPC_CALLID_ANSWERED;
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         
         link_t *item;
@@ -423 +423 @@
                         list_remove(&call->list);
                         
-                        futex_up(&ipc_futex);
+                        futex_unlock(&ipc_futex);
                         
                         if (call->callback)
@@ -434 +434 @@
         }
         
-        futex_up(&ipc_futex);
+        futex_unlock(&ipc_futex);
 }