Changes in uspace/lib/c/generic/private/futex.h [205f1add:f787c8e] 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 timespec *expires)
+static inline errno_t futex_down_composable(futex_t *futex, const struct timeval *expires)
 {
         // TODO: Add tests for this.
@@ -110 +109 @@
                 return EOK;
 
-        usec_t timeout;
+        suseconds_t timeout;
 
         if (!expires) {
@@ -120 +119 @@
                         timeout = 1;
                 } else {
-                        struct timespec tv;
+                        struct timeval tv;
                         getuptime(&tv);
-                        timeout = ts_gteq(&tv, expires) ? 1 :
-                            NSEC2USEC(ts_sub_diff(expires, &tv));
+                        timeout = tv_gteq(&tv, expires) ? 1 :
+                            tv_sub_diff(expires, &tv);
                 }
 
@@ -149 +148 @@
 }
 
-static inline errno_t futex_down_timeout(futex_t *futex,
-    const struct timespec *expires)
-{
-        if (expires && expires->tv_sec == 0 && expires->tv_nsec == 0) {
+static inline errno_t futex_down_timeout(futex_t *futex, const struct timeval *expires)
+{
+        if (expires && expires->tv_sec == 0 && expires->tv_usec == 0) {
                 /* Nonblocking down. */
 
@@ -211 +209 @@
          * trydown.
          */
-        struct timespec tv = { .tv_sec = 0, .tv_nsec = 0 };
+        struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
         return futex_down_timeout(futex, &tv) == EOK;
 }