Changeset 9bde0d5 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2018-07-18T19:56:43Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

42f5860

Parents:

40abf56

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-18 19:47:28)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-18 19:56:43)

Message:

Replace a bunch of direct uses of futex_t.

File:

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

uspace/lib/c/generic/malloc.c

@@ -44 +44 @@
 #include <bitops.h>
 #include <mem.h>
-#include <futex.h>
+#include <fibril_synch.h>
 #include <stdlib.h>
 #include <adt/gcdlcm.h>
@@ -194 +194 @@
 
 /** Futex for thread-safe heap manipulation */
-static futex_t malloc_futex = FUTEX_INITIALIZER;
+static FIBRIL_RMUTEX_INITIALIZE(malloc_mutex);
 
 #define malloc_assert(expr) safe_assert(expr)
-
-#ifdef FUTEX_UPGRADABLE
-/** True if the heap may be accessed from multiple threads. */
-static bool multithreaded = false;
-
-/** Makes accesses to the heap thread safe. */
-void malloc_enable_multithreaded(void)
-{
-        multithreaded = true;
-}
 
 /** Serializes access to the heap from multiple threads. */
 static inline void heap_lock(void)
 {
-        if (multithreaded) {
-                futex_down(&malloc_futex);
-        } else {
-                /*
-                 * Malloc never switches fibrils while the heap is locked.
-                 * Similarly, it never creates new threads from within the
-                 * locked region. Therefore, if there are no other threads
-                 * except this one, the whole operation will complete without
-                 * any interruptions.
-                 */
-        }
+        fibril_rmutex_lock(&malloc_mutex);
 }
 
@@ -227 +207 @@
 static inline void heap_unlock(void)
 {
-        if (multithreaded) {
-                futex_up(&malloc_futex);
-        } else {
-                /*
-                 * Malloc never switches fibrils while the heap is locked.
-                 * Similarly, it never creates new threads from within the
-                 * locked region. Therefore, if there are no other threads
-                 * except this one, the whole operation will complete without
-                 * any interruptions.
-                 */
-        }
-}
-
-#else
-
-/** Makes accesses to the heap thread safe. */
-void malloc_enable_multithreaded(void)
-{
-        /* No-op. Already using thread-safe heap locking operations. */
-}
-
-/** Serializes access to the heap from multiple threads. */
-static inline void heap_lock(void)
-{
-        futex_down(&malloc_futex);
-}
-
-/** Serializes access to the heap from multiple threads. */
-static inline void heap_unlock(void)
-{
-        futex_up(&malloc_futex);
-}
-#endif
-
+        fibril_rmutex_unlock(&malloc_mutex);
+}
 
 /** Initialize a heap block