Changes in libcfa/src/concurrency/locks.hfa [4aeaee5:6a8882c]

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"
 
@@ -32 +31 @@
 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;
@@ -43 +42 @@
         void ?{}( info_thread(L) & this, $thread * t, uintptr_t info );
         void ^?{}( info_thread(L) & this );
+
+        info_thread(L) *& get_next( info_thread(L) & this );
 }
 
@@ -49 +50 @@
 ///////////////////////////////////////////////////////////////////
 
-// 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
@@ -64 +55 @@
 
         // List of blocked threads
-        __queue_t( $thread ) blocked_threads;
+        __queue_t( struct $thread ) blocked_threads;
 
         // Count of current blocked threads
@@ -144 +135 @@
                 __spinlock_t lock;
 
-                info_thread(L) * last_thread;
-
                 // List of blocked threads
-                Sequence( info_thread(L) ) blocked_threads;
+                __queue_t( info_thread(L) ) blocked_threads;
 
                 // Count of current blocked threads
@@ -161 +150 @@
                 condition_variable(L) * cond;
 
-                info_thread(L) * i;
+                info_thread(L) ** i;
         };
 
-        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback );
+        void ?{}( alarm_node_wrap(L) & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback );
         void ^?{}( alarm_node_wrap(L) & this );