Changes in src/libcfa/concurrency/kernel [e60e0dc:c81ebf9]

File:

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

src/libcfa/concurrency/kernel

@@ -28 +28 @@
 //-----------------------------------------------------------------------------
 // Locks
-void lock      ( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, spin if already acquired
-void lock_yield( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, yield repeatedly if already acquired
-bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );       // Lock the spinlock, return false if already acquired
-void unlock    ( spinlock * );                        // Unlock the spinlock
+bool try_lock( spinlock * );
+void lock( spinlock * );
+void unlock( spinlock * );
 
-struct semaphore {
-        spinlock lock;
-        int count;
-        __thread_queue_t waiting;
+struct signal_once {
+        volatile bool cond;
+        struct spinlock lock;
+        struct __thread_queue_t blocked;
 };
 
-void  ?{}(semaphore * this, int count = 1);
-void ^?{}(semaphore * this);
-void P(semaphore * this);
-void V(semaphore * this);
+void ?{}(signal_once * this);
+void ^?{}(signal_once * this);
 
+void wait( signal_once * );
+void signal( signal_once * );
 
 //-----------------------------------------------------------------------------
 // Cluster
 struct cluster {
-        spinlock ready_queue_lock;                      // Ready queue locks
-        __thread_queue_t ready_queue;                   // Ready queue for threads
-        unsigned long long int preemption;              // Preemption rate on this cluster
+        __thread_queue_t ready_queue;
+        spinlock lock;
 };
 
@@ -70 +68 @@
         unsigned short thrd_count;
 };
-static inline void ?{}(FinishAction * this) {
+static inline void ?{}(FinishAction * this) { 
         this->action_code = No_Action;
         this->thrd = NULL;
@@ -77 +75 @@
 static inline void ^?{}(FinishAction * this) {}
 
-// Processor
-// Wrapper around kernel threads
 struct processor {
-        // Main state
-        struct processorCtx_t * runner;                 // Coroutine ctx who does keeps the state of the processor
-        cluster * cltr;                                 // Cluster from which to get threads
-        pthread_t kernel_thread;                        // Handle to pthreads
+        struct processorCtx_t * runner;
+        cluster * cltr;
+        coroutine_desc * current_coroutine;
+        thread_desc * current_thread;
+        pthread_t kernel_thread;
+        
+        signal_once terminated;
+        volatile bool is_terminated;
 
-        // Termination
-        volatile bool do_terminate;                     // Set to true to notify the processor should terminate
-        semaphore terminated;                           // Termination synchronisation
+        struct FinishAction finish;
 
-        // RunThread data
-        struct FinishAction finish;                     // Action to do after a thread is ran
+        struct alarm_node_t * preemption_alarm;
+        unsigned int preemption;
 
-        // Preemption data
-        struct alarm_node_t * preemption_alarm;         // Node which is added in the discrete event simulaiton
-        bool pending_preemption;                        // If true, a preemption was triggered in an unsafe region, the processor must preempt as soon as possible
+        unsigned short disable_preempt_count;
 
-#ifdef __CFA_DEBUG__
-        char * last_enable;                             // Last function to enable preemption on this processor
-#endif
+        bool pending_preemption;
 };