Changeset 235d31d in mainline for uspace/lib/c/generic/ipc.c

Timestamp:

2014-12-22T17:47:40Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8c7d5ad

Parents:

eae91e0 (diff), 759ea0d (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 the CHT pre-integration branch

This branch contains:

• the merge of lp:~adam-hraska+lp/helenos/rcu, which brings:

• a new preemptible kernel RCU variant called A-RCU,
• a preemptible variant of Podzimek's non-preemptible kernel RCU and
• a new variant of usersace RCU,
• a new concurrent hash table (CHT) implementation based on RCU,
• a deployment of CHT in kernel futex handling,
• a deployment of the userspace RCU in the implementation of upgradable futexes,

all described in Adam Hraska's master thesis named Read-Copy-Update
for HelenOS, defended in 2013 at MFF UK; furthemore, the branch
fixes two synchronization bugs in condvars and waitq, respectively:

• revid:adam.hraska+hos@gmail.com-20121116144921-3to9u1tn1sg07rg7
• revid:adam.hraska+hos@gmail.com-20121116173623-km7gwtqixwudpe66

• build fixes required to pass make check
• overhaul of ia64 and sparc64 trap handling, to allow exc_dispatch() to be used now when the kernel is more picky about CPU state accounting
• an important fix of the sparc64/sun4v preemptible trap handler
• various other fixes of issues discovered on non-x86 architectures

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);
 }