static int get_next_offset(struct thread_data *td, struct io_u *io_u)
{
- if (td->fill_io_u_off)
- return td->fill_io_u_off(td, io_u);
+ struct prof_io_ops *ops = &td->prof_io_ops;
+
+ if (ops->fill_io_u_off)
+ return ops->fill_io_u_off(td, io_u);
return __get_next_offset(td, io_u);
}
static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
{
- if (td->fill_io_u_size)
- return td->fill_io_u_size(td, io_u);
+ struct prof_io_ops *ops = &td->prof_io_ops;
+
+ if (ops->fill_io_u_size)
+ return ops->fill_io_u_size(td, io_u);
return __get_next_buflen(td, io_u);
}
td->io_issues[DDIR_WRITE] && should_fsync(td))
return DDIR_DATASYNC;
+ /*
+ * see if it's time to sync_file_range
+ */
+ if (td->sync_file_range_nr &&
+ !(td->io_issues[DDIR_WRITE] % td->sync_file_range_nr) &&
+ td->io_issues[DDIR_WRITE] && should_fsync(td))
+ return DDIR_SYNC_FILE_RANGE;
+
if (td_rw(td)) {
/*
* Check if it's time to seed a new data direction.
return f;
}
-static struct fio_file *get_next_file(struct thread_data *td)
+static struct fio_file *__get_next_file(struct thread_data *td)
{
struct fio_file *f;
return f;
}
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+ struct prof_io_ops *ops = &td->prof_io_ops;
+
+ if (ops->get_next_file)
+ return ops->get_next_file(td);
+
+ return __get_next_file(td);
+}
+
static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
{
struct fio_file *f;
io_u->end_io = NULL;
}
- /*
- * We ran out, wait for async verify threads to finish and return one
- */
- if (!io_u && td->o.verify_async) {
- pthread_cond_wait(&td->free_cond, &td->io_u_lock);
- goto again;
- }
-
if (io_u) {
assert(io_u->flags & IO_U_F_FREE);
io_u->flags &= ~(IO_U_F_FREE | IO_U_F_FREE_DEF);
flist_add(&io_u->list, &td->io_u_busylist);
td->cur_depth++;
io_u->flags |= IO_U_F_IN_CUR_DEPTH;
+ } else if (td->o.verify_async) {
+ /*
+ * We ran out, wait for async verify threads to finish and
+ * return one
+ */
+ pthread_cond_wait(&td->free_cond, &td->io_u_lock);
+ goto again;
}
td_io_u_unlock(td);
* initialized, silence that warning.
*/
unsigned long uninitialized_var(usec);
+ struct fio_file *f;
dprint_io_u(io_u, "io complete");
if (ddir_sync(io_u->ddir)) {
td->last_was_sync = 1;
+ f = io_u->file;
+ if (f) {
+ f->first_write = -1ULL;
+ f->last_write = -1ULL;
+ }
return;
}
td->io_bytes[idx] += bytes;
td->this_io_bytes[idx] += bytes;
+ if (idx == DDIR_WRITE) {
+ f = io_u->file;
+ if (f) {
+ if (f->first_write == -1ULL ||
+ io_u->offset < f->first_write)
+ f->first_write = io_u->offset;
+ if (f->last_write == -1ULL ||
+ ((io_u->offset + bytes) > f->last_write))
+ f->last_write = io_u->offset + bytes;
+ }
+ }
+
if (ramp_time_over(td)) {
unsigned long uninitialized_var(lusec);