Changeset 639991a for src/libcfa/concurrency

Timestamp:

May 22, 2018, 2:43:09 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

a1a17a74

Parents:

cac8a6e

Message:

removed workaround for tuple references

File:

• src/libcfa/concurrency/kernel.c (modified) (3 diffs)

src/libcfa/concurrency/kernel.c

@@ -54 +54 @@
 //-----------------------------------------------------------------------------
 // Global state
-
-// volatile thread_local bool preemption_in_progress = 0;
-// volatile thread_local bool preemption_enabled = false;
-// volatile thread_local unsigned short disable_preempt_count = 1;
-
 thread_local struct KernelThreadData kernelTLS = {
         NULL,
@@ -697 +692 @@
         else {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred outside of any thread.\n" );
+                __cfaabi_dbg_bits_write( abort_text, len );
         }
 }
@@ -761 +757 @@
 // Global Queues
 void doregister( thread_desc & thrd ) {
-        // lock      ( global_thread.lock );
-        // push_front( global_thread.list, thrd );
-        // unlock    ( global_thread.lock );
+        lock      ( global_threads.lock __cfaabi_dbg_ctx2);
+        push_front( global_threads.list, thrd );
+        unlock    ( global_threads.lock );
 }
 
 void unregister( thread_desc & thrd ) {
-        // lock  ( global_thread.lock );
-        // remove( global_thread.list, thrd );
-        // unlock( global_thread.lock );
+        lock  ( global_threads.lock __cfaabi_dbg_ctx2);
+        remove( global_threads.list, thrd );
+        unlock( global_threads.lock );
 }
 
 void doregister( cluster     & cltr ) {
-        // lock      ( global_cluster.lock );
-        // push_front( global_cluster.list, cltr );
-        // unlock    ( global_cluster.lock );
+        lock      ( global_clusters.lock __cfaabi_dbg_ctx2);
+        push_front( global_clusters.list, cltr );
+        unlock    ( global_clusters.lock );
 }
 
 void unregister( cluster     & cltr ) {
-        // lock  ( global_cluster.lock );
-        // remove( global_cluster.list, cltr );
-        // unlock( global_cluster.lock );
+        lock  ( global_clusters.lock __cfaabi_dbg_ctx2);
+        remove( global_clusters.list, cltr );
+        unlock( global_clusters.lock );
 }
 
 
 void doregister( cluster * cltr, processor * proc ) {
-        // lock      (cltr->proc_list_lock __cfaabi_dbg_ctx2);
-        // push_front(cltr->procs, *proc);
-        // unlock    (cltr->proc_list_lock);
+        lock      (cltr->proc_list_lock __cfaabi_dbg_ctx2);
+        push_front(cltr->procs, *proc);
+        unlock    (cltr->proc_list_lock);
 }
 
 void unregister( cluster * cltr, processor * proc ) {
-        // lock  (cltr->proc_list_lock __cfaabi_dbg_ctx2);
-        // remove(cltr->procs, *proc );
-        // unlock(cltr->proc_list_lock);
+        lock  (cltr->proc_list_lock __cfaabi_dbg_ctx2);
+        remove(cltr->procs, *proc );
+        unlock(cltr->proc_list_lock);
 }