Changeset aaa3c457 in mainline for uspace/lib/c/generic/io/kio.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/io/kio.c (modified) (2 diffs)

uspace/lib/c/generic/io/kio.c

@@ -38 +38 @@
 #include <str.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <abi/kio.h>
@@ -53 +54 @@
         char data[KIO_BUFFER_SIZE];
         size_t used;
-} kio_buffer = { .futex = FUTEX_INITIALIZER, };
+} kio_buffer;
+
+void __kio_init(void)
+{
+        if (futex_initialize(&kio_buffer.futex, 1) != EOK)
+                abort();
+}
+
+void __kio_fini(void)
+{
+        futex_destroy(&kio_buffer.futex);
+}
 
 errno_t kio_write(const void *buf, size_t size, size_t *nwritten)