#include "../arch/arch.h"
#include "axmap.h"
-#include "../smalloc.h"
-#include "../mutex.h"
#include "../minmax.h"
#if BITS_PER_LONG == 64
#define firstfree_valid(b) ((b)->first_free != (uint64_t) -1)
+static const unsigned long bit_masks[] = {
+ 0x0000000000000000, 0x0000000000000001, 0x0000000000000003, 0x0000000000000007,
+ 0x000000000000000f, 0x000000000000001f, 0x000000000000003f, 0x000000000000007f,
+ 0x00000000000000ff, 0x00000000000001ff, 0x00000000000003ff, 0x00000000000007ff,
+ 0x0000000000000fff, 0x0000000000001fff, 0x0000000000003fff, 0x0000000000007fff,
+ 0x000000000000ffff, 0x000000000001ffff, 0x000000000003ffff, 0x000000000007ffff,
+ 0x00000000000fffff, 0x00000000001fffff, 0x00000000003fffff, 0x00000000007fffff,
+ 0x0000000000ffffff, 0x0000000001ffffff, 0x0000000003ffffff, 0x0000000007ffffff,
+ 0x000000000fffffff, 0x000000001fffffff, 0x000000003fffffff, 0x000000007fffffff,
+ 0x00000000ffffffff,
+#if BITS_PER_LONG == 64
+ 0x00000001ffffffff, 0x00000003ffffffff, 0x00000007ffffffff, 0x0000000fffffffff,
+ 0x0000001fffffffff, 0x0000003fffffffff, 0x0000007fffffffff, 0x000000ffffffffff,
+ 0x000001ffffffffff, 0x000003ffffffffff, 0x000007ffffffffff, 0x00000fffffffffff,
+ 0x00001fffffffffff, 0x00003fffffffffff, 0x00007fffffffffff, 0x0000ffffffffffff,
+ 0x0001ffffffffffff, 0x0003ffffffffffff, 0x0007ffffffffffff, 0x000fffffffffffff,
+ 0x001fffffffffffff, 0x003fffffffffffff, 0x007fffffffffffff, 0x00ffffffffffffff,
+ 0x01ffffffffffffff, 0x03ffffffffffffff, 0x07ffffffffffffff, 0x0fffffffffffffff,
+ 0x1fffffffffffffff, 0x3fffffffffffffff, 0x7fffffffffffffff, 0xffffffffffffffff
+#endif
+};
+
struct axmap_level {
int level;
unsigned long map_size;
};
struct axmap {
- struct fio_mutex lock;
unsigned int nr_levels;
struct axmap_level *levels;
uint64_t first_free;
uint64_t nr_bits;
};
-static unsigned long ulog64(unsigned long val, unsigned int log)
+static inline unsigned long ulog64(unsigned long val, unsigned int log)
{
while (log-- && val)
val >>= UNIT_SHIFT;
{
int i;
- fio_mutex_down(&axmap->lock);
-
for (i = 0; i < axmap->nr_levels; i++) {
struct axmap_level *al = &axmap->levels[i];
}
axmap->first_free = 0;
- fio_mutex_up(&axmap->lock);
}
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)
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) {
}
axmap->nr_levels = levels;
- axmap->levels = smalloc(axmap->nr_levels * sizeof(struct axmap_level));
+ axmap->levels = calloc(axmap->nr_levels, sizeof(struct axmap_level));
axmap->nr_bits = nr_bits;
for (i = 0; i < axmap->nr_levels; i++) {
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;
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);
+ free(axmap);
return NULL;
}
-static int axmap_handler(struct axmap *axmap, uint64_t bit_nr,
- int (*func)(struct axmap_level *, unsigned long, unsigned int,
+static bool axmap_handler(struct axmap *axmap, uint64_t bit_nr,
+ bool (*func)(struct axmap_level *, unsigned long, unsigned int,
void *), void *data)
{
struct axmap_level *al;
al = &axmap->levels[i];
if (func(al, offset, bit, data))
- return 1;
+ return true;
}
- return 0;
+ return false;
}
-static int axmap_handler_topdown(struct axmap *axmap, uint64_t bit_nr,
- int (*func)(struct axmap_level *, unsigned long, unsigned int, void *),
- void *data)
+static bool axmap_handler_topdown(struct axmap *axmap, uint64_t bit_nr,
+ bool (*func)(struct axmap_level *, unsigned long, unsigned int, void *))
{
- struct axmap_level *al;
- int i, level = axmap->nr_levels;
+ int i;
for (i = axmap->nr_levels - 1; i >= 0; i--) {
- unsigned long index = ulog64(bit_nr, --level);
+ unsigned long index = ulog64(bit_nr, i);
unsigned long offset = index >> UNIT_SHIFT;
unsigned int bit = index & BLOCKS_PER_UNIT_MASK;
- al = &axmap->levels[i];
-
- if (func(al, offset, bit, data))
- return 1;
+ if (func(&axmap->levels[i], offset, bit, NULL))
+ return true;
}
- return 0;
+ return false;
}
-static int axmap_clear_fn(struct axmap_level *al, unsigned long offset,
+static bool axmap_clear_fn(struct axmap_level *al, unsigned long offset,
unsigned int bit, void *unused)
{
if (!(al->map[offset] & (1UL << bit)))
- return 1;
+ return true;
al->map[offset] &= ~(1UL << bit);
- return 0;
+ return false;
}
void axmap_clear(struct axmap *axmap, uint64_t bit_nr)
{
axmap_handler(axmap, bit_nr, axmap_clear_fn, NULL);
+
+ if (bit_nr < axmap->first_free)
+ axmap->first_free = bit_nr;
}
struct axmap_set_data {
unsigned int set_bits;
};
-static unsigned long bit_masks[] = {
- 0x0000000000000000, 0x0000000000000001, 0x0000000000000003, 0x0000000000000007,
- 0x000000000000000f, 0x000000000000001f, 0x000000000000003f, 0x000000000000007f,
- 0x00000000000000ff, 0x00000000000001ff, 0x00000000000003ff, 0x00000000000007ff,
- 0x0000000000000fff, 0x0000000000001fff, 0x0000000000003fff, 0x0000000000007fff,
- 0x000000000000ffff, 0x000000000001ffff, 0x000000000003ffff, 0x000000000007ffff,
- 0x00000000000fffff, 0x00000000001fffff, 0x00000000003fffff, 0x00000000007fffff,
- 0x0000000000ffffff, 0x0000000001ffffff, 0x0000000003ffffff, 0x0000000007ffffff,
- 0x000000000fffffff, 0x000000001fffffff, 0x000000003fffffff, 0x000000007fffffff,
- 0x00000000ffffffff,
-#if BITS_PER_LONG == 64
- 0x00000001ffffffff, 0x00000003ffffffff, 0x00000007ffffffff, 0x0000000fffffffff,
- 0x0000001fffffffff, 0x0000003fffffffff, 0x0000007fffffffff, 0x000000ffffffffff,
- 0x000001ffffffffff, 0x000003ffffffffff, 0x000007ffffffffff, 0x00000fffffffffff,
- 0x00001fffffffffff, 0x00003fffffffffff, 0x00007fffffffffff, 0x0000ffffffffffff,
- 0x0001ffffffffffff, 0x0003ffffffffffff, 0x0007ffffffffffff, 0x000fffffffffffff,
- 0x001fffffffffffff, 0x003fffffffffffff, 0x007fffffffffffff, 0x00ffffffffffffff,
- 0x01ffffffffffffff, 0x03ffffffffffffff, 0x07ffffffffffffff, 0x0fffffffffffffff,
- 0x1fffffffffffffff, 0x3fffffffffffffff, 0x7fffffffffffffff, 0xffffffffffffffff
-#endif
-};
-
-static int axmap_set_fn(struct axmap_level *al, unsigned long offset,
+static bool axmap_set_fn(struct axmap_level *al, unsigned long offset,
unsigned int bit, void *__data)
{
struct axmap_set_data *data = __data;
*/
overlap = al->map[offset] & mask;
if (overlap == mask)
- return 1;
+ return true;
+
+ if (overlap) {
+ const int __bit = ffz(~overlap);
- while (overlap) {
- unsigned long clear_mask = ~(1UL << ffz(~overlap));
+ nr_bits = __bit - bit;
+ if (!nr_bits)
+ return true;
- mask &= clear_mask;
- overlap &= clear_mask;
- nr_bits--;
+ mask = bit_masks[nr_bits] << bit;
}
assert(mask);
assert(!(al->map[offset] & mask));
-
al->map[offset] |= mask;
if (!al->level)
{
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)
+unsigned int axmap_set_nr(struct axmap *axmap, uint64_t bit_nr,
+ unsigned int nr_bits)
{
unsigned int set_bits = 0;
return set_bits;
}
-static int axmap_isset_fn(struct axmap_level *al, unsigned long offset,
- unsigned int bit, void *unused)
+static bool axmap_isset_fn(struct axmap_level *al, unsigned long offset,
+ unsigned int bit, void *unused)
{
return (al->map[offset] & (1UL << bit)) != 0;
}
-int axmap_isset(struct axmap *axmap, uint64_t bit_nr)
+bool axmap_isset(struct axmap *axmap, uint64_t bit_nr)
{
- if (bit_nr <= axmap->nr_bits) {
- int ret;
+ if (bit_nr <= axmap->nr_bits)
+ return axmap_handler_topdown(axmap, bit_nr, axmap_isset_fn);
- fio_mutex_down(&axmap->lock);
- ret = axmap_handler_topdown(axmap, bit_nr, axmap_isset_fn, NULL);
- fio_mutex_up(&axmap->lock);
- return ret;
- }
-
- return 0;
+ return false;
}
static uint64_t axmap_find_first_free(struct axmap *axmap, unsigned int level,
for (i = level; i >= 0; i--) {
struct axmap_level *al = &axmap->levels[i];
- /*
- * Clear 'ret', this is a bug condition.
- */
- if (index >= al->map_size) {
- ret = -1ULL;
- break;
- }
+ if (index >= al->map_size)
+ goto err;
for (j = index; j < al->map_size; j++) {
if (al->map[j] == -1UL)
if (ret < axmap->nr_bits)
return ret;
+err:
return (uint64_t) -1ULL;
}
static uint64_t axmap_first_free(struct axmap *axmap)
{
- uint64_t ret;
+ if (!firstfree_valid(axmap))
+ axmap->first_free = axmap_find_first_free(axmap, axmap->nr_levels - 1, 0);
- 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;
+ return axmap->first_free;
}
struct axmap_next_free_data {
uint64_t bit;
};
-static int axmap_next_free_fn(struct axmap_level *al, unsigned long offset,
+static bool axmap_next_free_fn(struct axmap_level *al, unsigned long offset,
unsigned int bit, void *__data)
{
struct axmap_next_free_data *data = __data;
uint64_t mask = ~bit_masks[(data->bit + 1) & BLOCKS_PER_UNIT_MASK];
if (!(mask & ~al->map[offset]))
- return 0;
+ return false;
if (al->map[offset] != -1UL) {
data->level = al->level;
data->offset = offset;
- return 1;
+ return true;
}
data->bit = (data->bit + BLOCKS_PER_UNIT - 1) / BLOCKS_PER_UNIT;
- return 0;
+ return false;
}
/*
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);
* 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);
}
projects / fio.git / blobdiff