Changes in uspace/lib/c/generic/private/futex.h [f787c8e:205f1add] in mainline

File:

• uspace/lib/c/generic/private/futex.h (modified) (5 diffs)

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;
 }