Changeset 8119363 in mainline for kernel/generic/src/synch/futex.c

Timestamp:

2018-06-26T17:35:40Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6e569bf

Parents:

fbfe59d (diff), e768aea (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.

Message:

Merge some preliminary async/fibril framework changes.

File:

• kernel/generic/src/synch/futex.c (modified) (3 diffs)

kernel/generic/src/synch/futex.c

@@ -398 +398 @@
 }
 
-/** Sleep in futex wait queue.
- *
- * @param uaddr         Userspace address of the futex counter.
+/** Sleep in futex wait queue with a timeout.
+ *  If the sleep times out or is interrupted, the next wakeup is ignored.
+ *  The userspace portion of the call must handle this condition.
+ *
+ * @param uaddr         Userspace address of the futex counter.
+ * @param timeout       Maximum number of useconds to sleep. 0 means no limit.
  *
  * @return              If there is no physical mapping for uaddr ENOENT is
@@ -406 +409 @@
  *                      waitq_sleep_timeout().
  */
-sys_errno_t sys_futex_sleep(uintptr_t uaddr)
+sys_errno_t sys_futex_sleep(uintptr_t uaddr, uintptr_t timeout)
 {
         futex_t *futex = get_futex(uaddr);
@@ -417 +420 @@
 #endif
 
-        errno_t rc = waitq_sleep_timeout(
-            &futex->wq, 0, SYNCH_FLAGS_INTERRUPTIBLE, NULL);
+        errno_t rc = waitq_sleep_timeout(&futex->wq, timeout,
+            SYNCH_FLAGS_INTERRUPTIBLE | SYNCH_FLAGS_FUTEX, NULL);
 
 #ifdef CONFIG_UDEBUG