Changeset d4e68a6

Timestamp:

Jun 23, 2019, 3:55:32 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9504a89

Parents:

dc33b5b

Message:

move location of active_xxx routines, and counter for number processors on a cluster

Location:

libcfa/src/concurrency

Files:

• coroutine.hfa (modified) (2 diffs)
• invoke.h (modified) (4 diffs)
• kernel.cfa (modified) (5 diffs)
• kernel.hfa (modified) (4 diffs)
• thread.hfa (modified) (2 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 18:23:45 2018
-// Update Count     : 8
+// Last Modified On : Fri Jun 21 17:49:39 2019
+// Update Count     : 9
 //
 
@@ -53 +53 @@
 forall(dtype T | is_coroutine(T))
 void prime(T & cor);
+
+static inline struct coroutine_desc * active_coroutine() { return TL_GET( this_thread )->curr_cor; }
 
 //-----------------------------------------------------------------------------

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 19 08:23:21 2018
-// Update Count     : 31
+// Last Modified On : Sat Jun 22 18:19:13 2019
+// Update Count     : 40
 //
 
@@ -46 +46 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct thread_desc             * & get_next( struct thread_desc             & this );
-                static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this );
+                static inline struct thread_desc             *& get_next( struct thread_desc             & this );
+                static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
 
                 extern thread_local struct KernelThreadData {
@@ -199 +199 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct coroutine_desc * active_coroutine() { return TL_GET( this_thread )->curr_cor; }
-                static inline struct thread_desc    * active_thread   () { return TL_GET( this_thread    ); }
-                static inline struct processor      * active_processor() { return TL_GET( this_processor ); } // UNSAFE
-
-                static inline thread_desc * & get_next( thread_desc & this ) {
+                static inline thread_desc *& get_next( thread_desc & this ) {
                         return this.next;
                 }
@@ -210 +206 @@
                         return this.node.[next, prev];
                 }
-
-                static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this );
 
                 static inline void ?{}(__monitor_group_t & this) {

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  9 16:11:46 2018
-// Update Count     : 24
+// Last Modified On : Thu Jun 20 17:21:23 2019
+// Update Count     : 25
 //
 
@@ -907 +907 @@
 void doregister( cluster * cltr, thread_desc & thrd ) {
         lock      (cltr->thread_list_lock __cfaabi_dbg_ctx2);
+        cltr->nthreads += 1;
         push_front(cltr->threads, thrd);
         unlock    (cltr->thread_list_lock);
@@ -914 +915 @@
         lock  (cltr->thread_list_lock __cfaabi_dbg_ctx2);
         remove(cltr->threads, thrd );
+        cltr->nthreads -= 1;
         unlock(cltr->thread_list_lock);
 }
@@ -919 +921 @@
 void doregister( cluster * cltr, processor * proc ) {
         lock      (cltr->proc_list_lock __cfaabi_dbg_ctx2);
+        cltr->nprocessors += 1;
         push_front(cltr->procs, *proc);
         unlock    (cltr->proc_list_lock);
@@ -926 +929 @@
         lock  (cltr->proc_list_lock __cfaabi_dbg_ctx2);
         remove(cltr->procs, *proc );
+        cltr->nprocessors -= 1;
         unlock(cltr->proc_list_lock);
 }

libcfa/src/concurrency/kernel.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 10 14:46:49 2018
-// Update Count     : 10
+// Last Modified On : Sat Jun 22 11:39:17 2019
+// Update Count     : 16
 //
 
@@ -91 +91 @@
         this.lock = NULL;
 }
-static inline void ^?{}(FinishAction & this) {}
+static inline void ^?{}(FinishAction &) {}
 
 // Processor
@@ -176 +176 @@
         __dllist_t(struct processor) procs;
         __dllist_t(struct processor) idles;
-
-        // List of processors
+        unsigned int nprocessors;
+
+        // List of threads
         __spinlock_t thread_list_lock;
         __dllist_t(struct thread_desc) threads;
+        unsigned int nthreads;
 
         // Link lists fields
@@ -200 +202 @@
 }
 
+static inline struct processor * active_processor() { return TL_GET( this_processor ); } // UNSAFE
+static inline struct cluster   * active_cluster  () { return TL_GET( this_processor )->cltr; }
+
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/thread.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 29 14:07:11 2018
-// Update Count     : 4
+// Last Modified On : Fri Jun 21 17:51:33 2019
+// Update Count     : 5
 //
 
@@ -91 +91 @@
 void yield( unsigned times );
 
+static inline struct thread_desc * active_thread () { return TL_GET( this_thread ); }
+
 // Local Variables: //
 // mode: c //