Changeset 231b3fd in mainline for uspace/lib/c/generic/thread/fibril_synch.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/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;
         }