129,7 → 129,7 |
static slab_cache_t *slab_extern_cache; |
/** Caches for malloc */ |
static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1]; |
char *malloc_names[] = { |
static char *malloc_names[] = { |
"malloc-16", |
"malloc-32", |
"malloc-64", |
144,7 → 144,11 |
"malloc-32K", |
"malloc-64K", |
"malloc-128K", |
"malloc-256K" |
"malloc-256K", |
"malloc-512K", |
"malloc-1M", |
"malloc-2M", |
"malloc-4M" |
}; |
|
/** Slab descriptor */ |
173,7 → 177,7 |
slab_t *slab; |
size_t fsize; |
unsigned int i; |
unsigned int zone = 0; |
count_t zone = 0; |
|
data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone); |
if (!data) { |
932,7 → 936,7 |
void *malloc(unsigned int size, int flags) |
{ |
ASSERT(_slab_initialized); |
ASSERT(size && size <= (1 << SLAB_MAX_MALLOC_W)); |
ASSERT(size <= (1 << SLAB_MAX_MALLOC_W)); |
|
if (size < (1 << SLAB_MIN_MALLOC_W)) |
size = (1 << SLAB_MIN_MALLOC_W); |