use option smalloc_pool_size

[fio.git] / smalloc.c

diff --git a/smalloc.c b/smalloc.c
index 67cb7cc11d475b81aef3d53a7eb896eee31504bb..6f647c060e087c198ce9b580cbef72ff03227847 100644 (file)
--- a/smalloc.c
+++ b/smalloc.c
@@ -26,13 +26,15 @@
 #define SMALLOC_BPL    (SMALLOC_BPB * SMALLOC_BPI)
 
 #define INITIAL_SIZE   16*1024*1024    /* new pool size */
-#define MAX_POOLS      1               /* maximum number of pools to setup */
+#define MAX_POOLS      8               /* maximum number of pools to setup */
 
 #define SMALLOC_PRE_RED                0xdeadbeefU
 #define SMALLOC_POST_RED       0x5aa55aa5U
 
 unsigned int smalloc_pool_size = INITIAL_SIZE;
+#ifdef SMALLOC_REDZONE
 static const int int_mask = sizeof(int) - 1;
+#endif
 
 struct pool {
        struct fio_mutex *lock;                 /* protects this pool */
@@ -54,37 +56,6 @@ struct block_hdr {
 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)
 {
@@ -211,9 +182,9 @@ static int add_pool(struct pool *pool, unsigned int alloc_size)
        if (ptr == MAP_FAILED)
                goto out_fail;
 
-       memset(ptr, 0, alloc_size);
        pool->map = ptr;
        pool->bitmap = (void *) ptr + (pool->nr_blocks * SMALLOC_BPL);
+       memset(pool->bitmap, 0, bitmap_blocks * sizeof(unsigned int));
 
        pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
        if (!pool->lock)
@@ -230,11 +201,19 @@ out_fail:
 
 void sinit(void)
 {
-       int ret;
+       int i, ret;
+
+       for (i = 0; i < MAX_POOLS; i++) {
+               ret = add_pool(&mp[i], smalloc_pool_size);
+               if (ret)
+                       break;
+       }
 
-       lock = fio_rwlock_init();
-       ret = add_pool(&mp[0], INITIAL_SIZE);
-       assert(!ret);
+       /*
+        * If we added at least one pool, we should be OK for most
+        * cases.
+        */
+       assert(i);
 }
 
 static void cleanup_pool(struct pool *pool)
@@ -255,9 +234,6 @@ void scleanup(void)
 
        for (i = 0; i < nr_pools; i++)
                cleanup_pool(&mp[i]);
-
-       if (lock)
-               fio_rwlock_remove(lock);
 }
 
 #ifdef SMALLOC_REDZONE
@@ -326,12 +302,12 @@ static void sfree_pool(struct pool *pool, 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)
@@ -342,8 +318,6 @@ 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];
@@ -351,10 +325,12 @@ void sfree(void *ptr)
                }
        }
 
-       global_read_unlock();
+       if (pool) {
+               sfree_pool(pool, ptr);
+               return;
+       }
 
-       assert(pool);
-       sfree_pool(pool, ptr);
+       log_err("smalloc: ptr %p not from smalloc pool\n", ptr);
 }
 
 static void *__smalloc_pool(struct pool *pool, size_t size)
@@ -365,7 +341,7 @@ static void *__smalloc_pool(struct pool *pool, size_t size)
        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)
@@ -408,7 +384,7 @@ static void *__smalloc_pool(struct pool *pool, size_t size)
                ret = pool->map + offset;
        }
 fail:
-       pool_unlock(pool);
+       fio_mutex_up(pool->lock);
        return ret;
 }
 
@@ -442,59 +418,46 @@ static void *smalloc_pool(struct pool *pool, size_t size)
 
 void *smalloc(size_t size)
 {
-       unsigned int i;
+       unsigned int i, end_pool;
 
        if (size != (unsigned int) size)
                return NULL;
 
-       global_write_lock();
        i = last_pool;
+       end_pool = nr_pools;
 
        do {
-               for (; i < nr_pools; i++) {
+               for (; i < end_pool; i++) {
                        void *ptr = smalloc_pool(&mp[i], size);
 
                        if (ptr) {
                                last_pool = i;
-                               global_write_unlock();
                                return ptr;
                        }
                }
                if (last_pool) {
-                       last_pool = 0;
+                       end_pool = last_pool;
+                       last_pool = i = 0;
                        continue;
                }
 
-               if (nr_pools + 1 > MAX_POOLS)
-                       break;
-               else {
-                       i = nr_pools;
-                       if (add_pool(&mp[nr_pools], size))
-                               goto out;
-               }
+               break;
        } while (1);
 
-out:
-       global_write_unlock();
        return NULL;
 }
 
 void *scalloc(size_t nmemb, size_t size)
 {
-       void *ret;
-
-       ret = smalloc(nmemb * size);
-       if (ret)
-               memset(ret, 0, nmemb * size);
-
-       return ret;
+       return smalloc(nmemb * size);
 }
 
 char *smalloc_strdup(const char *str)
 {
-       char *ptr;
+       char *ptr = NULL;
 
        ptr = smalloc(strlen(str) + 1);
-       strcpy(ptr, str);
+       if (ptr)
+               strcpy(ptr, str);
        return ptr;
 }