Changeset 97f65d5 for src/libcfa/concurrency/kernel

Timestamp:

Feb 15, 2017, 8:13:49 AM (9 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, resolv-new, with_gc

Children:

e6512c8

Parents:

aa9ee19 (diff), 3149e7e (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 (modified) (5 diffs)

src/libcfa/concurrency/kernel

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2016
+// Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Thierry Delisle
 // Last Modified On : --
@@ -27 +27 @@
 
 //-----------------------------------------------------------------------------
+// Locks
+void lock( spinlock * );
+void unlock( spinlock * );
+
+void wait( signal_once * );
+void signal( signal_once * );
+
+//-----------------------------------------------------------------------------
 // Cluster
 struct cluster {
         simple_thread_list ready_queue;
-        // pthread_spinlock_t lock;
+        spinlock lock;
 };
 
@@ -38 +46 @@
 //-----------------------------------------------------------------------------
 // Processor
-enum ProcessorAction { 
-        Reschedule,
-        NoAction
+enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule };
+struct FinishAction {
+        FinishOpCode action_code;
+        thread * thrd;
+        spinlock * lock;
 };
+static inline void ?{}(FinishAction * this) { 
+        this->action_code = No_Action;
+        this->thrd = NULL;
+        this->lock = NULL;
+}
+static inline void ^?{}(FinishAction * this) {}
 
 struct processor {
@@ -49 +65 @@
         thread * current_thread;
         pthread_t kernel_thread;
-        simple_lock lock;
-        volatile bool terminated;
-        ProcessorAction thread_action;
+        
+        signal_once terminated;
+        volatile bool is_terminated;
+
+        struct FinishAction finish;
 };
 
@@ -57 +75 @@
 void ?{}(processor * this, cluster * cltr);
 void ^?{}(processor * this);
-
-
-//-----------------------------------------------------------------------------
-// Locks
-
-void ?{}(simple_lock * this);
-void ^?{}(simple_lock * this);
-
-void lock( simple_lock * );
-void unlock( simple_lock * );
 
 #endif //KERNEL_H