static int check_engine_ops(struct ioengine_ops *ops)
{
if (ops->version != FIO_IOOPS_VERSION) {
- log_err("bad ioops version %d (want %d)\n", ops->version, FIO_IOOPS_VERSION);
+ log_err("bad ioops version %d (want %d)\n", ops->version,
+ FIO_IOOPS_VERSION);
return 1;
}
*/
if (ops->flags & FIO_SYNCIO)
return 0;
-
+
if (!ops->event) {
log_err("%s: no event handler\n", ops->name);
return 1;
log_err("%s: no queue handler\n", ops->name);
return 1;
}
-
+
return 0;
}
void unregister_ioengine(struct ioengine_ops *ops)
{
+ dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
list_del(&ops->list);
INIT_LIST_HEAD(&ops->list);
}
void register_ioengine(struct ioengine_ops *ops)
{
+ dprint(FD_IO, "ioengine %s registered\n", ops->name);
INIT_LIST_HEAD(&ops->list);
list_add_tail(&ops->list, &engine_list);
}
struct ioengine_ops *ops;
void *dlhandle;
+ dprint(FD_IO, "dload engine %s\n", engine_lib);
+
dlerror();
dlhandle = dlopen(engine_lib, RTLD_LAZY);
if (!dlhandle) {
struct ioengine_ops *ops, *ret;
char engine[16];
+ dprint(FD_IO, "load ioengine %s\n", name);
+
strncpy(engine, name, sizeof(engine) - 1);
/*
void close_ioengine(struct thread_data *td)
{
+ dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
+
if (td->io_ops->cleanup)
td->io_ops->cleanup(td);
int td_io_prep(struct thread_data *td, struct io_u *io_u)
{
+ dprint_io_u(io_u, "prep");
fio_ro_check(td, io_u);
- if (td->io_ops->prep)
- return td->io_ops->prep(td, io_u);
+ lock_file(td, io_u->file, io_u->ddir);
+
+ if (td->io_ops->prep) {
+ int ret = td->io_ops->prep(td, io_u);
+
+ dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
+ if (ret)
+ unlock_file(td, io_u->file);
+ return ret;
+ }
return 0;
}
int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
struct timespec *t)
{
- if (min > 0 && td->io_ops->commit) {
- int r = td->io_ops->commit(td);
+ int r = 0;
+ if (min > 0 && td->io_ops->commit) {
+ r = td->io_ops->commit(td);
if (r < 0)
- return r;
+ goto out;
}
- if (td->io_ops->getevents)
- return td->io_ops->getevents(td, min, max, t);
- return 0;
+ r = 0;
+ if (td->io_ops->getevents)
+ r = td->io_ops->getevents(td, min, max, t);
+out:
+ if (r >= 0)
+ io_u_mark_complete(td, r);
+ dprint(FD_IO, "getevents: %d\n", r);
+ return r;
}
int td_io_queue(struct thread_data *td, struct io_u *io_u)
{
int ret;
+ dprint_io_u(io_u, "queue");
fio_ro_check(td, io_u);
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
if (td->io_ops->flags & FIO_SYNCIO) {
fio_gettime(&io_u->issue_time, NULL);
- memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
+ memcpy(&td->last_issue, &io_u->issue_time,
+ sizeof(struct timeval));
/*
* for a sync engine, set the timeout upfront
*/
- if (mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+ if (mtime_since(&td->timeout_end, &io_u->issue_time)
+ < IO_U_TIMEOUT)
io_u_set_timeout(td);
}
if (io_u->ddir != DDIR_SYNC)
td->io_issues[io_u->ddir]++;
- io_u_mark_depth(td, io_u);
-
ret = td->io_ops->queue(td, io_u);
- if (ret == FIO_Q_QUEUED) {
+ unlock_file(td, io_u->file);
+
+ if (!td->io_ops->commit) {
+ io_u_mark_submit(td, 1);
+ io_u_mark_complete(td, 1);
+ }
+
+ if (ret == FIO_Q_COMPLETED) {
+ if (io_u->ddir != DDIR_SYNC) {
+ io_u_mark_depth(td, 1);
+ td->ts.total_io_u[io_u->ddir]++;
+ }
+ } else if (ret == FIO_Q_QUEUED) {
int r;
- td->io_u_queued++;
- if (td->io_u_queued > td->o.iodepth_batch) {
+ if (io_u->ddir != DDIR_SYNC) {
+ td->io_u_queued++;
+ td->ts.total_io_u[io_u->ddir]++;
+ }
+
+ if (td->io_u_queued >= td->o.iodepth_batch) {
r = td_io_commit(td);
if (r < 0)
return r;
if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
fio_gettime(&io_u->issue_time, NULL);
- memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
+ memcpy(&td->last_issue, &io_u->issue_time,
+ sizeof(struct timeval));
/*
* async engine, set the timeout here
*/
if (ret == FIO_Q_QUEUED &&
- mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+ (mtime_since(&td->timeout_end, &io_u->issue_time)
+ < IO_U_TIMEOUT)) {
io_u_set_timeout(td);
+ }
}
return ret;
if (td->io_ops->init) {
ret = td->io_ops->init(td);
- if (ret && td->o.iodepth > 1)
- log_err("fio: io engine init failed. Perhaps try reducing io depth?\n");
+ if (ret && td->o.iodepth > 1) {
+ log_err("fio: io engine init failed. Perhaps try"
+ " reducing io depth?\n");
+ }
}
return ret;
int td_io_commit(struct thread_data *td)
{
- if (!td->cur_depth)
+ dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
+
+ if (!td->cur_depth || !td->io_u_queued)
return 0;
+ io_u_mark_depth(td, td->io_u_queued);
td->io_u_queued = 0;
+
if (td->io_ops->commit)
return td->io_ops->commit(td);
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)
log_err("fio: destination does not support O_DIRECT\n");
- if (td->error == EMFILE)
- log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+ if (td->error == EMFILE) {
+ log_err("fio: try reducing/setting openfiles (failed"
+ " at %u of %u)\n", td->nr_open_files,
+ td->o.nr_files);
+ }
return 1;
}
}
}
- f->last_free_lookup = 0;
- f->last_completed_pos = 0;
- f->last_pos = f->file_offset;
+ fio_file_reset(f);
f->flags |= FIO_FILE_OPEN;
f->flags &= ~FIO_FILE_CLOSING;
if (td->o.fadvise_hint &&
(f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
-
int flags;
if (td_random(td))
return 1;
}
-void td_io_close_file(struct thread_data *td, struct fio_file *f)
+int td_io_close_file(struct thread_data *td, struct fio_file *f)
{
if (!(f->flags & FIO_FILE_CLOSING))
log_file(td, f, FIO_LOG_CLOSE_FILE);
*/
f->flags |= FIO_FILE_CLOSING;
- put_file(td, f);
+ unlock_file_all(td, f);
+
+ return put_file(td, f);
}
projects / fio.git / blobdiff