Changeset b067d9b for libcfa/src/concurrency/kernel.hfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel.hfa (moved) (moved from src/libcfa/concurrency/kernel ) (7 diffs)

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
 //
 
@@ -19 +19 @@
 
 #include "invoke.h"
-#include "time_t.h"
+#include "time_t.hfa"
 
 extern "C" {
@@ -91 +91 @@
         this.lock = NULL;
 }
-static inline void ^?{}(FinishAction & this) {}
+static inline void ^?{}(FinishAction &) {}
 
 // Processor
@@ -113 +113 @@
         pthread_t kernel_thread;
 
+        // RunThread data
+        // Action to do after a thread is ran
+        struct FinishAction finish;
+
+        // Preemption data
+        // Node which is added in the discrete event simulaiton
+        struct alarm_node_t * preemption_alarm;
+
+        // If true, a preemption was triggered in an unsafe region, the processor must preempt as soon as possible
+        bool pending_preemption;
+
+        // Idle lock
+        __bin_sem_t idleLock;
+
         // Termination
         // Set to true to notify the processor should terminate
@@ -119 +133 @@
         // Termination synchronisation
         semaphore terminated;
-
-        // RunThread data
-        // Action to do after a thread is ran
-        struct FinishAction finish;
-
-        // Preemption data
-        // Node which is added in the discrete event simulaiton
-        struct alarm_node_t * preemption_alarm;
-
-        // If true, a preemption was triggered in an unsafe region, the processor must preempt as soon as possible
-        bool pending_preemption;
-
-        // Idle lock
-        sem_t idleLock;
-        // __bin_sem_t idleLock;
 
         // Link lists fields
@@ -177 +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
@@ -201 +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 //