Changeset 8b5690f in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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.

Message:

Merge mainline changes.

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. */
@@ -215 +216 @@
 /** Initialize the heap allocator
  *
- * 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);
+ * 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);
 }