Changeset c0d00b6 for src/libcfa/concurrency/kernel

Timestamp:

Nov 25, 2017, 3:22:18 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c6e2c18

Parents:

9d06142 (diff), 3de176d (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' into cleanup-dtors

File:

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

src/libcfa/concurrency/kernel

@@ -26 +26 @@
 //-----------------------------------------------------------------------------
 // Locks
-// Lock the spinlock, spin if already acquired
-void lock      ( spinlock * DEBUG_CTX_PARAM2 );
+// // Lock the spinlock, spin if already acquired
+// void lock      ( spinlock * DEBUG_CTX_PARAM2 );
 
-// Lock the spinlock, yield repeatedly if already acquired
-void lock_yield( spinlock * DEBUG_CTX_PARAM2 );
+// // Lock the spinlock, yield repeatedly if already acquired
+// void lock_yield( spinlock * DEBUG_CTX_PARAM2 );
 
-// Lock the spinlock, return false if already acquired
-bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
+// // Lock the spinlock, return false if already acquired
+// bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
 
-// Unlock the spinlock
-void unlock    ( spinlock * );
+// // Unlock the spinlock
+// void unlock    ( spinlock * );
 
 struct semaphore {
-        spinlock lock;
+        __spinlock_t lock;
         int count;
         __thread_queue_t waiting;
@@ -54 +54 @@
 struct cluster {
         // Ready queue locks
-        spinlock ready_queue_lock;
+        __spinlock_t ready_queue_lock;
 
         // Ready queue for threads
@@ -74 +74 @@
         FinishOpCode action_code;
         thread_desc * thrd;
-        spinlock * lock;
-        spinlock ** locks;
+        __spinlock_t * lock;
+        __spinlock_t ** locks;
         unsigned short lock_count;
         thread_desc ** thrds;
@@ -120 +120 @@
 #ifdef __CFA_DEBUG__
         // Last function to enable preemption on this processor
-        char * last_enable;
+        const char * last_enable;
 #endif
 };