Changeset ef6851a for src/libcfa/concurrency/kernel

Timestamp:

Jul 12, 2017, 9:50:58 PM (7 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:

1a6e855

Parents:

8b47e50 (diff), acb89ed (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

@@ -28 +28 @@
 //-----------------------------------------------------------------------------
 // Locks
-bool try_lock( spinlock * );
-void lock( spinlock * );
-void unlock( spinlock * );
+bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
+void lock      ( spinlock * DEBUG_CTX_PARAM2 );
+void lock_yield( spinlock * DEBUG_CTX_PARAM2 );
+void unlock    ( 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 * );
 
 //-----------------------------------------------------------------------------
@@ -68 +69 @@
         unsigned short thrd_count;
 };
-static inline void ?{}(FinishAction * this) { 
+static inline void ?{}(FinishAction * this) {
         this->action_code = No_Action;
         this->thrd = NULL;
@@ -78 +79 @@
         struct processorCtx_t * runner;
         cluster * cltr;
-        coroutine_desc * current_coroutine;
-        thread_desc * current_thread;
         pthread_t kernel_thread;
-        
-        signal_once terminated;
+
+        semaphore terminated;
         volatile bool is_terminated;
 
@@ -90 +89 @@
         unsigned int preemption;
 
-        unsigned short disable_preempt_count;
+        bool pending_preemption;
 
-        bool pending_preemption;
+        char * last_enable;
 };