Ticket #1920: heap_large_alloc.diff

src/system/kernel/heap.cpp

@@ -59 +59 @@
 } heap_page;
 
 // used for bin == bin_count allocations
-#define allocation_id free_count
+#define allocation_id empty_index
 
 typedef struct heap_bin_s {
     uint32      element_size;
@@ -71 +71 @@
     addr_t      base;
     size_t      size;
     mutex       lock;
-    vint32      large_alloc_id;
 
     uint32      bin_count;
     uint32      page_count;
@@ -536 +535 @@
 }
 
 
-static inline uint32
-heap_next_alloc_id(heap_allocator *heap)
-{
-    return atomic_add(&heap->large_alloc_id, 1) & ((1 << 9) - 1);
-}
-
-
 static inline void
 heap_link_page(heap_page *page, heap_page **list)
 {
@@ -672 +664 @@
         return NULL;
     }
 
-    uint32 allocationID = heap_next_alloc_id(heap);
     uint32 pageCount = (size + B_PAGE_SIZE - 1) / B_PAGE_SIZE;
     for (uint32 i = first; i < first + pageCount; i++) {
         heap_page *page = &heap->page_table[i];
@@ -683 +674 @@
 
         page->next = page->prev = NULL;
         page->free_list = NULL;
-        page->allocation_id = allocationID;
+        page->allocation_id = (uint16)first;
     }
 
 #if KERNEL_HEAP_LEAK_CHECK