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

Timestamp:

2018-08-25T21:35:26Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

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) {