Changes in uspace/lib/c/generic/malloc.c [13f2461:3019612] in mainline

File:

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

uspace/lib/c/generic/malloc.c

@@ -79 +79 @@
         (sizeof(heap_block_head_t) + sizeof(heap_block_foot_t))
 
+/** Overhead of each area. */
+#define AREA_OVERHEAD(size) \
+        (ALIGN_UP(size + sizeof(heap_area_t), BASE_ALIGN))
+
 /** Calculate real size of a heap block.
  *
@@ -183 +187 @@
 
 /** Next heap block to examine (next fit algorithm) */
-static heap_block_head_t *next = NULL;
+static heap_block_head_t *next_fit = NULL;
 
 /** Futex for thread-safe heap manipulation */
@@ -194 +198 @@
                 if (!(expr)) {\
                         futex_up(&malloc_futex); \
-                        assert_abort(#expr, __FILE__, STR2(__LINE__)); \
+                        assert_abort(#expr, __FILE__, __LINE__); \
                 } \
         } while (0)
@@ -378 +382 @@
         
         /* Eventually try to create a new area */
-        return area_create(AREA_FIRST_BLOCK_HEAD(size));
+        return area_create(AREA_OVERHEAD(size));
 }
 
@@ -455 +459 @@
                         /* Update heap area parameters */
                         area->end = end;
-                        
-                        /* Update block layout */
-                        void *last = (void *) last_head;
-                        size_t excess = (size_t) (area->end - last);
+                        size_t excess = ((size_t) area->end) - ((size_t) last_head);
                         
                         if (excess > 0) {
@@ -467 +468 @@
                                          * create a new free block.
                                          */
-                                        block_init(last, excess, true, area);
+                                        block_init((void *) last_head, excess, true, area);
                                 } else {
                                         /*
@@ -486 +487 @@
         }
         
-        next = NULL;
+        next_fit = NULL;
 }
 
@@ -575 +576 @@
                                 split_mark(cur, real_size);
                                 
-                                next = cur;
+                                next_fit = cur;
                                 return addr;
                         } else {
@@ -627 +628 @@
                                                 split_mark(next_head, real_size);
                                                 
-                                                next = next_head;
+                                                next_fit = next_head;
                                                 return aligned;
                                         } else {
@@ -653 +654 @@
                                                         split_mark(cur, real_size);
                                                         
-                                                        next = cur;
+                                                        next_fit = cur;
                                                         return aligned;
                                                 }
@@ -691 +692 @@
         
         /* Try the next fit approach */
-        split = next;
+        split = next_fit;
         
         if (split != NULL) {
@@ -847 +848 @@
                         
                         ptr = ((void *) head) + sizeof(heap_block_head_t);
-                        next = NULL;
+                        next_fit = NULL;
                 } else
                         reloc = true;
@@ -872 +873 @@
 void free(const void *addr)
 {
+        if (addr == NULL)
+                return;
+
         futex_down(&malloc_futex);