Changeset 4aeaee5 for libcfa/src/concurrency/locks.cfa

Timestamp:

Dec 3, 2020, 4:47:41 PM (4 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8e655f7c

Parents:

cad1df1

Message:

added alarm callback to union and refactored

File:

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

libcfa/src/concurrency/locks.cfa

@@ -207 +207 @@
         void ^?{}( condition_variable(L) & this ){ }
 
-        void ?{}( alarm_node_wrap(L) & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback ) {
-                this.alarm_node{ thrd, alarm, period, callback };
+        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback ) {
+                this.alarm_node{ callback, alarm, period };
         }
 
@@ -277 +277 @@
                 lock( lock __cfaabi_dbg_ctx2 );
                 size_t recursion_count = queue_and_get_recursion(this, &info);
-                alarm_node_wrap(L) node_wrap = { info.t, t, 0`s, alarm_node_wrap_cast };
+                alarm_node_wrap(L) node_wrap = { t, 0`s, alarm_node_wrap_cast };
                 node_wrap.cond = &this;
                 node_wrap.i = &info;