axmap: random maps are private, don't get them from smalloc

[fio.git] / lib / axmap.c

diff --git a/lib/axmap.c b/lib/axmap.c
index 8247fc1ae5d75f8aa452f2018bf248a6cc3a36a7..164300f254014b10ed6e04e3e06b7263aa917aac 100644 (file)
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -22,8 +22,6 @@
 
 #include "../arch/arch.h"
 #include "axmap.h"
-#include "../smalloc.h"
-#include "../mutex.h"
 #include "../minmax.h"
 
 #if BITS_PER_LONG == 64
@@ -46,7 +44,6 @@ struct axmap_level {
 };
 
 struct axmap {
-       struct fio_mutex lock;
        unsigned int nr_levels;
        struct axmap_level *levels;
        uint64_t first_free;
@@ -65,8 +62,6 @@ void axmap_reset(struct axmap *axmap)
 {
        int i;
 
-       fio_mutex_down(&axmap->lock);
-
        for (i = 0; i < axmap->nr_levels; i++) {
                struct axmap_level *al = &axmap->levels[i];
 
@@ -74,7 +69,6 @@ void axmap_reset(struct axmap *axmap)
        }
 
        axmap->first_free = 0;
-       fio_mutex_up(&axmap->lock);
 }
 
 void axmap_free(struct axmap *axmap)
@@ -85,11 +79,10 @@ void axmap_free(struct axmap *axmap)
                return;
 
        for (i = 0; i < axmap->nr_levels; i++)
-               sfree(axmap->levels[i].map);
+               free(axmap->levels[i].map);
 
-       sfree(axmap->levels);
-       __fio_mutex_remove(&axmap->lock);
-       sfree(axmap);
+       free(axmap->levels);
+       free(axmap);
 }
 
 struct axmap *axmap_new(unsigned long nr_bits)
@@ -97,12 +90,10 @@ struct axmap *axmap_new(unsigned long nr_bits)
        struct axmap *axmap;
        unsigned int i, levels;
 
-       axmap = smalloc(sizeof(*axmap));
+       axmap = malloc(sizeof(*axmap));
        if (!axmap)
                return NULL;
 
-       __fio_mutex_init(&axmap->lock, FIO_MUTEX_UNLOCKED);
-
        levels = 1;
        i = (nr_bits + BLOCKS_PER_UNIT - 1) >> UNIT_SHIFT;
        while (i > 1) {
@@ -111,7 +102,7 @@ struct axmap *axmap_new(unsigned long nr_bits)
        }
 
        axmap->nr_levels = levels;
-       axmap->levels = smalloc(axmap->nr_levels * sizeof(struct axmap_level));
+       axmap->levels = malloc(axmap->nr_levels * sizeof(struct axmap_level));
        axmap->nr_bits = nr_bits;
 
        for (i = 0; i < axmap->nr_levels; i++) {
@@ -119,7 +110,7 @@ struct axmap *axmap_new(unsigned long nr_bits)
 
                al->level = i;
                al->map_size = (nr_bits + BLOCKS_PER_UNIT - 1) >> UNIT_SHIFT;
-               al->map = smalloc(al->map_size * sizeof(unsigned long));
+               al->map = malloc(al->map_size * sizeof(unsigned long));
                if (!al->map)
                        goto err;
 
@@ -131,11 +122,9 @@ struct axmap *axmap_new(unsigned long nr_bits)
 err:
        for (i = 0; i < axmap->nr_levels; i++)
                if (axmap->levels[i].map)
-                       sfree(axmap->levels[i].map);
+                       free(axmap->levels[i].map);
 
-       sfree(axmap->levels);
-       __fio_mutex_remove(&axmap->lock);
-       sfree(axmap);
+       free(axmap->levels);
        return NULL;
 }
 
@@ -297,9 +286,7 @@ void axmap_set(struct axmap *axmap, uint64_t bit_nr)
 {
        struct axmap_set_data data = { .nr_bits = 1, };
 
-       fio_mutex_down(&axmap->lock);
        __axmap_set(axmap, bit_nr, &data);
-       fio_mutex_up(&axmap->lock);
 }
 
 unsigned int axmap_set_nr(struct axmap *axmap, uint64_t bit_nr, unsigned int nr_bits)
@@ -335,14 +322,8 @@ static int axmap_isset_fn(struct axmap_level *al, unsigned long offset,
 
 int axmap_isset(struct axmap *axmap, uint64_t bit_nr)
 {
-       if (bit_nr <= axmap->nr_bits) {
-               int ret;
-
-               fio_mutex_down(&axmap->lock);
-               ret = axmap_handler_topdown(axmap, bit_nr, axmap_isset_fn, NULL);
-               fio_mutex_up(&axmap->lock);
-               return ret;
-       }
+       if (bit_nr <= axmap->nr_bits)
+               return axmap_handler_topdown(axmap, bit_nr, axmap_isset_fn, NULL);
 
        return 0;
 }
@@ -389,15 +370,11 @@ static uint64_t axmap_find_first_free(struct axmap *axmap, unsigned int level,
 
 static uint64_t axmap_first_free(struct axmap *axmap)
 {
-       uint64_t ret;
-
        if (firstfree_valid(axmap))
                return axmap->first_free;
 
-       ret = axmap_find_first_free(axmap, axmap->nr_levels - 1, 0);
-       axmap->first_free = ret;
-
-       return ret;
+       axmap->first_free = axmap_find_first_free(axmap, axmap->nr_levels - 1, 0);
+       return axmap->first_free;
 }
 
 struct axmap_next_free_data {
@@ -433,17 +410,11 @@ uint64_t axmap_next_free(struct axmap *axmap, uint64_t bit_nr)
        struct axmap_next_free_data data = { .level = -1U, .bit = bit_nr, };
        uint64_t ret;
 
-       fio_mutex_down(&axmap->lock);
-
-       if (firstfree_valid(axmap) && bit_nr < axmap->first_free) {
-               ret = axmap->first_free;
-               goto done;
-       }
+       if (firstfree_valid(axmap) && bit_nr < axmap->first_free)
+               return axmap->first_free;
 
-       if (!axmap_handler(axmap, bit_nr, axmap_next_free_fn, &data)) {
-               ret = axmap_first_free(axmap);
-               goto done;
-       }
+       if (!axmap_handler(axmap, bit_nr, axmap_next_free_fn, &data))
+               return axmap_first_free(axmap);
 
        assert(data.level != -1U);
 
@@ -453,12 +424,8 @@ uint64_t axmap_next_free(struct axmap *axmap, uint64_t bit_nr)
         * find the first free one, the map is practically full.
         */
        ret = axmap_find_first_free(axmap, data.level, data.offset);
-       if (ret != -1ULL) {
-done:
-               fio_mutex_up(&axmap->lock);
+       if (ret != -1ULL)
                return ret;
-       }
 
-       ret = axmap_first_free(axmap);
-       goto done;
+       return axmap_first_free(axmap);
 }