update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
1 changed files with 2 additions and 1 deletions
Showing only changes of commit 49d941ad65 - Show all commits

View File

@ -123,7 +123,7 @@ void* malloc(size_t size)
// find the first pool with size atleast size // find the first pool with size atleast size
size_t first_usable_pool = 0; size_t first_usable_pool = 0;
while (s_malloc_pools[first_usable_pool].size < size) while (s_malloc_pools[first_usable_pool].size - sizeof(malloc_node_t) < size)
first_usable_pool++; first_usable_pool++;
// first_usable_pool = ceil(log(size/s_malloc_smallest_pool, s_malloc_pool_size_mult)) // first_usable_pool = ceil(log(size/s_malloc_smallest_pool, s_malloc_pool_size_mult))
@ -140,6 +140,7 @@ void* malloc(size_t size)
continue; continue;
if (!allocate_pool(i)) if (!allocate_pool(i))
break; break;
// NOTE: always works since we just created the pool
return allocate_from_pool(i, size); return allocate_from_pool(i, size);
} }