Changeset 45c8eea in mainline for uspace/lib/c/generic/thread

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f4cb6c5f

Parents:

269bc459

git-author:

Jakub Jermar <jakub@…> (2018-11-10 17:49:44)

git-committer:

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

Message:

Preallocate waitq handle during initialization

Do not clutter futex_down_composable() with the preallocation of the
wait queue handle and do it single-threadedly in futex_initialize().

Location:

uspace/lib/c/generic/thread

Files:

• fibril.c (modified) (4 diffs)
• fibril_synch.c (modified) (2 diffs)
• futex.c (modified) (1 diff)
• mpsc.c (modified) (1 diff)

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

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);
 }
 
@@ -90 +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();
+}
 
 typedef struct {

uspace/lib/c/generic/thread/futex.c

@@ -49 +49 @@
  * @param val   Initialization value.
  *
+ * @return      Error code.
  */
-void futex_initialize(futex_t *futex, int val)
+errno_t futex_initialize(futex_t *futex, int val)
 {
         atomic_store_explicit(&futex->val, val, memory_order_relaxed);
-        atomic_store_explicit(&futex->lock, 0, memory_order_relaxed);
         futex->whandle = CAP_NIL;
+        return futex_allocate_waitq(futex);
 }
 

uspace/lib/c/generic/thread/mpsc.c

@@ -80 +80 @@
         }
 
+        if (fibril_rmutex_initialize(&q->t_lock) != EOK) {
+                free(q);
+                free(n);
+                free(c);
+                return NULL;
+        }
+
         q->elem_size = elem_size;
-        fibril_rmutex_initialize(&q->t_lock);
         q->head = q->tail = n;
         q->close_node = c;