Changeset c20533ea for libcfa/src/concurrency/locks.cfa

Timestamp:

Dec 26, 2020, 6:10:40 PM (4 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:

ac5816d

Parents:

83c7e3c

Message:

Fixed locks.hfa to no longer depend on private headers bits/algorithm.hfa and alarm.hfa

File:

• libcfa/src/concurrency/locks.cfa (modified) (3 diffs)

libcfa/src/concurrency/locks.cfa

@@ -176 +176 @@
 size_t get_recursion_count( multiple_acquisition_lock & this ){ return get_recursion_count( (blocking_lock &)this ); }
 
-///////////////////////////////////////////////////////////////////
-//// condition variable
-///////////////////////////////////////////////////////////////////
 
 forall(dtype L | is_blocking_lock(L)) {
+        struct alarm_node_wrap {
+                alarm_node_t alarm_node;
+                condition_variable(L) * cond;
+                info_thread(L) * i;
+        };
+
+        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback ) {
+                this.alarm_node{ callback, alarm, period };
+        }
+
+        void ^?{}( alarm_node_wrap(L) & this ) { }
 
         void timeout_handler ( alarm_node_wrap(L) & this ) with( this ) {
@@ -205 +213 @@
         void alarm_node_wrap_cast( alarm_node_t & a ) { timeout_handler( (alarm_node_wrap(L) &)a ); }
 
+}
+
+///////////////////////////////////////////////////////////////////
+//// condition variable
+///////////////////////////////////////////////////////////////////
+
+forall(dtype L | is_blocking_lock(L)) {
+
         void ?{}( condition_variable(L) & this ){
                 this.lock{};
@@ -212 +228 @@
 
         void ^?{}( condition_variable(L) & this ){ }
-
-        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback ) {
-                this.alarm_node{ callback, alarm, period };
-        }
-
-        void ^?{}( alarm_node_wrap(L) & this ) { }
 
         void process_popped( condition_variable(L) & this, info_thread(L) & popped ) with( this ) {