Changeset bd41ac52 in mainline for uspace/app/tester/ipc/starve.c

Timestamp:

2018-08-25T22:21:25Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cca80a2

Parents:

e2625b1a

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C11-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C11), struct timespec (C11), usec_t
(HelenOS) and getuptime / getrealtime (HelenOS).

Also attempt to fix the implementation of clock() to return microseconds
(clocks) rather than processor cycles and move it to libc.

File:

• uspace/app/tester/ipc/starve.c (modified) (2 diffs)

uspace/app/tester/ipc/starve.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/time.h>
+#include <time.h>
 #include <io/console.h>
 #include <async.h>
@@ -43 +43 @@
                 return "Failed to init connection with console.";
 
-        struct timeval start;
-        gettimeofday(&start, NULL);
+        struct timespec start;
+        getuptime(&start);
 
         TPRINTF("Intensive computation shall be imagined (for %ds)...\n", DURATION_SECS);
         TPRINTF("Press a key to terminate prematurely...\n");
         while (true) {
-                struct timeval now;
-                gettimeofday(&now, NULL);
+                struct timespec now;
+                getuptime(&now);
 
-                if (tv_sub_diff(&now, &start) >= DURATION_SECS * 1000000L)
+                if (NSEC2SEC(ts_sub_diff(&now, &start)) >= DURATION_SECS)
                         break;
 
                 cons_event_t ev;
-                suseconds_t timeout = 0;
+                usec_t timeout = 0;
                 bool has_event = console_get_event_timeout(console, &ev, &timeout);
                 if (has_event && ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {