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

Timestamp:

2014-12-22T17:47:40Z (9 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/thread.c (modified) (4 diffs)

uspace/lib/c/generic/thread.c

@@ -46 +46 @@
 #include "private/thread.h"
 
+#ifdef FUTEX_UPGRADABLE
+#include <rcu.h>
+#endif
+
+
 /** Main thread function.
  *
@@ -63 +68 @@
         __tcb_set(fibril->tcb);
         
+#ifdef FUTEX_UPGRADABLE
+        rcu_register_fibril();
+        futex_upgrade_all_and_wait();
+#endif
+        
         uarg->uspace_thread_function(uarg->uspace_thread_arg);
         /*
@@ -73 +83 @@
         /* If there is a manager, destroy it */
         async_destroy_manager();
+
+#ifdef FUTEX_UPGRADABLE
+        rcu_deregister_fibril();
+#endif
+        
         fibril_teardown(fibril);
         
@@ -106 +121 @@
                 return ENOMEM;
         }
+        
+        /* Make heap thread safe. */
+        malloc_enable_multithreaded();
         
         uarg->uspace_entry = (void *) FADDR(__thread_entry);