Changeset b1c57a8 in mainline for uspace/lib/c/generic/thread.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/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);