Changeset 6c2ba38 for src/libcfa/concurrency/kernel

Timestamp:

Nov 28, 2017, 3:52:06 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

383e159, 8d5b9cf

Parents:

cf966b5 (diff), 8a0a64d9 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/kernel

@@ -26 +26 @@
 //-----------------------------------------------------------------------------
 // Locks
-// // 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, return false if already acquired
-// bool try_lock  ( spinlock * DEBUG_CTX_PARAM2 );
-
-// // Unlock the spinlock
-// void unlock    ( spinlock * );
-
 struct semaphore {
         __spinlock_t lock;
         int count;
-        __thread_queue_t waiting;
+        __queue_t(thread_desc) waiting;
 };
 
@@ -57 +45 @@
 
         // Ready queue for threads
-        __thread_queue_t ready_queue;
+        __queue_t(thread_desc) ready_queue;
 
         // Preemption rate on this cluster