Changeset 2c88368 for src/libcfa/concurrency/kernel.c

Timestamp:

May 22, 2018, 4:46:29 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

59c034c6, d807ca28

Parents:

a8706fc (diff), a1a17a7 (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 branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/kernel.c

@@ -49 +49 @@
 thread_desc * mainThread;
 
-struct { __dllist_t(thread_desc) list; __spinlock_t lock; } global_threads ;
 struct { __dllist_t(cluster    ) list; __spinlock_t lock; } global_clusters;
 
 //-----------------------------------------------------------------------------
 // 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,
@@ -123 +117 @@
         node.next = NULL;
         node.prev = NULL;
-        doregister(this);
+        doregister(curr_cluster, this);
 
         monitors{ &self_mon_p, 1, (fptr_t)0 };
@@ -172 +166 @@
         procs{ __get };
         idles{ __get };
+        threads{ __get };
 
         doregister(this);
@@ -523 +518 @@
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
 
-        global_threads. list{ __get };
-        global_threads. lock{};
         global_clusters.list{ __get };
         global_clusters.lock{};
@@ -624 +617 @@
         ^(mainThread){};
 
+        ^(global_clusters.list){};
+        ^(global_clusters.lock){};
+
         __cfaabi_dbg_print_safe("Kernel : Shutdown complete\n");
 }
@@ -697 +693 @@
         else {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred outside of any thread.\n" );
+                __cfaabi_dbg_bits_write( abort_text, len );
         }
 }
@@ -760 +757 @@
 //-----------------------------------------------------------------------------
 // Global Queues
-void doregister( thread_desc & thrd ) {
-        // lock      ( global_thread.lock );
-        // push_front( global_thread.list, thrd );
-        // unlock    ( global_thread.lock );
-}
-
-void unregister( thread_desc & thrd ) {
-        // lock  ( global_thread.lock );
-        // remove( global_thread.list, thrd );
-        // unlock( global_thread.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, thread_desc & thrd ) {
+        lock      (cltr->thread_list_lock __cfaabi_dbg_ctx2);
+        push_front(cltr->threads, thrd);
+        unlock    (cltr->thread_list_lock);
+}
+
+void unregister( cluster * cltr, thread_desc & thrd ) {
+        lock  (cltr->thread_list_lock __cfaabi_dbg_ctx2);
+        remove(cltr->threads, thrd );
+        unlock(cltr->thread_list_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);
 }