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

File:

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

src/libcfa/concurrency/kernel

@@ -28 +28 @@
 //-----------------------------------------------------------------------------
 // Locks
-bool try_lock( spinlock * );
-void lock( spinlock * );
-void unlock( spinlock * );
+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
 
-struct signal_once {
-        volatile bool cond;
-        struct spinlock lock;
-        struct __thread_queue_t blocked;
+struct semaphore {
+        spinlock lock;
+        int count;
+        __thread_queue_t waiting;
 };
 
-void ?{}(signal_once * this);
-void ^?{}(signal_once * this);
+void  ?{}(semaphore * this, int count = 1);
+void ^?{}(semaphore * this);
+void P(semaphore * this);
+void V(semaphore * this);
 
-void wait( signal_once * );
-void signal( signal_once * );
 
 //-----------------------------------------------------------------------------
 // Cluster
 struct cluster {
-        __thread_queue_t ready_queue;
-        spinlock lock;
+        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
 };
 
@@ -68 +70 @@
         unsigned short thrd_count;
 };
-static inline void ?{}(FinishAction * this) { 
+static inline void ?{}(FinishAction * this) {
         this->action_code = No_Action;
         this->thrd = NULL;
@@ -75 +77 @@
 static inline void ^?{}(FinishAction * this) {}
 
+// Processor
+// Wrapper around kernel threads
 struct processor {
-        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;
+        // 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 FinishAction finish;
+        // Termination
+        volatile bool do_terminate;                     // Set to true to notify the processor should terminate
+        semaphore terminated;                           // Termination synchronisation
 
-        struct alarm_node_t * preemption_alarm;
-        unsigned int preemption;
+        // RunThread data
+        struct FinishAction finish;                     // Action to do after a thread is ran
 
-        unsigned short disable_preempt_count;
+        // 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
 
-        bool pending_preemption;
+#ifdef __CFA_DEBUG__
+        char * last_enable;                             // Last function to enable preemption on this processor
+#endif
 };