Changeset 0b8fad2 in mainline

Timestamp:

2018-11-11T15:47:39Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6874bd2

Parents:

25f6bddb

git-author:

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

git-committer:

Jakub Jermar <jakub@…> (2018-11-11 15:47:39)

Message:

Make user waitq more generic

By allowing SYS_WAITQ_SLEEP to specify flags, the implementation needn't
hardcode the use of SYNCH_FLAGS_FUTEX, resulting in a more generic
synchronization primitive usable from userspace.

Files:

• kernel/generic/include/synch/syswaitq.h (modified) (1 diff)
• kernel/generic/src/synch/syswaitq.c (modified) (2 diffs)
• uspace/lib/c/generic/private/futex.h (modified) (2 diffs)

kernel/generic/include/synch/syswaitq.h

@@ -44 +44 @@
 
 extern sys_errno_t sys_waitq_create(cap_waitq_handle_t *);
-extern sys_errno_t sys_waitq_sleep(cap_waitq_handle_t, uintptr_t);
+extern sys_errno_t sys_waitq_sleep(cap_waitq_handle_t, uint32_t, unsigned int);
 extern sys_errno_t sys_waitq_wakeup(cap_waitq_handle_t);
 extern sys_errno_t sys_waitq_destroy(cap_waitq_handle_t);

kernel/generic/src/synch/syswaitq.c

@@ -143 +143 @@
  * @param whandle  Waitq capability handle of the waitq in which to sleep.
  * @param timeout  Timeout in microseconds.
+ * @param flags    Flags from SYNCH_FLAGS_* family. SYNCH_FLAGS_INTERRUPTIBLE is
+ *                 always implied.
  *
  * @return         Error code.
  */
-sys_errno_t sys_waitq_sleep(cap_waitq_handle_t whandle, uintptr_t timeout)
+sys_errno_t sys_waitq_sleep(cap_waitq_handle_t whandle, uint32_t timeout,
+    unsigned int flags)
 {
         kobject_t *kobj = kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ);
@@ -157 +160 @@
 
         errno_t rc = waitq_sleep_timeout(kobj->waitq, timeout,
-            SYNCH_FLAGS_INTERRUPTIBLE | SYNCH_FLAGS_FUTEX, NULL);
+            SYNCH_FLAGS_INTERRUPTIBLE | flags, NULL);
 
 #ifdef CONFIG_UDEBUG

uspace/lib/c/generic/private/futex.h

@@ -43 +43 @@
 #include <fibril.h>
 #include <abi/cap.h>
+#include <abi/synch.h>
 
 typedef struct futex {
@@ -147 +148 @@
         }
 
-        return __SYSCALL2(SYS_WAITQ_SLEEP, (sysarg_t) futex->whandle,
-            (sysarg_t) timeout);
+        return __SYSCALL3(SYS_WAITQ_SLEEP, (sysarg_t) futex->whandle,
+            (sysarg_t) timeout, (sysarg_t) SYNCH_FLAGS_FUTEX);
 }