Changeset 205f1add in mainline for uspace/lib/c/generic/thread/fibril_synch.c

Timestamp:

2018-08-23T21:14:56Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

f33c989e

Parents:

e2625b1a

git-author:

Jakub Jermar <jakub@…> (2018-08-21 21:58:52)

git-committer:

Jakub Jermar <jakub@…> (2018-08-23 21:14:56)

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 C99-like or HelenOS-specific
interfaces to libc.

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

File:

• uspace/lib/c/generic/thread/fibril_synch.c (modified) (7 diffs)

uspace/lib/c/generic/thread/fibril_synch.c

@@ -37 +37 @@
 #include <async.h>
 #include <adt/list.h>
-#include <sys/time.h>
+#include <time.h>
 #include <errno.h>
 #include <assert.h>
@@ -390 +390 @@
 errno_t
 fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
-    suseconds_t timeout)
+    usec_t timeout)
 {
         assert(fibril_mutex_is_locked(fm));
@@ -400 +400 @@
         wdata.mutex = fm;
 
-        struct timeval tv;
-        struct timeval *expires = NULL;
+        struct timespec ts;
+        struct timespec *expires = NULL;
         if (timeout) {
-                getuptime(&tv);
-                tv_add_diff(&tv, timeout);
-                expires = &tv;
+                getuptime(&ts);
+                ts_add_diff(&ts, USEC2NSEC(timeout));
+                expires = &ts;
         }
 
@@ -557 +557 @@
  * @param arg           Argument for @a fun
  */
-void fibril_timer_set(fibril_timer_t *timer, suseconds_t delay,
+void fibril_timer_set(fibril_timer_t *timer, usec_t delay,
     fibril_timer_fun_t fun, void *arg)
 {
@@ -575 +575 @@
  * @param arg           Argument for @a fun
  */
-void fibril_timer_set_locked(fibril_timer_t *timer, suseconds_t delay,
+void fibril_timer_set_locked(fibril_timer_t *timer, usec_t delay,
     fibril_timer_fun_t fun, void *arg)
 {
@@ -728 +728 @@
 }
 
-errno_t fibril_semaphore_down_timeout(fibril_semaphore_t *sem, suseconds_t timeout)
+errno_t fibril_semaphore_down_timeout(fibril_semaphore_t *sem, usec_t timeout)
 {
         if (timeout < 0)
@@ -751 +751 @@
         futex_unlock(&fibril_synch_futex);
 
-        struct timeval tv;
-        struct timeval *expires = NULL;
+        struct timespec ts;
+        struct timespec *expires = NULL;
         if (timeout) {
-                getuptime(&tv);
-                tv_add_diff(&tv, timeout);
-                expires = &tv;
+                getuptime(&ts);
+                ts_add_diff(&ts, USEC2NSEC(timeout));
+                expires = &ts;
         }