Changeset 8d66610 for libcfa/src/concurrency/locks.cfa

Timestamp:

May 21, 2021, 4:48:10 PM (5 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:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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.cfa (modified) (5 diffs)

libcfa/src/concurrency/locks.cfa

@@ -188 +188 @@
                 alarm_node_t alarm_node;
                 condition_variable(L) * cond;
-                info_thread(L) * i;
+                info_thread(L) * info_thd;
         };
 
-        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback, condition_variable(L) * c, info_thread(L) * i ) {
+        void ?{}( alarm_node_wrap(L) & this, Duration alarm, Duration period, Alarm_Callback callback, condition_variable(L) * c, info_thread(L) * i ) {
                 this.alarm_node{ callback, alarm, period };
                 this.cond = c;
-                this.i = i;
+                this.info_thd = i;
         }
 
@@ -206 +206 @@
                 //      may still be called after a thread has been removed from the queue but
                 //      before the alarm is unregistered
-                if ( listed(i) ) {      // is thread on queue
-                        i->signalled = false;
+                if ( listed(info_thd) ) {       // is thread on queue
+                        info_thd->signalled = false;
                         // remove this thread O(1)
-                        remove( cond->blocked_threads, *i );
+                        remove( cond->blocked_threads, *info_thd );
                         cond->count--;
-                        if( i->lock ) {
+                        if( info_thd->lock ) {
                                 // call lock's on_notify if a lock was passed
-                                on_notify(*i->lock, i->t);
+                                on_notify(*info_thd->lock, info_thd->t);
                         } else {
                                 // otherwise wake thread
-                                unpark( i->t );
+                                unpark( info_thd->t );
                         }
                 }
@@ -313 +313 @@
 
         // helper for wait()'s' with a timeout
-        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Time t ) with(this) {
+        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 size_t recursion_count = queue_and_get_recursion(this, &info);
-                alarm_node_wrap(L) node_wrap = { t, 0`s, alarm_node_wrap_cast, &this, &info };
+                alarm_node_wrap(L) node_wrap = { t, 0`s, callback, &this, &info };
                 register_self( &node_wrap.alarm_node );
                 unlock( lock );
@@ -332 +332 @@
         #define WAIT_TIME( u, l, t ) \
                 info_thread( L ) i = { active_thread(), u, l }; \
-                queue_info_thread_timeout(this, i, t ); \
+                queue_info_thread_timeout(this, i, t, alarm_node_wrap_cast ); \
                 return i.signalled;
 
@@ -340 +340 @@
         void wait( condition_variable(L) & this, L & l, uintptr_t info ) with(this) { WAIT( info, &l ) }
 
-        bool wait( condition_variable(L) & this, Duration duration                        ) with(this) { WAIT_TIME( 0   , 0p , __kernel_get_time() + duration ) }
-        bool wait( condition_variable(L) & this, uintptr_t info, Duration duration        ) with(this) { WAIT_TIME( info, 0p , __kernel_get_time() + duration ) }
-        bool wait( condition_variable(L) & this, Time time                                ) with(this) { WAIT_TIME( 0   , 0p , time ) }
-        bool wait( condition_variable(L) & this, uintptr_t info, Time time                ) with(this) { WAIT_TIME( info, 0p , time ) }
-        bool wait( condition_variable(L) & this, L & l, Duration duration                 ) with(this) { WAIT_TIME( 0   , &l , __kernel_get_time() + duration ) }
-        bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , __kernel_get_time() + duration ) }
-        bool wait( condition_variable(L) & this, L & l, Time time                         ) with(this) { WAIT_TIME( 0   , &l , time ) }
-        bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time         ) with(this) { WAIT_TIME( info, &l , time ) }
+        bool wait( condition_variable(L) & this, Duration duration                        ) with(this) { WAIT_TIME( 0   , 0p , duration ) }
+        bool wait( condition_variable(L) & this, uintptr_t info, Duration duration        ) with(this) { WAIT_TIME( info, 0p , duration ) }
+        bool wait( condition_variable(L) & this, L & l, Duration duration                 ) with(this) { WAIT_TIME( 0   , &l , duration ) }
+        bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , duration ) }
 }