Default print pretty up

[fio.git] / smalloc.c

diff --git a/smalloc.c b/smalloc.c
index fc6ac526c33d95cac6c88f2bfe371f724f0d426c..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 */
@@ -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,19 +210,17 @@ 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;
-       unlink(pool->file);
 
        nr_pools++;
        return 0;
@@ -238,10 +228,9 @@ 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;
 }
 
@@ -249,9 +238,7 @@ void sinit(void)
 {
        int ret;
 
-#ifdef MP_SAFE
        lock = fio_mutex_rw_init();
-#endif
        ret = add_pool(&mp[0], INITIAL_SIZE);
        assert(!ret);
 }