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

Timestamp:

2012-12-04T05:18:19Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

32d2e60

Parents:

9a3b469

Message:

Initial version of nop futexes that are upgradable to proper futexes.

File:

• uspace/lib/c/generic/malloc.c (modified) (12 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. */
@@ -201 +200 @@
         do { \
                 if (!(expr)) {\
-                        futex_up(&malloc_futex); \
+                        _futex_up(&malloc_futex); \
                         assert_abort(#expr, __FILE__, __LINE__); \
                 } \
@@ -786 +785 @@
 void *malloc(const size_t size)
 {
-        /* 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;
-        }
+        _futex_down(&malloc_futex);
+        void *block = malloc_internal(size, BASE_ALIGN);
+        _futex_up(&malloc_futex);
+
+        return block;
 }
 
@@ -813 +808 @@
             1 << (fnzb(max(sizeof(void *), align) - 1) + 1);
 
-        /* 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;
-        }
+        _futex_down(&malloc_futex);
+        void *block = malloc_internal(size, palign);
+        _futex_up(&malloc_futex);
+
+        return block;
 }
 
@@ -838 +828 @@
                 return malloc(size);
         
-        futex_down(&malloc_futex);
+        _futex_down(&malloc_futex);
         
         /* Calculate the position of the header. */
@@ -895 +885 @@
         }
         
-        futex_up(&malloc_futex);
+        _futex_up(&malloc_futex);
         
         if (reloc) {
@@ -918 +908 @@
                 return;
         
-        futex_down(&malloc_futex);
+        _futex_down(&malloc_futex);
         
         /* Calculate the position of the header. */
@@ -963 +953 @@
         heap_shrink(area);
         
-        futex_up(&malloc_futex);
+        _futex_up(&malloc_futex);
 }
 
 void *heap_check(void)
 {
-        futex_down(&malloc_futex);
+        _futex_down(&malloc_futex);
         
         if (first_heap_area == NULL) {
-                futex_up(&malloc_futex);
+                _futex_up(&malloc_futex);
                 return (void *) -1;
         }
@@ -985 +975 @@
                     (((uintptr_t) area->start % PAGE_SIZE) != 0) ||
                     (((uintptr_t) area->end % PAGE_SIZE) != 0)) {
-                        futex_up(&malloc_futex);
+                        _futex_up(&malloc_futex);
                         return (void *) area;
                 }
@@ -996 +986 @@
                         /* Check heap block consistency */
                         if (head->magic != HEAP_BLOCK_HEAD_MAGIC) {
-                                futex_up(&malloc_futex);
+                                _futex_up(&malloc_futex);
                                 return (void *) head;
                         }
@@ -1004 +994 @@
                         if ((foot->magic != HEAP_BLOCK_FOOT_MAGIC) ||
                             (head->size != foot->size)) {
-                                futex_up(&malloc_futex);
+                                _futex_up(&malloc_futex);
                                 return (void *) foot;
                         }
@@ -1010 +1000 @@
         }
         
-        futex_up(&malloc_futex);
+        _futex_up(&malloc_futex);
         
         return NULL;