Changes in uspace/lib/c/generic/malloc.c [47b7006:3292623] in mainline

File:

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

uspace/lib/c/generic/malloc.c

@@ -45 +45 @@
 #include <futex.h>
 #include <adt/gcdlcm.h>
-#include "private/malloc.h"
 
 /* Magic used in heap headers. */
@@ -216 +215 @@
 /** Initialize the heap allocator
  *
- * Create initial heap memory area. This routine is
- * only called from libc initialization, thus we do not
- * take any locks.
- *
- */
-void __malloc_init(void)
-{
-        if (!as_area_create((void *) &_heap, PAGE_SIZE,
-            AS_AREA_WRITE | AS_AREA_READ))
-                abort();
-        
-        heap_pages = 1;
-        heap_start = (void *) ALIGN_UP((uintptr_t) &_heap, BASE_ALIGN);
-        heap_end =
-            (void *) ALIGN_DOWN(((uintptr_t) &_heap) + PAGE_SIZE, BASE_ALIGN);
-        
-        /* Make the entire area one large block. */
-        block_init(heap_start, heap_end - heap_start, true);
+ * Find how much physical memory we have and create
+ * the heap management structures that mark the whole
+ * physical memory as a single free block.
+ *
+ */
+void __heap_init(void)
+{
+        futex_down(&malloc_futex);
+        
+        if (as_area_create((void *) &_heap, PAGE_SIZE,
+            AS_AREA_WRITE | AS_AREA_READ)) {
+                heap_pages = 1;
+                heap_start = (void *) ALIGN_UP((uintptr_t) &_heap, BASE_ALIGN);
+                heap_end =
+                    (void *) ALIGN_DOWN(((uintptr_t) &_heap) + PAGE_SIZE, BASE_ALIGN);
+                
+                /* Make the entire area one large block. */
+                block_init(heap_start, heap_end - heap_start, true);
+        }
+        
+        futex_up(&malloc_futex);
 }