Changeset afd7faf

Timestamp:

May 17, 2021, 9:20:55 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:

d7ae173

Parents:

d2afe17

Message:

Small fixes to lock and alarm around possible race and the thunk problem.

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (2 diffs)
• locks.cfa (modified) (2 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -118 +118 @@
                 insert( &alarms, this );
                 __kernel_set_timer( this->initial );
+                this->set = true;
         }
         unlock( event_kernel->lock );
-        this->set = true;
         enable_interrupts();
 }
@@ -129 +129 @@
         {
                 verify( validate( event_kernel->alarms ) );
-                remove( *this );
+                if (this->set) remove( *this );
+                this->set = false;
         }
         unlock( event_kernel->lock );
         enable_interrupts();
-        this->set = false;
 }
 

libcfa/src/concurrency/locks.cfa

@@ -313 +313 @@
 
         // helper for wait()'s' with a timeout
-        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration 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;