Changes in src/libcfa/concurrency/kernel [eafb094:e15df4c]

File:

• src/libcfa/concurrency/kernel (modified) (4 diffs)

src/libcfa/concurrency/kernel

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2017
+// Created On       : Tue Jan 17 12:27:26 2016
 // 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;
-        spinlock lock;
+        pthread_spinlock_t lock;
 };
 
@@ -46 +38 @@
 //-----------------------------------------------------------------------------
 // Processor
-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 {
-        struct processorCtx_t * runner;
+        struct processorCtx_t * ctx;
         cluster * cltr;
         coroutine * current_coroutine;
         thread * current_thread;
         pthread_t kernel_thread;
-        
-        signal_once terminated;
-        volatile bool is_terminated;
-
-        struct FinishAction finish;
+        simple_lock lock;
+        volatile bool terminated;
 };
 
@@ -75 +51 @@
 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 * );
+
+struct pthread_spinlock_guard {
+        pthread_spinlock_t * lock;
+};
+
+static inline void ?{}( pthread_spinlock_guard * this, pthread_spinlock_t * lock ) {
+        this->lock = lock;
+        pthread_spin_lock( this->lock );
+}
+
+static inline void ^?{}( pthread_spinlock_guard * this ) {
+        pthread_spin_unlock( this->lock );
+}
+
+// //Simple spinlock implementation from 
+// //http://stackoverflow.com/questions/1383363/is-my-spin-lock-implementation-correct-and-optimal
+// //Not optimal but correct
+// #define VOL 
+
+// struct simple_spinlock {
+//      VOL int lock;
+// };
+
+// extern VOL int __sync_lock_test_and_set( VOL int *, VOL int);
+// extern void __sync_synchronize();
+
+// static inline void lock( simple_spinlock * this ) {
+//     while (__sync_lock_test_and_set(&this->lock, 1)) {
+//         // Do nothing. This GCC builtin instruction
+//         // ensures memory barrier.
+//     }
+// }
+
+// static inline void unlock( simple_spinlock * this ) {
+//     __sync_synchronize(); // Memory barrier.
+//     this->lock = 0;
+// }
 
 #endif //KERNEL_H