Changeset aaa3c457 in mainline for uspace/lib/c/generic/thread/fibril.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.c (modified) (5 diffs)

uspace/lib/c/generic/thread/fibril.c

@@ -87 +87 @@
 
 /* This futex serializes access to global data. */
-static futex_t fibril_futex = FUTEX_INITIALIZER;
+static futex_t fibril_futex;
 static futex_t ready_semaphore;
 static long ready_st_count;
@@ -95 +95 @@
 static LIST_INITIALIZE(timeout_list);
 
-static futex_t ipc_lists_futex = FUTEX_INITIALIZER;
+static futex_t ipc_lists_futex;
 static LIST_INITIALIZE(ipc_waiter_list);
 static LIST_INITIALIZE(ipc_buffer_list);
@@ -796 +796 @@
         if (!multithreaded) {
                 _ready_debug_check();
-                futex_initialize(&ready_semaphore, ready_st_count);
+                if (futex_initialize(&ready_semaphore, ready_st_count) != EOK)
+                        abort();
                 multithreaded = true;
         }
@@ -861 +862 @@
 void __fibrils_init(void)
 {
+        if (futex_initialize(&fibril_futex, 1) != EOK)
+                abort();
+        if (futex_initialize(&ipc_lists_futex, 1) != EOK)
+                abort();
+
         /*
          * We allow a fixed, small amount of parallelism for IPC reads, but
@@ -876 +882 @@
 }
 
+void __fibrils_fini(void)
+{
+        futex_destroy(&fibril_futex);
+        futex_destroy(&ipc_lists_futex);
+}
+
 void fibril_usleep(usec_t timeout)
 {