Changeset 8d66610 for libcfa/src/concurrency/alarm.hfa

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/alarm.hfa (modified) (1 diff)

libcfa/src/concurrency/alarm.hfa

@@ -46 +46 @@
 
 struct alarm_node_t {
-        Time alarm;                             // time when alarm goes off
-        Duration period;                        // if > 0 => period of alarm
+        Duration initial;       // time when alarm goes off
+        Duration period;        // if > 0 => period of alarm
 
-        DLISTED_MGD_IMPL_IN(alarm_node_t)
+        inline dlink(alarm_node_t);
 
         union {
-                $thread * thrd;                                 // thrd who created event
-                processor * proc;                               // proc who created event
-                Alarm_Callback callback;                // callback to handle event
+                $thread * thrd;                 // thrd who created event
+                processor * proc;                       // proc who created event
+                Alarm_Callback callback;        // callback to handle event
         };
 
-        bool set                :1;             // whether or not the alarm has be registered
-        enum alarm_type type;           // true if this is not a user defined alarm
+        Time timeval;           // actual time at which the alarm goes off
+        enum alarm_type type;   // true if this is not a user defined alarm
+        bool set                :1;     // whether or not the alarm has be registered
 };
-DLISTED_MGD_IMPL_OUT(alarm_node_t)
+P9_EMBEDDED( alarm_node_t, dlink(alarm_node_t) )
 
-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, Alarm_Callback callback, Time alarm, Duration period );
+void ?{}( alarm_node_t & this, $thread * thrd, Duration alarm, Duration period );
+void ?{}( alarm_node_t & this, processor * proc, Duration alarm, Duration period );
+void ?{}( alarm_node_t & this, Alarm_Callback callback, Duration alarm, Duration period );
 void ^?{}( alarm_node_t & this );
 
-typedef dlist(alarm_node_t, alarm_node_t) alarm_list_t;
+typedef dlist(alarm_node_t) alarm_list_t;
 
 void insert( alarm_list_t * this, alarm_node_t * n );