Changeset ae151cf for libcfa/src/concurrency/alarm.cfa

Timestamp:

Oct 2, 2022, 10:00:43 PM (6 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

815943f

Parents:

f704974 (diff), f92e7b9 (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) (5 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -55 +55 @@
         this.period  = period;
         this.thrd = thrd;
-        this.timeval = __kernel_get_time() + alarm;
+        this.deadline = __kernel_get_time() + alarm;
         set = false;
         type = User;
@@ -64 +64 @@
         this.period  = period;
         this.proc = proc;
-        this.timeval = __kernel_get_time() + alarm;
+        this.deadline = __kernel_get_time() + alarm;
         set = false;
         type = Kernel;
@@ -72 +72 @@
         this.initial = alarm;
         this.period  = period;
-        this.timeval = __kernel_get_time() + alarm;
+        this.deadline = __kernel_get_time() + alarm;
         set = false;
         type = Callback;
@@ -85 +85 @@
 void insert( alarm_list_t * this, alarm_node_t * n ) {
         alarm_node_t * it = & (*this)`first;
-        while( it && (n->timeval > it->timeval) ) {
+        while( it && (n->deadline > it->deadline) ) {
                 it = & (*it)`next;
         }
@@ -116 +116 @@
 
                 Time curr = __kernel_get_time();
-                __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu -> %lu).\n", this, curr.tn, this->timeval.tn );
+                __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu -> %lu).\n", this, curr.tn, this->deadline.tn );
                 insert( &alarms, this );
-                __kernel_set_timer( this->timeval - curr);
+                __kernel_set_timer( this->deadline - curr);
                 this->set = true;
         }