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 eeb32d42a6085e096bdde44fc39f057d9853b8da..164300f254014b10ed6e04e3e06b7263aa917aac 100644 (file)
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -5,7 +5,7 @@
  * nothing to do with anything remotely narcissistic.
  *
  * A set bit at layer N indicates a full word at layer N-1, and so forth. As
- * the bitmap becomes progressively more full, checking for existance
+ * the bitmap becomes progressively more full, checking for existence
  * becomes cheaper (since fewer layers are walked, making it a lot more
  * cache friendly) and locating the next free space likewise.
  *
@@ -22,7 +22,6 @@
 
 #include "../arch/arch.h"
 #include "axmap.h"
-#include "../smalloc.h"
 #include "../minmax.h"
 
 #if BITS_PER_LONG == 64
@@ -33,7 +32,7 @@
 #error "Number of arch bits unknown"
 #endif
 
-#define BLOCKS_PER_UNIT                (1UL << UNIT_SHIFT)
+#define BLOCKS_PER_UNIT                (1U << UNIT_SHIFT)
 #define BLOCKS_PER_UNIT_MASK   (BLOCKS_PER_UNIT - 1)
 
 #define firstfree_valid(b)     ((b)->first_free != (uint64_t) -1)
@@ -80,10 +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);
-       sfree(axmap);
+       free(axmap->levels);
+       free(axmap);
 }
 
 struct axmap *axmap_new(unsigned long nr_bits)
@@ -91,7 +90,7 @@ 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;
 
@@ -103,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++) {
@@ -111,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;
 
@@ -123,9 +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);
+       free(axmap->levels);
        return NULL;
 }
 
@@ -189,7 +188,6 @@ void axmap_clear(struct axmap *axmap, uint64_t bit_nr)
 struct axmap_set_data {
        unsigned int nr_bits;
        unsigned int set_bits;
-       unsigned int fail_ok;
 };
 
 static unsigned long bit_masks[] = {
@@ -229,10 +227,8 @@ static int axmap_set_fn(struct axmap_level *al, unsigned long offset,
         * Mask off any potential overlap, only sets contig regions
         */
        overlap = al->map[offset] & mask;
-       if (overlap == mask) {
-               assert(data->fail_ok);
+       if (overlap == mask)
                return 1;
-       }
 
        while (overlap) {
                unsigned long clear_mask = ~(1UL << ffz(~overlap));
@@ -273,14 +269,14 @@ static void __axmap_set(struct axmap *axmap, uint64_t bit_nr,
                axmap_handler(axmap, bit_nr, axmap_set_fn, data);
                set_bits += data->set_bits;
 
-               if (data->set_bits != (BLOCKS_PER_UNIT - nr_bits))
+               if (!data->set_bits ||
+                   data->set_bits != (BLOCKS_PER_UNIT - nr_bits))
                        break;
 
                nr_bits -= data->set_bits;
                bit_nr += data->set_bits;
 
                data->nr_bits = nr_bits;
-               data->fail_ok = 1;
        }
 
        data->set_bits = set_bits;
@@ -295,10 +291,27 @@ void axmap_set(struct axmap *axmap, uint64_t bit_nr)
 
 unsigned int axmap_set_nr(struct axmap *axmap, uint64_t bit_nr, unsigned int nr_bits)
 {
-       struct axmap_set_data data = { .nr_bits = nr_bits, };
+       unsigned int set_bits = 0;
 
-       __axmap_set(axmap, bit_nr, &data);
-       return data.set_bits;
+       do {
+               struct axmap_set_data data = { .nr_bits = nr_bits, };
+               unsigned int max_bits, this_set;
+
+               max_bits = BLOCKS_PER_UNIT - (bit_nr & BLOCKS_PER_UNIT_MASK);
+               if (max_bits < nr_bits)
+                       data.nr_bits = max_bits;
+
+               this_set = data.nr_bits;
+               __axmap_set(axmap, bit_nr, &data);
+               set_bits += data.set_bits;
+               if (data.set_bits != this_set)
+                       break;
+
+               nr_bits -= data.set_bits;
+               bit_nr += data.set_bits;
+       } while (nr_bits);
+
+       return set_bits;
 }
 
 static int axmap_isset_fn(struct axmap_level *al, unsigned long offset,
@@ -355,7 +368,7 @@ static uint64_t axmap_find_first_free(struct axmap *axmap, unsigned int level,
        return (uint64_t) -1ULL;
 }
 
-uint64_t axmap_first_free(struct axmap *axmap)
+static uint64_t axmap_first_free(struct axmap *axmap)
 {
        if (firstfree_valid(axmap))
                return axmap->first_free;