Time abstraction added to FOSA to replace timespec_operations

[frescor/fosa.git] / src_marte / tests / test_cpu_clocks / test_cpu_clocks.c

diff --git a/src_marte/tests/test_cpu_clocks/test_cpu_clocks.c b/src_marte/tests/test_cpu_clocks/test_cpu_clocks.c
index 2dfd6c5c08a2d0cf3d7f17109666573fae738eb5..d9c0ab137c2261cffc03c341601dc1e7ce1e4452 100644 (file)
--- a/src_marte/tests/test_cpu_clocks/test_cpu_clocks.c
+++ b/src_marte/tests/test_cpu_clocks/test_cpu_clocks.c
@@ -1,14 +1,11 @@
-#include "fosa_threads_and_signals.h"
-#include "fosa_clocks_and_timers.h"
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h> // for nanosleep
 
 #include <assert.h>
 #include <stdlib.h> // for exit in assert
 #include <string.h> // for memset
-#include <timespec_operations.h>
 
+#include "fosa.h"
 
 /*****************************/
 /*   D E F I N I T I O N S   */
@@ -24,8 +21,8 @@
 static void * thread_body(void *thread_arg);
 
 
-static struct timespec start_execution;
-static struct timespec signal_reception;
+static fosa_abs_time_t start_execution;
+static fosa_abs_time_t signal_reception;
 
 int main () 
 {
@@ -36,26 +33,14 @@ int main ()
 
     fosa_signal_t signal_received;
     fosa_signal_info_t info_programmed, info_received;
-    struct timespec work_interval = {3, 200000000}; // 3.2 seconds
+    fosa_rel_time_t work_interval = fosa_msec_to_rel_time(3200); // 3.2 seconds
     fosa_clock_id_t clockid;
     fosa_timer_id_t timerid;
 
-    struct timespec budget = {-1, -1};
+    fosa_rel_time_t budget;
+    fosa_rel_time_t elapsed_time;
     fosa_signal_t signal_set[1];
 
-
-
-    memset(&attr, 0, sizeof(attr) );
-    memset(&tid, 0, sizeof(tid) );
-    memset(&signal_received, 0, sizeof(signal_received) );
-    memset(&info_programmed, 0, sizeof(info_programmed) );
-    memset(&info_received, 0, sizeof(info_received) );
-    memset(&clockid, 0, sizeof(clockid) );
-    memset(&timerid, 0, sizeof(timerid) );
-
-    memset(&start_execution, 0xFF, sizeof(start_execution) );
-    memset(&signal_received, 0xFF, sizeof(signal_received) );
-
     /* Set the signal mask */
     /***********************/
     signal_set[0] = SIGNAL_TIMER;
@@ -100,9 +85,8 @@ int main ()
     printf("timer created, err=%d\n", err);
     assert(err == 0);
 
-    budget.tv_sec = 2;
-    budget.tv_nsec = 500000000;
-    err = fosa_timer_arm(timerid, 0, &budget);
+    budget = fosa_msec_to_rel_time(2500);
+    err = fosa_rel_timer_arm(timerid, &budget);
     printf("timer armed for 2.5 secs, err=%d\n", err);
     assert(err == 0);
 
@@ -118,13 +102,13 @@ int main ()
     err = fosa_signal_wait(signal_set, 1 ,&signal_received, &info_received);
 
     fosa_clock_get_time(FOSA_CLOCK_REALTIME, &signal_reception);
-    decr_timespec(&signal_reception, &start_execution);
+    elapsed_time = fosa_abs_time_extract_interval(start_execution, signal_reception);
 
     printf("signal received=%d value=%d (42?), err=%d\n",
            signal_received, info_received.sival_int, err);
 
-    printf("Elapsed time between sigwait and timer expiration: %d %d\n",
-           signal_reception.tv_sec, signal_reception.tv_nsec);
+    printf("Elapsed time between sigwait and timer expiration: %ld msecs\n",
+           fosa_rel_time_to_msec(elapsed_time) );
 
     return 0;
 }
@@ -134,32 +118,30 @@ int main ()
 
 static void * thread_body(void *thread_arg)
 {
-    struct timespec before_work_time = {-1, -1};
-    struct timespec after_work_time = {-1, -1};
-    struct timespec work_interval = {1, 400000000}; // 1.4 seconds
+    fosa_abs_time_t before_work_time;
+    fosa_abs_time_t after_work_time;
+    fosa_rel_time_t work_interval = fosa_msec_to_rel_time(1400);
+    fosa_rel_time_t elapsed_time;
     int err;
 
-
     fosa_clock_get_time(FOSA_CLOCK_REALTIME, &start_execution);
 
     while(1) 
     {
         err = fosa_clock_get_time(FOSA_CLOCK_REALTIME, &before_work_time);
         assert(err == 0);
-        printf("Start periodic work  at %d, %d\n", 
-               before_work_time.tv_sec, before_work_time.tv_nsec);
+        printf("Start periodic work  at %ld msecs\n", fosa_abs_time_to_msec(before_work_time) );
 
         fosa_eat(&work_interval);
 
         err = fosa_clock_get_time(FOSA_CLOCK_REALTIME, &after_work_time);
         assert(err == 0);
 
-        printf("End periodic work  at %d, %d\n", 
-               after_work_time.tv_sec, after_work_time.tv_nsec);
+        printf("End periodic work  at %ld msecs\n", fosa_abs_time_to_msec(after_work_time) );
+        elapsed_time = fosa_abs_time_extract_interval(before_work_time, after_work_time);
+
+        printf("Elapsed time:  %ld msecs\n", fosa_rel_time_to_msec(elapsed_time) );
 
-        decr_timespec(&after_work_time, &before_work_time);
-        printf("Elapsed time:  %d %d\n", after_work_time.tv_sec,
-               after_work_time.tv_nsec);
     } // while
     return NULL;
 }