summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
697a606)
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
(unsigned long long) td->o.rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP - 1) /
(unsigned long long) BLOCKS_PER_MAP;
(unsigned long long) td->o.rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP - 1) /
(unsigned long long) BLOCKS_PER_MAP;
- f->file_map = smalloc(num_maps * sizeof(long));
+ f->file_map = smalloc(num_maps * sizeof(int));
if (f->file_map) {
f->num_maps = num_maps;
continue;
if (f->file_map) {
f->num_maps = num_maps;
continue;
/*
* block map for random io
*/
/*
* block map for random io
*/
- unsigned long *file_map;
+ unsigned int *file_map;
unsigned int num_maps;
unsigned int last_free_lookup;
unsigned int num_maps;
unsigned int last_free_lookup;
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
}
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
}
-#define BLOCKS_PER_MAP (8 * sizeof(long))
+#define BLOCKS_PER_MAP (8 * sizeof(int))
#define TO_MAP_BLOCK(f, b) (b)
#define RAND_MAP_IDX(f, b) (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP)
#define RAND_MAP_BIT(f, b) (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1))
#define TO_MAP_BLOCK(f, b) (b)
#define RAND_MAP_IDX(f, b) (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP)
#define RAND_MAP_BIT(f, b) (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1))
dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit);
dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit);
- return (f->file_map[idx] & (1UL << bit)) == 0;
+ return (f->file_map[idx] & (1 << bit)) == 0;
fio_assert(td, idx < f->num_maps);
fio_assert(td, idx < f->num_maps);
- f->file_map[idx] |= (1UL << bit);
+ f->file_map[idx] |= (1 << bit);
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
while ((*b) * min_bs < f->real_file_size) {
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
while ((*b) * min_bs < f->real_file_size) {
- if (f->file_map[i] != -1UL) {
+ if (f->file_map[i] != (unsigned int) -1) {
*b += ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
break;
*b += ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
break;
- memset(f->file_map, 0, f->num_maps * sizeof(long));
+ memset(f->file_map, 0, f->num_maps * sizeof(int));
done:
log_file(td, f, FIO_LOG_OPEN_FILE);
done:
log_file(td, f, FIO_LOG_OPEN_FILE);