* to yet. Used to make sure we cover the entire range in a fair fashion.
*/
static int random_map_free(struct thread_data *td, struct fio_file *f,
- unsigned long long block)
+ const unsigned long long block)
{
unsigned int idx = RAND_MAP_IDX(td, f, block);
unsigned int bit = RAND_MAP_BIT(td, f, block);
+ dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit);
+
return (f->file_map[idx] & (1UL << bit)) == 0;
}
* If we have a mixed random workload, we may
* encounter blocks we already did IO to.
*/
- if (!td->o.ddir_nr == 1 && !random_map_free(td, f, block))
+ if ((td->o.ddir_nr == 1) && !random_map_free(td, f, block))
break;
idx = RAND_MAP_IDX(td, f, block);
{
unsigned long long max_blocks;
- max_blocks = f->io_size / td->o.min_bs[ddir];
+ max_blocks = f->io_size / (unsigned long long) td->o.min_bs[ddir];
if (!max_blocks)
return 0;
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
enum fio_ddir ddir, unsigned long long *b)
{
+ unsigned long long min_bs = td->o.rw_min_bs;
int i;
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
- while ((*b) * td->o.rw_min_bs < f->real_file_size) {
+ while ((*b) * min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
*b += fio_ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
enum fio_ddir ddir, unsigned long long *b)
{
- unsigned long long r, rb;
+ unsigned long long r;
int loops = 5;
do {
r = os_random_long(&td->random_state);
- *b = last_block(td, f, ddir);
+ dprint(FD_RANDOM, "off rand %llu\n", r);
+ *b = (last_block(td, f, ddir) - 1) * (r / ((unsigned long long) RAND_MAX + 1.0));
/*
* if we are not maintaining a random map, we are done.
return 0;
/*
- * calculate map offset and chec if it's free
+ * calculate map offset and check if it's free
*/
- rb = *b;
- if (random_map_free(td, f, rb))
+ if (random_map_free(td, f, *b))
return 0;
+ dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n",
+ *b);
} while (--loops);
/*
assert((io_u->flags & IO_U_F_FREE) == 0);
io_u->flags |= IO_U_F_FREE;
- if (io_u->file)
- put_file(td, io_u->file);
+ if (io_u->file) {
+ int ret = put_file(td, io_u->file);
+
+ if (ret)
+ td_verror(td, ret, "file close");
+ }
io_u->file = NULL;
list_del(&io_u->list);
long r = os_random_long(&td->next_file_state);
fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
- f = &td->files[fno];
+ f = td->files[fno];
if (f->flags & FIO_FILE_DONE)
continue;
struct fio_file *f;
do {
- f = &td->files[td->next_file];
+ f = td->files[td->next_file];
td->next_file++;
if (td->next_file >= td->o.nr_files)
* td_io_close() does a put_file() as well, so no need to
* do that here.
*/
+ unlock_file(io_u->file);
io_u->file = NULL;
td_io_close_file(td, f);
f->flags |= FIO_FILE_DONE;
* Set io data pointers.
*/
io_u->endpos = io_u->offset + io_u->buflen;
-out:
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
-
+out:
if (!td_io_prep(td, io_u)) {
fio_gettime(&io_u->start_time, NULL);
return io_u;
td->io_bytes[idx] += bytes;
td->this_io_bytes[idx] += bytes;
- io_u->file->last_completed_pos = io_u->endpos;
-
usec = utime_since(&io_u->issue_time, &icd->time);
add_clat_sample(td, idx, usec);