Changeset aaa3c457 in mainline for uspace/lib/c/generic/thread/fibril_synch.c

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:

• uspace/lib/c/generic/thread/fibril_synch.c (modified) (2 diffs)

uspace/lib/c/generic/thread/fibril_synch.c

@@ -51 +51 @@
 #include "../private/futex.h"
 
-void fibril_rmutex_initialize(fibril_rmutex_t *m)
-{
-        futex_initialize(&m->futex, 1);
+errno_t fibril_rmutex_initialize(fibril_rmutex_t *m)
+{
+        return futex_initialize(&m->futex, 1);
+}
+
+void fibril_rmutex_destroy(fibril_rmutex_t *m)
+{
+        futex_destroy(&m->futex);
 }
 
@@ -85 +90 @@
 static fibril_local bool deadlocked = false;
 
-static futex_t fibril_synch_futex = FUTEX_INITIALIZER;
+static futex_t fibril_synch_futex;
+
+void __fibril_synch_init(void)
+{
+        if (futex_initialize(&fibril_synch_futex, 1) != EOK)
+                abort();
+}
+
+void __fibril_synch_fini(void)
+{
+        futex_destroy(&fibril_synch_futex);
+}
 
 typedef struct {