Changes in src/libcfa/concurrency/alarm.c [8ad6533:b69ea6b]

File:

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

src/libcfa/concurrency/alarm.c

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  9 13:36:18 2018
-// Update Count     : 61
+// Last Modified On : Fri Jul 21 22:35:18 2017
+// Update Count     : 1
 //
 
@@ -26 +26 @@
 #include "preemption.h"
 
+
+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;
+}
+
+static inline void ?{}( __cfa_time_t & this, timespec * curr ) {
+        uint64_t secs  = curr->tv_sec;
+        uint64_t nsecs = curr->tv_nsec;
+        this.val = from_s(secs).val + nsecs;
+}
+
 //=============================================================================================
 // Clock logic
 //=============================================================================================
 
-Time __kernel_get_time() {
+__cfa_time_t __kernel_get_time() {
         timespec curr;
-        clock_gettime( CLOCK_MONOTONIC_RAW, &curr );            // CLOCK_REALTIME
-        return (Time){ curr };
+        clock_gettime( CLOCK_REALTIME, &curr );
+        return (__cfa_time_t){ &curr };
 }
 
-void __kernel_set_timer( Duration alarm ) {
-        setitimer( ITIMER_REAL, &(itimerval){ alarm }, NULL );
+void __kernel_set_timer( __cfa_time_t alarm ) {
+        itimerval val = { &alarm };
+        setitimer( ITIMER_REAL, &val, NULL );
 }
 
@@ -44 +59 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread_desc * thrd, Time alarm, Duration period ) 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;
@@ -53 +68 @@
 }
 
-void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period ) 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;