Changeset 45c8eea in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2018-11-11T15:47:39Z (5 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().

File:

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

uspace/lib/c/generic/malloc.c

@@ -195 +195 @@
 
 /** Futex for thread-safe heap manipulation */
-static FIBRIL_RMUTEX_INITIALIZE(malloc_mutex);
+static fibril_rmutex_t malloc_mutex;
 
 #define malloc_assert(expr) safe_assert(expr)
@@ -484 +484 @@
 void __malloc_init(void)
 {
+        if (fibril_rmutex_initialize(&malloc_mutex) != EOK)
+                abort();
+
         if (!area_create(PAGE_SIZE))
                 abort();