Changeset aaa3c457 in mainline for kernel/generic/include/synch/syswaitq.h

Timestamp:

2018-11-12T10:36:10Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a43dfcb

Parents:

3ce781f4 (diff), 6874bd2 (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-11-12 10:36:10)

git-committer:

GitHub <noreply@…> (2018-11-12 10:36:10)

Message:

Merge pull request #56 from jermar/futexremoval

Remove kernel support for futexes in favor of waitq kobjects.

File:

• kernel/generic/include/synch/syswaitq.h (moved) (moved from kernel/generic/include/synch/futex.h ) (2 diffs)

kernel/generic/include/synch/syswaitq.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2018 Jakub Jermar
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#ifndef KERN_FUTEX_H_
-#define KERN_FUTEX_H_
+#ifndef KERN_SYS_WAITQ_H_
+#define KERN_SYS_WAITQ_H_
 
 #include <typedefs.h>
-#include <synch/waitq.h>
-#include <adt/hash_table.h>
+#include <abi/cap.h>
 
-/** Kernel-side futex structure. */
-typedef struct {
-        /** Physical address of the status variable. */
-        uintptr_t paddr;
-        /** Wait queue for threads waiting for futex availability. */
-        waitq_t wq;
-        /** Futex hash table link. */
-        ht_link_t ht_link;
-        /** Number of tasks that reference this futex. */
-        size_t refcount;
-} futex_t;
+extern void sys_waitq_init(void);
 
-extern void futex_init(void);
-extern sys_errno_t sys_futex_sleep(uintptr_t, uintptr_t);
-extern sys_errno_t sys_futex_wakeup(uintptr_t);
+extern void sys_waitq_task_cleanup(void);
 
-extern void futex_task_cleanup(void);
-extern void futex_task_init(struct task *);
+extern sys_errno_t sys_waitq_create(cap_waitq_handle_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);
 
 #endif