Changes in src/libcfa/concurrency/kernel.c [a1a17a74:de94a60]

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