Changeset a1a17a74 for src

Timestamp:

May 22, 2018, 4:39:48 PM (7 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:

13073be, 2c88368

Parents:

639991a

Message:

Moved thread list to cluster, all concurrency object should be accessible through gdb

Location:

src/libcfa

Files:

• bits/containers.h (modified) (2 diffs)
• concurrency/kernel (modified) (1 diff)
• concurrency/kernel.c (modified) (7 diffs)
• concurrency/kernel_private.h (modified) (1 diff)
• concurrency/thread.c (modified) (2 diffs)

src/libcfa/bits/containers.h

@@ -224 +224 @@
         forall(dtype T | sized(T))
         static inline void push_front( __dllist(T) & this, T & node ) with( this ) {
+                verify(__get);
                 if ( head ) {
                         __get( node ).next = head;
@@ -246 +247 @@
         forall(dtype T | sized(T))
         static inline void remove( __dllist(T) & this, T & node ) with( this ) {
+                verify(__get);
                 if ( &node == head ) {
                         if ( __get( *head ).next == head ) {

src/libcfa/concurrency/kernel

@@ -145 +145 @@
         __dllist_t(struct processor) idles;
 
+        // List of processors
+        __spinlock_t thread_list_lock;
+        __dllist_t(struct thread_desc) threads;
+
         // Link lists fields
         struct {

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;
 
@@ -118 +117 @@
         node.next = NULL;
         node.prev = NULL;
-        doregister(this);
+        doregister(curr_cluster, this);
 
         monitors{ &self_mon_p, 1, (fptr_t)0 };
@@ -167 +166 @@
         procs{ __get };
         idles{ __get };
+        threads{ __get };
 
         doregister(this);
@@ -518 +518 @@
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
 
-        global_threads. list{ __get };
-        global_threads. lock{};
         global_clusters.list{ __get };
         global_clusters.lock{};
@@ -619 +617 @@
         ^(mainThread){};
 
+        ^(global_clusters.list){};
+        ^(global_clusters.lock){};
+
         __cfaabi_dbg_print_safe("Kernel : Shutdown complete\n");
 }
@@ -756 +757 @@
 //-----------------------------------------------------------------------------
 // Global Queues
-void doregister( thread_desc & thrd ) {
-        lock      ( global_threads.lock __cfaabi_dbg_ctx2);
-        push_front( global_threads.list, thrd );
-        unlock    ( global_threads.lock );
-}
-
-void unregister( thread_desc & thrd ) {
-        lock  ( global_threads.lock __cfaabi_dbg_ctx2);
-        remove( global_threads.list, thrd );
-        unlock( global_threads.lock );
-}
-
 void doregister( cluster     & cltr ) {
         lock      ( global_clusters.lock __cfaabi_dbg_ctx2);
@@ -780 +769 @@
 }
 
+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 ) {

src/libcfa/concurrency/kernel_private.h

@@ -101 +101 @@
 
 
-void doregister( struct thread_desc & thrd );
-void unregister( struct thread_desc & thrd );
+void doregister( struct cluster & cltr );
+void unregister( struct cluster & cltr );
 
-void doregister( struct cluster     & cltr );
-void unregister( struct cluster     & cltr );
+void doregister( struct cluster * cltr, struct thread_desc & thrd );
+void unregister( struct cluster * cltr, struct thread_desc & thrd );
 
 void doregister( struct cluster * cltr, struct processor * proc );

src/libcfa/concurrency/thread.c

@@ -42 +42 @@
         node.next = NULL;
         node.prev = NULL;
-        doregister(this);
+        doregister(curr_cluster, this);
 
         monitors{ &self_mon_p, 1, (fptr_t)0 };
@@ -48 +48 @@
 
 void ^?{}(thread_desc& this) with( this ) {
-        unregister(this);
+        unregister(curr_cluster, this);
         ^self_cor{};
 }