Changeset bd41ac52 in mainline for uspace/lib/c/generic/private

Timestamp:

2018-08-25T22:21:25Z (7 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.

Location:

uspace/lib/c/generic/private

Files:

• async.h (modified) (1 diff)
• fibril.h (modified) (1 diff)
• futex.h (modified) (5 diffs)
• thread.h (modified) (1 diff)

uspace/lib/c/generic/private/async.h

@@ -40 +40 @@
 #include <fibril.h>
 #include <fibril_synch.h>
-#include <sys/time.h>
+#include <time.h>
 #include <stdbool.h>
 

uspace/lib/c/generic/private/fibril.h

@@ -81 +81 @@
 
 extern void fibril_wait_for(fibril_event_t *);
-extern errno_t fibril_wait_timeout(fibril_event_t *, const struct timeval *);
+extern errno_t fibril_wait_timeout(fibril_event_t *, const struct timespec *);
 extern void fibril_notify(fibril_event_t *);
 
-extern errno_t fibril_ipc_wait(ipc_call_t *, const struct timeval *);
+extern errno_t fibril_ipc_wait(ipc_call_t *, const struct timespec *);
 extern void fibril_ipc_poke(void);
 

uspace/lib/c/generic/private/futex.h

@@ -102 +102 @@
  *
  */
-static inline errno_t futex_down_composable(futex_t *futex, const struct timeval *expires)
+static inline errno_t futex_down_composable(futex_t *futex,
+    const struct timespec *expires)
 {
         // TODO: Add tests for this.
@@ -109 +110 @@
                 return EOK;
 
-        suseconds_t timeout;
+        usec_t timeout;
 
         if (!expires) {
@@ -119 +120 @@
                         timeout = 1;
                 } else {
-                        struct timeval tv;
+                        struct timespec tv;
                         getuptime(&tv);
-                        timeout = tv_gteq(&tv, expires) ? 1 :
-                            tv_sub_diff(expires, &tv);
+                        timeout = ts_gteq(&tv, expires) ? 1 :
+                            NSEC2USEC(ts_sub_diff(expires, &tv));
                 }
 
@@ -148 +149 @@
 }
 
-static inline errno_t futex_down_timeout(futex_t *futex, const struct timeval *expires)
-{
-        if (expires && expires->tv_sec == 0 && expires->tv_usec == 0) {
+static inline errno_t futex_down_timeout(futex_t *futex,
+    const struct timespec *expires)
+{
+        if (expires && expires->tv_sec == 0 && expires->tv_nsec == 0) {
                 /* Nonblocking down. */
 
@@ -209 +211 @@
          * trydown.
          */
-        struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
+        struct timespec tv = { .tv_sec = 0, .tv_nsec = 0 };
         return futex_down_timeout(futex, &tv) == EOK;
 }

uspace/lib/c/generic/private/thread.h

@@ -49 +49 @@
 extern void thread_detach(thread_id_t);
 extern thread_id_t thread_get_id(void);
-extern int thread_usleep(useconds_t);
-extern unsigned int thread_sleep(unsigned int);
+extern void thread_usleep(usec_t);
+extern void thread_sleep(sec_t);
 
 #endif