Changeset 82f4063 for libcfa/src/concurrency/locks.hfa

Timestamp:

May 26, 2021, 10:38:19 AM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

bae0d35

Parents:

c65b930

Message:

switched unified locking to use dlist

File:

• libcfa/src/concurrency/locks.hfa (modified) (4 diffs)

libcfa/src/concurrency/locks.hfa

@@ -21 +21 @@
 #include "bits/weakso_locks.hfa"
 #include "containers/queueLockFree.hfa"
+#include "containers/list.hfa"
 
 #include "thread.hfa"
@@ -40 +41 @@
 
 static inline bool P(Semaphore0nary & this, $thread * thrd) {
-        /* paranoid */ verify(!(thrd->seqable.next));
-        /* paranoid */ verify(!(thrd`next));
+        /* paranoid */ verify(!thrd`next);
+        /* paranoid */ verify(!(&(*thrd)`next));
 
         push(this.queue, thrd);
@@ -250 +251 @@
 
 //-----------------------------------------------------------------------------
-// info_thread
-// the info thread is a wrapper around a thread used
-// to store extra data for use in the condition variable
+// // info_thread
+// // the info thread is a wrapper around a thread used
+// // to store extra data for use in the condition variable
 forall(L & | is_blocking_lock(L)) {
         struct info_thread;
 
-        // for use by sequence
-        info_thread(L) *& Back( info_thread(L) * this );
-        info_thread(L) *& Next( info_thread(L) * this );
+        // // for use by sequence
+        // info_thread(L) *& Back( info_thread(L) * this );
+        // info_thread(L) *& Next( info_thread(L) * this );
 }
 
@@ -269 +270 @@
 
                 // List of blocked threads
-                Sequence( info_thread(L) ) blocked_threads;
+                dlist( info_thread(L) ) blocked_threads;
 
                 // Count of current blocked threads
                 int count;
         };
+        
 
         void  ?{}( condition_variable(L) & this );