Changes in libcfa/src/concurrency/alarm.cfa [e84ab3d:afd7faf]

File:

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

libcfa/src/concurrency/alarm.cfa

@@ -51 +51 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread$ * thrd, Duration alarm, Duration period) with( this ) {
+void ?{}( alarm_node_t & this, $thread * thrd, Duration alarm, Duration period) with( this ) {
         this.initial = alarm;
         this.period  = period;
         this.thrd = thrd;
-        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = User;
@@ -64 +63 @@
         this.period  = period;
         this.proc = proc;
-        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = Kernel;
 }
 void ?{}( alarm_node_t & this, Alarm_Callback callback, Duration alarm, Duration period ) with( this ) {
-        this.callback = callback;
         this.initial = alarm;
         this.period  = period;
-        this.timeval = __kernel_get_time() + alarm;
+        this.callback = callback;
         set = false;
         type = Callback;
@@ -113 +110 @@
         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
+                Time curr = __kernel_get_time();
+                this->timeval = curr + this->initial;
+
                 /* paranoid */ verify( validate( alarms ) );
 
-                Time curr = __kernel_get_time();
                 __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu -> %lu).\n", this, curr.tn, this->timeval.tn );
                 insert( &alarms, this );
-                __kernel_set_timer( this->timeval - curr);
+                __kernel_set_timer( this->initial );
                 this->set = true;
         }