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

Timestamp:

2012-12-04T04:09:08Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

d54b303

Parents:

1b7eec9

Message:

malloc avoids using futexes during initialization of the main thread of a program.

File:

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

uspace/lib/c/generic/malloc.c

@@ -47 +47 @@
 #include <adt/gcdlcm.h>
 #include "private/malloc.h"
+#include "private/thread.h"
 
 /** Magic used in heap headers. */
@@ -785 +786 @@
 void *malloc(const size_t size)
 {
-        futex_down(&malloc_futex);
-        void *block = malloc_internal(size, BASE_ALIGN);
-        futex_up(&malloc_futex);
-        
-        return block;
+        /* Do not use futexes for allocations during main thread initialization. */
+        if (0 == atomic_get(&_created_thread_cnt)) {
+                return malloc_internal(size, BASE_ALIGN);
+        } else {
+                futex_down(&malloc_futex);
+                void *block = malloc_internal(size, BASE_ALIGN);
+                futex_up(&malloc_futex);
+                return block;
+        }
 }
 
@@ -807 +812 @@
         size_t palign =
             1 << (fnzb(max(sizeof(void *), align) - 1) + 1);
-        
-        futex_down(&malloc_futex);
-        void *block = malloc_internal(size, palign);
-        futex_up(&malloc_futex);
-        
-        return block;
+
+        /* Do not use futexes for allocations during main thread initialization. */
+        if (0 == atomic_get(&_created_thread_cnt)) {
+                return malloc_internal(size, palign);
+        } else {
+                futex_down(&malloc_futex);
+                void *block = malloc_internal(size, palign);
+                futex_up(&malloc_futex);
+
+                return block;
+        }
 }