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

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.cfa (modified) (6 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -38 +38 @@
 
 void __kernel_set_timer( Duration alarm ) {
-        verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%jins)", alarm`ns);
-        setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p );
+        alarm = max(alarm, 1`us);
+        itimerval otv @= { 0 };
+        getitimer( ITIMER_REAL, &otv );
+        Duration od = { otv.it_value };
+        if(od == 0 || od > alarm) {
+                setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p );
+        }
 }
 
@@ -46 +51 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, $thread * thrd, Time 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.alarm = alarm;
-        this.period = period;
+        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = User;
 }
 
-void ?{}( alarm_node_t & this, processor * proc, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, processor * proc, Duration alarm, Duration period ) with( this ) {
+        this.initial = alarm;
+        this.period  = period;
         this.proc = proc;
-        this.alarm = alarm;
-        this.period = period;
+        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = Kernel;
 }
-void ?{}( alarm_node_t & this, Alarm_Callback callback, Time alarm, Duration period ) with( this ) {
-        this.alarm = alarm;
-        this.period = period;
+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;
         set = false;
         type = Callback;
@@ -77 +85 @@
 void insert( alarm_list_t * this, alarm_node_t * n ) {
         alarm_node_t * it = & (*this)`first;
-        while( it && (n->alarm > it->alarm) ) {
+        while( it && (n->timeval > it->timeval) ) {
                 it = & (*it)`next;
         }
@@ -105 +113 @@
         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
-                verify( validate( alarms ) );
-                bool first = ! & alarms`first;
+                /* paranoid */ verify( validate( alarms ) );
 
-                __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu).\n", this, this->alarm.tn );
+                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 );
-                if( first ) {
-                        __kernel_set_timer( alarms`first.alarm - __kernel_get_time() );
-                }
+                __kernel_set_timer( this->timeval - curr);
+                this->set = true;
         }
         unlock( event_kernel->lock );
-        this->set = true;
         enable_interrupts();
 }
@@ -124 +130 @@
         {
                 verify( validate( event_kernel->alarms ) );
-                remove( *this );
+                if (this->set) remove( *this );
+                this->set = false;
         }
         unlock( event_kernel->lock );
         enable_interrupts();
-        this->set = false;
 }
 
@@ -136 +142 @@
 
 void sleep( Duration duration ) {
-        alarm_node_t node = { active_thread(), __kernel_get_time() + duration, 0`s };
+        alarm_node_t node = { active_thread(), duration, 0`s };
 
         register_self( &node );