Changeset aaa3c457 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2018-11-12T10:36:10Z (5 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/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();
+}
+
+void __malloc_fini(void)
+{
+        fibril_rmutex_destroy(&malloc_mutex);
 }