Changeset bd41ac52 in mainline for uspace/lib/c/generic/io/console.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/lib/c/generic/io/console.c (modified) (2 diffs)

uspace/lib/c/generic/io/console.c

@@ -223 +223 @@
 
 bool console_get_event_timeout(console_ctrl_t *ctrl, cons_event_t *event,
-    suseconds_t *timeout)
-{
-        struct timeval t0;
-        gettimeofday(&t0, NULL);
+    usec_t *timeout)
+{
+        struct timespec t0;
+        getuptime(&t0);
 
         if (ctrl->input_aid == 0) {
@@ -257 +257 @@
 
         /* Update timeout */
-        struct timeval t1;
-        gettimeofday(&t1, NULL);
-        *timeout -= tv_sub_diff(&t1, &t0);
+        struct timespec t1;
+        getuptime(&t1);
+        *timeout -= NSEC2USEC(ts_sub_diff(&t1, &t0));
 
         return true;