Changes in libcfa/src/concurrency/alarm.hfa [4aeaee5:58b6d1b]

File:

• libcfa/src/concurrency/alarm.hfa (modified) (2 diffs)

libcfa/src/concurrency/alarm.hfa

@@ -23 +23 @@
 #include "time.hfa"
 
-#include "containers/list.hfa"
-
-struct $thread;
+struct thread_desc;
 struct processor;
 
@@ -39 +37 @@
 //=============================================================================================
 
-enum alarm_type{ Kernel = 0, User = 1, Callback = 2 };
-
-struct alarm_node_t;
-
-typedef void (*Alarm_Callback)(alarm_node_t & );
-
 struct alarm_node_t {
         Time alarm;                             // time when alarm goes off
         Duration period;                        // if > 0 => period of alarm
-
-        DLISTED_MGD_IMPL_IN(alarm_node_t)
+        alarm_node_t * next;            // intrusive link list field
 
         union {
-                $thread * thrd;                                 // thrd who created event
-                processor * proc;                               // proc who created event
-                Alarm_Callback callback;                // callback to handle event
+                thread_desc * thrd;     // thrd who created event
+                processor * proc;               // proc who created 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
+        bool kernel_alarm       :1;             // true if this is not a user defined alarm
 };
-DLISTED_MGD_IMPL_OUT(alarm_node_t)
 
-void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period );
+typedef alarm_node_t ** __alarm_it_t;
+
+void ?{}( alarm_node_t & this, thread_desc * 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 );
 
-typedef dlist(alarm_node_t, alarm_node_t) alarm_list_t;
+struct alarm_list_t {
+        alarm_node_t * head;
+        __alarm_it_t tail;
+};
+
+static inline void ?{}( alarm_list_t & this ) with( this ) {
+        head = 0;
+        tail = &head;
+}
 
 void insert( alarm_list_t * this, alarm_node_t * n );