Changeset 4aeaee5

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

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (1 diff)
• alarm.hfa (modified) (2 diffs)
• locks.cfa (modified) (2 diffs)
• locks.hfa (modified) (1 diff)

libcfa/src/concurrency/alarm.cfa

@@ -60 +60 @@
         type = Kernel;
 }
-void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback ) with( this ) {
-        this.thrd = thrd;
+void ?{}( alarm_node_t & this, Alarm_Callback callback, Time alarm, Duration period ) with( this ) {
         this.alarm = alarm;
         this.period = period;

libcfa/src/concurrency/alarm.hfa

@@ -52 +52 @@
 
         union {
-                $thread * thrd; // thrd who created event
-                processor * proc;               // proc who created event
+                $thread * thrd;                                 // thrd who created event
+                processor * proc;                               // proc who created event
+                Alarm_Callback callback;                // callback to handle event
         };
-
-        Alarm_Callback callback;
 
         bool set                :1;             // whether or not the alarm has be registered
@@ -65 +64 @@
 void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period );
 void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period );
-void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback );
+void ?{}( alarm_node_t & this, Alarm_Callback callback, Time alarm, Duration period );
 void ^?{}( alarm_node_t & this );
 

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;

libcfa/src/concurrency/locks.hfa

@@ -164 +164 @@
         };
 
-        void ?{}( alarm_node_wrap(L) & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback );
+        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback );
         void ^?{}( alarm_node_wrap(L) & this );