Changes in libcfa/src/concurrency/locks.hfa [c131a02:dff1fd1]

File:

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

libcfa/src/concurrency/locks.hfa

@@ -36 +36 @@
                 uintptr_t info;
                 L * lock;
-                bool listed;                                    // true if info_thread is on queue, false otherwise;
+                bool signalled;                                 // true when signalled and false when timeout wakes thread
         };
 
@@ -46 +46 @@
         info_thread(L) *& Back( info_thread(L) * this );
         info_thread(L) *& Next( info_thread(L) * this );
-        bool listed( info_thread(L) * this );
 }
 
@@ -52 +51 @@
 //// Blocking Locks
 ///////////////////////////////////////////////////////////////////
-
-// 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 {
@@ -183 +172 @@
         int counter( condition_variable(L) & this );
 
-        // TODO: look into changing timout routines to return bool showing if signalled or woken by kernel
         void wait( condition_variable(L) & this );
         void wait( condition_variable(L) & this, uintptr_t info );
-        void wait( condition_variable(L) & this, Duration duration );
-        void wait( condition_variable(L) & this, uintptr_t info, Duration duration );
-        void wait( condition_variable(L) & this, Time time );
-        void wait( condition_variable(L) & this, uintptr_t info, Time time );
+        bool wait( condition_variable(L) & this, Duration duration );
+        bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
+        bool wait( condition_variable(L) & this, Time time );
+        bool wait( condition_variable(L) & this, uintptr_t info, Time time );
 
         void wait( condition_variable(L) & this, L & l );
         void wait( condition_variable(L) & this, L & l, uintptr_t info );
-        void wait( condition_variable(L) & this, L & l, Duration duration );
-        void wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration );
-        void wait( condition_variable(L) & this, L & l, Time time );
-        void wait( condition_variable(L) & this, L & l, uintptr_t info, Time time );
+        bool wait( condition_variable(L) & this, L & l, Duration duration );
+        bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration );
+        bool wait( condition_variable(L) & this, L & l, Time time );
+        bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time );
 }