* 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);
/*
buflen = td->o.min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
- if (!td->o.bssplit_nr)
- buflen = (unsigned int) (1 + (double) (td->o.max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
- else {
+ if (!td->o.bssplit_nr) {
+ buflen = (unsigned int)
+ (1 + (double) (td->o.max_bs[ddir] - 1)
+ * r / (RAND_MAX + 1.0));
+ } else {
long perc = 0;
unsigned int i;
break;
}
}
- if (!td->o.bs_unaligned)
- buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
+ if (!td->o.bs_unaligned) {
+ buflen = (buflen + td->o.min_bs[ddir] - 1)
+ & ~(td->o.min_bs[ddir] - 1);
+ }
}
if (io_u->offset + buflen > io_u->file->real_file_size) {
rbytes = td->io_bytes[td->rwmix_ddir] - td->rwmix_bytes;
diff = td->o.rwmix[td->rwmix_ddir ^ 1];
- td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * ((100 - diff)) / diff);
+ td->rwmix_bytes = td->io_bytes[td->rwmix_ddir]
+ + (rbytes * ((100 - diff)) / diff);
}
static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
unsigned int cycle;
fio_gettime(&now, NULL);
- elapsed = mtime_since_now(&td->rwmix_switch);
+ elapsed = mtime_since_now(&td->rwmix_switch);
/*
* if this is the first cycle, make it shorter
if (elapsed >= cycle ||
td->io_bytes[td->rwmix_ddir] >= td->rwmix_bytes) {
unsigned long long max_bytes;
- enum fio_ddir ddir;
+ enum fio_ddir ddir;
/*
* Put a top limit on how many bytes we do for
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
- if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) {
+ if (max_bytes >=
+ (td->o.size * td->o.rwmix[ddir] / 100)) {
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
- memcpy(&td->rw_end[ddir], &now, sizeof(now));
+ memcpy(&td->rw_end[ddir], &now,
+ sizeof(now));
}
ddir ^= 1;
}
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);
__io_u->flags |= IO_U_F_FREE;
if ((__io_u->flags & IO_U_F_FLIGHT) && (__io_u->ddir != DDIR_SYNC))
td->io_issues[__io_u->ddir]--;
-
+
__io_u->flags &= ~IO_U_F_FLIGHT;
list_del(&__io_u->list);
do {
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];
+ fno = (unsigned int) ((double) td->o.nr_files
+ * (r / (RAND_MAX + 1.0)));
+ 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)
assert(td->o.nr_files <= td->files_index);
if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files) {
- dprint(FD_FILE, "get_next_file: nr_open=%d, nr_done=%d, nr_files=%d\n", td->nr_open_files, td->nr_done_files, td->o.nr_files);
+ dprint(FD_FILE, "get_next_file: nr_open=%d, nr_done=%d,"
+ " nr_files=%d\n", td->nr_open_files,
+ td->nr_done_files,
+ td->o.nr_files);
return NULL;
}
dprint(FD_IO, "io_u %p, setting file failed\n", io_u);
goto err_put;
}
-
+
f = io_u->file;
assert(f->flags & FIO_FILE_OPEN);
* 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;
log_err(": %s\n", strerror(io_u->error));
- log_err(" %s offset=%llu, buflen=%lu\n", msg[io_u->ddir], io_u->offset, io_u->xfer_buflen);
+ log_err(" %s offset=%llu, buflen=%lu\n", msg[io_u->ddir],
+ io_u->offset, io_u->xfer_buflen);
if (!td->error)
td_verror(td, io_u->error, "io_u error");
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);
unsigned long t_issue = mtime_since_now(&io_u->issue_time);
log_err("io_u=%p, t_start=%lu, t_issue=%lu\n", io_u, t_start, t_issue);
- log_err(" buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf, io_u->xfer_buf, io_u->buflen, io_u->xfer_buflen, io_u->offset);
+ log_err(" buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf,
+ io_u->xfer_buf, io_u->buflen,
+ io_u->xfer_buflen,
+ io_u->offset);
log_err(" ddir=%d, fname=%s\n", io_u->ddir, io_u->file->file_name);
}
#else