pre_read fixes

[fio.git] / smalloc.c

diff --git a/smalloc.c b/smalloc.c
index 0a86c43b0f17d58a5aa69587f92eff1d4f39c279..e82ef1da0b59faab23a706db1257808c3fb10bbb 100644 (file)
--- a/smalloc.c
+++ b/smalloc.c
@@ -14,7 +14,6 @@
 #include "mutex.h"
 #include "arch/arch.h"
 
-#define MP_SAFE                        /* define to make thread safe */
 #define SMALLOC_REDZONE                /* define to detect memory corruption */
 
 #define SMALLOC_BPB    32      /* block size, bytes-per-bit in bitmap */
@@ -22,7 +21,7 @@
 #define SMALLOC_BPL    (SMALLOC_BPB * SMALLOC_BPI)
 
 #define INITIAL_SIZE   1024*1024       /* new pool size */
-#define MAX_POOLS      4               /* maximum number of pools to setup */
+#define MAX_POOLS      128             /* maximum number of pools to setup */
 
 #define SMALLOC_PRE_RED                0xdeadbeefU
 #define SMALLOC_POST_RED       0x5aa55aa5U
@@ -37,7 +36,6 @@ struct pool {
        unsigned int nr_blocks;                 /* total blocks */
        unsigned int next_non_full;
        int fd;                                 /* memory backing fd */
-       char file[PATH_MAX];                    /* filename for fd */
        unsigned int mmap_size;
 };
 
@@ -55,38 +53,32 @@ static struct fio_mutex *lock;
 
 static inline void pool_lock(struct pool *pool)
 {
-       if (pool->lock)
-               fio_mutex_down(pool->lock);
+       fio_mutex_down(pool->lock);
 }
 
 static inline void pool_unlock(struct pool *pool)
 {
-       if (pool->lock)
-               fio_mutex_up(pool->lock);
+       fio_mutex_up(pool->lock);
 }
 
 static inline void global_read_lock(void)
 {
-       if (lock)
-               fio_mutex_down_read(lock);
+       fio_mutex_down_read(lock);
 }
 
 static inline void global_read_unlock(void)
 {
-       if (lock)
-               fio_mutex_up_read(lock);
+       fio_mutex_up_read(lock);
 }
 
 static inline void global_write_lock(void)
 {
-       if (lock)
-               fio_mutex_down_write(lock);
+       fio_mutex_down_write(lock);
 }
 
 static inline void global_write_unlock(void)
 {
-       if (lock)
-               fio_mutex_up_write(lock);
+       fio_mutex_up_write(lock);
 }
 
 static inline int ptr_valid(struct pool *pool, void *ptr)
@@ -183,11 +175,11 @@ static int find_next_zero(int word, int start)
 
 static int add_pool(struct pool *pool, unsigned int alloc_size)
 {
-       void *ptr;
        int fd, bitmap_blocks;
+       char file[] = "/tmp/.fio_smalloc.XXXXXX";
+       void *ptr;
 
-       strcpy(pool->file, "/tmp/.fio_smalloc.XXXXXX");
-       fd = mkstemp(pool->file);
+       fd = mkstemp(file);
        if (fd < 0)
                goto out_close;
 
@@ -218,26 +210,27 @@ static int add_pool(struct pool *pool, unsigned int alloc_size)
        pool->map = ptr;
        pool->bitmap = (void *) ptr + (pool->nr_blocks * SMALLOC_BPL);
 
-#ifdef MP_SAFE
        pool->lock = fio_mutex_init(1);
        if (!pool->lock)
                goto out_unlink;
-#endif
 
+       /*
+        * Unlink pool file now. It wont get deleted until the fd is closed,
+        * which happens both for cleanup or unexpected quit. This way we
+        * don't leave temp files around in case of a crash.
+        */
+       unlink(file);
        pool->fd = fd;
 
-       global_write_lock();
        nr_pools++;
-       global_write_unlock();
        return 0;
 out_unlink:
        fprintf(stderr, "smalloc: failed adding pool\n");
        if (pool->map)
                munmap(pool->map, pool->mmap_size);
-       unlink(pool->file);
+       unlink(file);
 out_close:
-       if (fd >= 0)
-               close(fd);
+       close(fd);
        return 1;
 }
 
@@ -245,16 +238,17 @@ void sinit(void)
 {
        int ret;
 
-#ifdef MP_SAFE
        lock = fio_mutex_rw_init();
-#endif
        ret = add_pool(&mp[0], INITIAL_SIZE);
        assert(!ret);
 }
 
 static void cleanup_pool(struct pool *pool)
 {
-       unlink(pool->file);
+       /*
+        * This will also remove the temporary file we used as a backing
+        * store, it was already unlinked
+        */
        close(pool->fd);
        munmap(pool->map, pool->mmap_size);
 
@@ -442,7 +436,7 @@ void *smalloc(unsigned int size)
 {
        unsigned int i;
 
-       global_read_lock();
+       global_write_lock();
        i = last_pool;
 
        do {
@@ -451,7 +445,7 @@ void *smalloc(unsigned int size)
 
                        if (ptr) {
                                last_pool = i;
-                               global_read_unlock();
+                               global_write_unlock();
                                return ptr;
                        }
                }
@@ -464,15 +458,13 @@ void *smalloc(unsigned int size)
                        break;
                else {
                        i = nr_pools;
-                       global_read_unlock();
                        if (add_pool(&mp[nr_pools], size))
                                goto out;
-                       global_read_lock();
                }
        } while (1);
 
-       global_read_unlock();
 out:
+       global_write_unlock();
        return NULL;
 }