Changeset c74e601 for libcfa/src/concurrency/locks.hfa

Timestamp:

Dec 3, 2020, 4:38:01 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

bd8dca2

Parents:

27b1ca1 (diff), cad1df1 (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:

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

libcfa/src/concurrency/locks.hfa

@@ -5 +5 @@
 #include "bits/algorithm.hfa"
 #include "bits/locks.hfa"
+#include "bits/sequence.hfa"
 #include "bits/containers.hfa"
 
@@ -31 +32 @@
 forall(dtype L | is_blocking_lock(L)) {
         struct info_thread {
+                inline Seqable;
                 struct $thread * t;
                 uintptr_t info;
-                info_thread(L) * next;
                 L * lock;
                 bool listed;                                    // true if info_thread is on queue, false otherwise;
@@ -42 +43 @@
         void ?{}( info_thread(L) & this, $thread * t, uintptr_t info );
         void ^?{}( info_thread(L) & this );
-
-        info_thread(L) *& get_next( info_thread(L) & this );
 }
 
@@ -50 +49 @@
 ///////////////////////////////////////////////////////////////////
 
+// struct lock_thread {
+//      struct $thread * t;
+//      lock_thread * next;
+// };
+
+// void ?{}( lock_thread & this, struct $thread * thd );
+// void ^?{}( lock_thread & this );
+
+// lock_thread *& get_next( lock_thread & );
+
 struct blocking_lock {
         // Spin lock used for mutual exclusion
@@ -55 +64 @@
 
         // List of blocked threads
-        __queue_t( struct $thread ) blocked_threads;
+        __queue_t( $thread ) blocked_threads;
 
         // Count of current blocked threads
@@ -135 +144 @@
                 __spinlock_t lock;
 
+                info_thread(L) * last_thread;
+
                 // List of blocked threads
-                __queue_t( info_thread(L) ) blocked_threads;
+                Sequence( info_thread(L) ) blocked_threads;
 
                 // Count of current blocked threads
@@ -150 +161 @@
                 condition_variable(L) * cond;
 
-                info_thread(L) ** i;
+                info_thread(L) * i;
         };