if (max_size > f->real_file_size)
max_size = f->real_file_size;
- max_blocks = max_size / (unsigned long long) td->o.min_bs[ddir];
+ max_blocks = max_size / (unsigned long long) td->o.ba[ddir];
if (!max_blocks)
return 0;
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
- while ((*b) * min_bs < f->real_file_size) {
+ while ((*b) * min_bs < f->real_file_size &&
+ (*b) * min_bs < f->io_size) {
if (f->file_map[i] != (unsigned int) -1) {
*b += ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
b = (f->last_pos - f->file_offset) / td->o.min_bs[ddir];
}
- io_u->offset = b * td->o.min_bs[ddir];
+ io_u->offset = b * td->o.ba[ddir];
if (io_u->offset >= f->io_size) {
dprint(FD_IO, "get_next_offset: offset %llu >= io_size %llu\n",
io_u->offset, f->io_size);
buflen = minbs;
else {
r = os_random_long(&td->bsrange_state);
- if (!td->o.bssplit_nr) {
+ if (!td->o.bssplit_nr[ddir]) {
buflen = 1 + (unsigned int) ((double) maxbs *
(r / (OS_RAND_MAX + 1.0)));
if (buflen < minbs)
long perc = 0;
unsigned int i;
- for (i = 0; i < td->o.bssplit_nr; i++) {
- struct bssplit *bsp = &td->o.bssplit[i];
+ for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
+ struct bssplit *bsp = &td->o.bssplit[ddir][i];
buflen = bsp->bs;
perc += bsp->perc;
if (err) {
dprint(FD_FILE, "error %d on open of %s\n",
err, f->file_name);
+ f = NULL;
continue;
}
opened = 1;
if (!f)
return 1;
-set_file:
io_u->file = f;
get_file(f);
if (!fill_io_u(td, io_u))
break;
- /*
- * optimization to prevent close/open of the same file. This
- * way we preserve queueing etc.
- */
- if (td->o.nr_files == 1 && td->o.time_based) {
- put_file_log(td, f);
- fio_file_reset(f);
- goto set_file;
- }
-
put_file_log(td, f);
td_io_close_file(td, f);
io_u->file = NULL;
f->last_pos = io_u->offset + io_u->buflen;
- if (td->o.verify != VERIFY_NONE)
+ if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_WRITE)
populate_verify_io_u(td, io_u);
else if (td->o.refill_buffers && io_u->ddir == DDIR_WRITE)
io_u_fill_buffer(td, io_u, io_u->xfer_buflen);
&icd->time);
if (!td->o.disable_clat) {
- add_clat_sample(td, idx, usec);
+ add_clat_sample(td, idx, usec, bytes);
io_u_mark_latency(td, usec);
}
if (!td->o.disable_bw)
- add_bw_sample(td, idx, &icd->time);
+ add_bw_sample(td, idx, bytes, &icd->time);
}
if (td_write(td) && idx == DDIR_WRITE &&
unsigned long slat_time;
slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
- add_slat_sample(td, io_u->ddir, slat_time);
+ add_slat_sample(td, io_u->ddir, io_u->xfer_buflen, slat_time);
}
}