Merge branch 'dev' of https://github.com/smartxworks/fio

[fio.git] / smalloc.c

diff --git a/smalloc.c b/smalloc.c
index b6b367ae9a6b5be292f0db870c393b90d18137ab..a2ad25a0a0d03bf5010c743325ed17e594e0fb83 100644 (file)
--- a/smalloc.c
+++ b/smalloc.c
@@ -3,18 +3,11 @@
  * that can be shared across processes and threads
  */
 #include <sys/mman.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <fcntl.h>
-
-#include "mutex.h"
-#include "arch/arch.h"
+
+#include "fio.h"
+#include "fio_sem.h"
 #include "os/os.h"
 #include "smalloc.h"
 #include "log.h"
@@ -26,7 +19,9 @@
 #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
@@ -37,7 +32,7 @@ static const int int_mask = sizeof(int) - 1;
 #endif
 
 struct pool {
-       struct fio_mutex *lock;                 /* protects this pool */
+       struct fio_sem *lock;                   /* protects this pool */
        void *map;                              /* map of blocks */
        unsigned int *bitmap;                   /* blocks free/busy map */
        size_t free_blocks;             /* free blocks */
@@ -149,12 +144,15 @@ static int find_next_zero(int word, int start)
        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
@@ -183,29 +181,30 @@ static int add_pool(struct pool *pool, unsigned int alloc_size)
                goto out_fail;
 
        pool->map = ptr;
-       pool->bitmap = (void *) ptr + (pool->nr_blocks * SMALLOC_BPL);
+       pool->bitmap = (unsigned int *)((char *) ptr + (pool->nr_blocks * SMALLOC_BPL));
        memset(pool->bitmap, 0, bitmap_blocks * sizeof(unsigned int));
 
-       pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
+       pool->lock = fio_sem_init(FIO_SEM_UNLOCKED);
        if (!pool->lock)
                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;
+       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;
        }
 
@@ -225,7 +224,7 @@ static void cleanup_pool(struct pool *pool)
        munmap(pool->map, pool->mmap_size);
 
        if (pool->lock)
-               fio_mutex_remove(pool->lock);
+               fio_sem_remove(pool->lock);
 }
 
 void scleanup(void)
@@ -242,7 +241,7 @@ static void *postred_ptr(struct block_hdr *hdr)
        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;
 }
@@ -302,12 +301,12 @@ static void sfree_pool(struct pool *pool, void *ptr)
        i = offset / SMALLOC_BPL;
        idx = (offset % SMALLOC_BPL) / SMALLOC_BPB;
 
-       fio_mutex_down(pool->lock);
+       fio_sem_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);
-       fio_mutex_up(pool->lock);
+       fio_sem_up(pool->lock);
 }
 
 void sfree(void *ptr)
@@ -341,7 +340,7 @@ static void *__smalloc_pool(struct pool *pool, size_t size)
        unsigned int last_idx;
        void *ret = NULL;
 
-       fio_mutex_down(pool->lock);
+       fio_sem_down(pool->lock);
 
        nr_blocks = size_to_blocks(size);
        if (nr_blocks > pool->free_blocks)
@@ -384,7 +383,7 @@ static void *__smalloc_pool(struct pool *pool, size_t size)
                ret = pool->map + offset;
        }
 fail:
-       fio_mutex_up(pool->lock);
+       fio_sem_up(pool->lock);
        return ret;
 }
 
@@ -444,6 +443,8 @@ void *smalloc(size_t size)
                break;
        } while (1);
 
+       log_err("smalloc: OOM. Consider using --alloc-size to increase the "
+               "shared memory available.\n");
        return NULL;
 }