Changeset ae151cf for libcfa/src/concurrency/preemption.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/preemption.cfa (modified) (3 diffs)

libcfa/src/concurrency/preemption.cfa

@@ -104 +104 @@
 static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
         if( ! & (*alarms)`first ) return 0p;                                            // If no alarms return null
-        if( (*alarms)`first.timeval >= currtime ) return 0p;    // If alarms head not expired return null
+        if( (*alarms)`first.deadline >= currtime ) return 0p;   // If alarms head not expired return null
         return pop(alarms);                                                                     // Otherwise just pop head
 }
@@ -140 +140 @@
                 if( period > 0 ) {
                         __cfadbg_print_buffer_local( preemption, " KERNEL: alarm period is %lu.\n", period`ns );
-                        node->timeval = currtime + period;  // Alarm is periodic, add currtime to it (used cached current time)
+                        node->deadline = currtime + period;  // Alarm is periodic, add currtime to it (used cached current time)
                         insert( alarms, node );             // Reinsert the node for the next time it triggers
                 }
@@ -147 +147 @@
         // If there are still alarms pending, reset the timer
         if( & (*alarms)`first ) {
-                Duration delta = (*alarms)`first.timeval - currtime;
+                Duration delta = (*alarms)`first.deadline - currtime;
                 __kernel_set_timer( delta );
         }