Changeset 992b089 for src/libcfa/concurrency/kernel

Timestamp:

Feb 9, 2017, 10:13:07 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

aa9ee19, fb7dca0

Parents:

6ef2d81 (diff), 132fad4 (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 plg2:software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/kernel

@@ -30 +30 @@
 struct cluster {
         simple_thread_list ready_queue;
-        pthread_spinlock_t lock;
+        // pthread_spinlock_t lock;
 };
 
@@ -38 +38 @@
 //-----------------------------------------------------------------------------
 // Processor
+enum ProcessorAction { 
+        Reschedule,
+        NoAction
+};
+
 struct processor {
-        struct processorCtx_t * ctx;
+        struct processorCtx_t * runner;
         cluster * cltr;
         coroutine * current_coroutine;
@@ -46 +51 @@
         simple_lock lock;
         volatile bool terminated;
+        ProcessorAction thread_action;
 };
 
@@ -62 +68 @@
 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