#include "../arch/arch.h"
#include "axmap.h"
-#include "../smalloc.h"
-#include "../mutex.h"
#include "../minmax.h"
#if BITS_PER_LONG == 64
};
struct axmap {
- struct fio_mutex lock;
unsigned int nr_levels;
struct axmap_level *levels;
uint64_t first_free;
{
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 = malloc(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;
}
{
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)
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;
}
return (uint64_t) -1ULL;
}
-uint64_t axmap_first_free(struct axmap *axmap)
+static uint64_t axmap_first_free(struct axmap *axmap)
{
- uint64_t ret;
-
if (firstfree_valid(axmap))
return axmap->first_free;
- fio_mutex_down(&axmap->lock);
- ret = axmap_find_first_free(axmap, axmap->nr_levels - 1, 0);
- axmap->first_free = ret;
- fio_mutex_up(&axmap->lock);
-
- return ret;
+ axmap->first_free = axmap_find_first_free(axmap, axmap->nr_levels - 1, 0);
+ return axmap->first_free;
}
struct axmap_next_free_data {
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);
}