#include <limits.h>
#include <fcntl.h>
+#include "fio.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
#define INITIAL_SIZE 16*1024*1024 /* new pool size */
-#define MAX_POOLS 8 /* maximum number of pools to setup */
+#define INITIAL_POOLS 8 /* maximum number of pools to setup */
+
+#define MAX_POOLS 16
#define SMALLOC_PRE_RED 0xdeadbeefU
#define SMALLOC_POST_RED 0x5aa55aa5U
static struct pool mp[MAX_POOLS];
static unsigned int nr_pools;
static unsigned int last_pool;
-static struct fio_rwlock *lock;
-
-static inline void pool_lock(struct pool *pool)
-{
- fio_mutex_down(pool->lock);
-}
-
-static inline void pool_unlock(struct pool *pool)
-{
- fio_mutex_up(pool->lock);
-}
-
-static inline void global_read_lock(void)
-{
- fio_rwlock_read(lock);
-}
-
-static inline void global_read_unlock(void)
-{
- fio_rwlock_unlock(lock);
-}
-
-static inline void global_write_lock(void)
-{
- fio_rwlock_write(lock);
-}
-
-static inline void global_write_unlock(void)
-{
- fio_rwlock_unlock(lock);
-}
static inline int ptr_valid(struct pool *pool, void *ptr)
{
return ffz(word) + start;
}
-static int add_pool(struct pool *pool, unsigned int alloc_size)
+static bool add_pool(struct pool *pool, unsigned int alloc_size)
{
int bitmap_blocks;
int mmap_flags;
void *ptr;
+ if (nr_pools == MAX_POOLS)
+ return false;
+
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
#endif
goto out_fail;
nr_pools++;
- return 0;
+ return true;
out_fail:
log_err("smalloc: failed adding pool\n");
if (pool->map)
munmap(pool->map, pool->mmap_size);
- return 1;
+ return false;
}
void sinit(void)
{
- int i, ret;
-
- lock = fio_rwlock_init();
+ bool ret;
+ int i;
- for (i = 0; i < MAX_POOLS; i++) {
- ret = add_pool(&mp[i], INITIAL_SIZE);
- if (ret)
+ for (i = 0; i < INITIAL_POOLS; i++) {
+ ret = add_pool(&mp[nr_pools], smalloc_pool_size);
+ if (!ret)
break;
}
for (i = 0; i < nr_pools; i++)
cleanup_pool(&mp[i]);
-
- if (lock)
- fio_rwlock_remove(lock);
}
#ifdef SMALLOC_REDZONE
uintptr_t ptr;
ptr = (uintptr_t) hdr + hdr->size - sizeof(unsigned int);
- ptr = (ptr + int_mask) & ~int_mask;
+ ptr = (uintptr_t) PTR_ALIGN(ptr, int_mask);
return (void *) ptr;
}
i = offset / SMALLOC_BPL;
idx = (offset % SMALLOC_BPL) / SMALLOC_BPB;
- pool_lock(pool);
+ fio_mutex_down(pool->lock);
clear_blocks(pool, i, idx, size_to_blocks(hdr->size));
if (i < pool->next_non_full)
pool->next_non_full = i;
pool->free_blocks += size_to_blocks(hdr->size);
- pool_unlock(pool);
+ fio_mutex_up(pool->lock);
}
void sfree(void *ptr)
if (!ptr)
return;
- global_read_lock();
-
for (i = 0; i < nr_pools; i++) {
if (ptr_valid(&mp[i], ptr)) {
pool = &mp[i];
}
}
- global_read_unlock();
-
if (pool) {
sfree_pool(pool, ptr);
return;
unsigned int last_idx;
void *ret = NULL;
- pool_lock(pool);
+ fio_mutex_down(pool->lock);
nr_blocks = size_to_blocks(size);
if (nr_blocks > pool->free_blocks)
ret = pool->map + offset;
}
fail:
- pool_unlock(pool);
+ fio_mutex_up(pool->lock);
return ret;
}
if (size != (unsigned int) size)
return NULL;
- global_write_lock();
i = last_pool;
end_pool = nr_pools;
if (ptr) {
last_pool = i;
- global_write_unlock();
return ptr;
}
}
break;
} while (1);
- global_write_unlock();
+ log_err("smalloc: OOM. Consider using --alloc-size to increase the "
+ "shared memory available.\n");
return NULL;
}