*/
static const bool enable_smalloc_debug = false;
-static struct pool mp[MAX_POOLS];
+static struct pool *mp;
static unsigned int nr_pools;
static unsigned int last_pool;
pool->mmap_size = alloc_size;
pool->nr_blocks = bitmap_blocks;
- pool->free_blocks = bitmap_blocks * SMALLOC_BPB;
+ pool->free_blocks = bitmap_blocks * SMALLOC_BPI;
mmap_flags = OS_MAP_ANON;
#ifdef CONFIG_ESX
bool ret;
int i;
+ /*
+ * sinit() can be called more than once if alloc-size is
+ * set. But we want to allocate space for the struct pool
+ * instances only once.
+ */
+ if (!mp) {
+ mp = (struct pool *) mmap(NULL,
+ MAX_POOLS * sizeof(struct pool),
+ PROT_READ | PROT_WRITE,
+ OS_MAP_ANON | MAP_SHARED, -1, 0);
+
+ assert(mp != MAP_FAILED);
+ }
+
for (i = 0; i < INITIAL_POOLS; i++) {
ret = add_pool(&mp[nr_pools], smalloc_pool_size);
if (!ret)
for (i = 0; i < nr_pools; i++)
cleanup_pool(&mp[i]);
+
+ munmap(mp, MAX_POOLS * sizeof(struct pool));
}
#ifdef SMALLOC_REDZONE
if (hdr->prered != SMALLOC_PRE_RED) {
log_err("smalloc pre redzone destroyed!\n"
" ptr=%p, prered=%x, expected %x\n",
- hdr, hdr->prered, SMALLOC_PRE_RED);
+ hdr+1, hdr->prered, SMALLOC_PRE_RED);
assert(0);
}
if (*postred != SMALLOC_POST_RED) {
log_err("smalloc post redzone destroyed!\n"
" ptr=%p, postred=%x, expected %x\n",
- hdr, *postred, SMALLOC_POST_RED);
+ hdr+1, *postred, SMALLOC_POST_RED);
assert(0);
}
}
log_err("smalloc: ptr %p not from smalloc pool\n", ptr);
}
-static unsigned int firstfree(struct pool *pool)
+static unsigned int find_best_index(struct pool *pool)
{
- unsigned int i;
+ unsigned int i;
+
+ assert(pool->free_blocks);
- for (i = 0; i < pool->nr_blocks; i++)
- if (pool->bitmap[i] != -1U)
- return i;
+ for (i = pool->next_non_full; pool->bitmap[i] == -1U; i++) {
+ if (i == pool->nr_blocks - 1) {
+ unsigned int j;
+
+ for (j = 0; j < pool->nr_blocks; j++)
+ if (pool->bitmap[j] != -1U)
+ return j;
+ }
+ }
- assert(0);
+ return i;
}
static void *__smalloc_pool(struct pool *pool, size_t size)
if (nr_blocks > pool->free_blocks)
goto fail;
- for (i = pool->next_non_full; pool->bitmap[i] == -1U; i++)
- if (i == pool->nr_blocks - 1) {
- i = firstfree(pool);
- break;
- }
-
- pool->next_non_full = i;
+ pool->next_non_full = find_best_index(pool);
last_idx = 0;
offset = -1U;
+ i = pool->next_non_full;
while (i < pool->nr_blocks) {
unsigned int idx;