Changeset b69ea6b for src/libcfa/concurrency/alarm.c

Timestamp:

Feb 15, 2018, 10:52:35 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

d27e340

Parents:

ff2d1139

Message:

Updated alarm to use bits/cfatime and fixed preemption for coroutines

File:

• src/libcfa/concurrency/alarm.c (modified) (4 diffs)

src/libcfa/concurrency/alarm.c

@@ -18 +18 @@
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -27 +26 @@
 #include "preemption.h"
 
-//=============================================================================================
-// time type
-//=============================================================================================
 
-#define one_second         1_000_000_000ul
-#define one_milisecond         1_000_000ul
-#define one_microsecond            1_000ul
-#define one_nanosecond                 1ul
-
-__cfa_time_t zero_time = { 0 };
-
-void ?{}( __cfa_time_t & this ) { this.val = 0; }
-void ?{}( __cfa_time_t & this, zero_t zero ) { this.val = 0; }
-
-void ?{}( itimerval & this, __cfa_time_t * alarm ) with( this ) {
-        it_value.tv_sec = alarm->val / one_second;                      // seconds
-        it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
+static inline void ?{}( itimerval & this, __cfa_time_t * alarm ) with( this ) {
+        it_value.tv_sec = alarm->val / (1`cfa_s).val;                   // seconds
+        it_value.tv_usec = max( (alarm->val % (1`cfa_s).val) / (1`cfa_us).val, 1000 ); // microseconds
         it_interval.tv_sec = 0;
         it_interval.tv_usec = 0;
 }
 
-
-void ?{}( __cfa_time_t & this, timespec * curr ) {
+static inline void ?{}( __cfa_time_t & this, timespec * curr ) {
         uint64_t secs  = curr->tv_sec;
         uint64_t nsecs = curr->tv_nsec;
-        this.val = (secs * one_second) + nsecs;
+        this.val = from_s(secs).val + nsecs;
 }
-
-__cfa_time_t ?=?( __cfa_time_t & this, zero_t rhs ) {
-        this.val = 0;
-        return this;
-}
-
-__cfa_time_t from_s ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000_000ul; return ret; }
-__cfa_time_t from_ms( uint64_t val ) { __cfa_time_t ret; ret.val = val *     1_000_000ul; return ret; }
-__cfa_time_t from_us( uint64_t val ) { __cfa_time_t ret; ret.val = val *         1_000ul; return ret; }
-__cfa_time_t from_ns( uint64_t val ) { __cfa_time_t ret; ret.val = val *             1ul; return ret; }
 
 //=============================================================================================
@@ -84 +59 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) with( this ) {
+void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ) with( this ) {
         this.thrd = thrd;
         this.alarm = alarm;
@@ -93 +68 @@
 }
 
-void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) with( this ) {
+void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ) with( this ) {
         this.proc = proc;
         this.alarm = alarm;