X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=7f0a5c4520bab954d1e8eaa4df04ee115f8290e1;hp=fb6876366904378e5ee3b3dadf5463958e120552;hb=644eec5656e695ab215733108c634c056e1f8e3d;hpb=838bc709279964bdcc64070d4eb2777a0f79bcbb diff --git a/ioengines.c b/ioengines.c index fb687636..7f0a5c45 100644 --- a/ioengines.c +++ b/ioengines.c @@ -17,8 +17,9 @@ #include #include "fio.h" +#include "diskutil.h" -static LIST_HEAD(engine_list); +static FLIST_HEAD(engine_list); static int check_engine_ops(struct ioengine_ops *ops) { @@ -58,24 +59,24 @@ static int check_engine_ops(struct ioengine_ops *ops) 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); + flist_del(&ops->list); + INIT_FLIST_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); + INIT_FLIST_HEAD(&ops->list); + flist_add_tail(&ops->list, &engine_list); } static struct ioengine_ops *find_ioengine(const char *name) { struct ioengine_ops *ops; - struct list_head *entry; + struct flist_head *entry; - list_for_each(entry, &engine_list) { - ops = list_entry(entry, struct ioengine_ops, list); + flist_for_each(entry, &engine_list) { + ops = flist_entry(entry, struct ioengine_ops, list); if (!strcmp(name, ops->name)) return ops; } @@ -154,8 +155,10 @@ void close_ioengine(struct thread_data *td) { dprint(FD_IO, "close ioengine %s\n", td->io_ops->name); - if (td->io_ops->cleanup) + if (td->io_ops->cleanup) { td->io_ops->cleanup(td); + td->io_ops->data = NULL; + } if (td->io_ops->dlhandle) dlclose(td->io_ops->dlhandle); @@ -193,9 +196,13 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max, if (r < 0) goto out; } + if (max > td->cur_depth) + max = td->cur_depth; + if (min > max) + max = min; r = 0; - if (td->io_ops->getevents) + if (max && td->io_ops->getevents) r = td->io_ops->getevents(td, min, max, t); out: if (r >= 0) @@ -214,45 +221,56 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) assert((io_u->flags & IO_U_F_FLIGHT) == 0); io_u->flags |= IO_U_F_FLIGHT; - assert(io_u->file->flags & FIO_FILE_OPEN); + assert(fio_file_open(io_u->file)); io_u->error = 0; io_u->resid = 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)); + if (fio_fill_issue_time(td)) + fio_gettime(&io_u->issue_time, NULL); /* - * for a sync engine, set the timeout upfront + * only used for iolog */ - if (mtime_since(&td->timeout_end, &io_u->issue_time) - < IO_U_TIMEOUT) - io_u_set_timeout(td); + if (td->o.read_iolog_file) + memcpy(&td->last_issue, &io_u->issue_time, + sizeof(struct timeval)); } - if (io_u->ddir != DDIR_SYNC) + if (!ddir_sync(io_u->ddir)) td->io_issues[io_u->ddir]++; ret = td->io_ops->queue(td, io_u); unlock_file(td, io_u->file); + /* + * Add warning for O_DIRECT so that users have an easier time + * spotting potentially bad alignment. If this triggers for the first + * IO, then it's likely an alignment problem or because the host fs + * does not support O_DIRECT + */ + if (io_u->error == EINVAL && td->io_issues[io_u->ddir] == 1 && + td->o.odirect) { + log_info("fio: first direct IO errored. File system may not " + "support direct IO, or iomem_align= is bad.\n"); + } + 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) { + if (!ddir_sync(io_u->ddir)) { io_u_mark_depth(td, 1); td->ts.total_io_u[io_u->ddir]++; } } else if (ret == FIO_Q_QUEUED) { int r; - if (io_u->ddir != DDIR_SYNC) { + if (!ddir_sync(io_u->ddir)) { td->io_u_queued++; td->ts.total_io_u[io_u->ddir]++; } @@ -265,18 +283,15 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) } 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)); + if (fio_fill_issue_time(td)) + fio_gettime(&io_u->issue_time, NULL); /* - * async engine, set the timeout here + * only used for iolog */ - if (ret == FIO_Q_QUEUED && - (mtime_since(&td->timeout_end, &io_u->issue_time) - < IO_U_TIMEOUT)) { - io_u_set_timeout(td); - } + if (td->o.read_iolog_file) + memcpy(&td->last_issue, &io_u->issue_time, + sizeof(struct timeval)); } return ret; @@ -315,6 +330,9 @@ int td_io_commit(struct thread_data *td) int td_io_open_file(struct thread_data *td, struct fio_file *f) { + assert(!fio_file_open(f)); + assert(f->fd == -1); + 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"); @@ -324,9 +342,19 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f) td->o.nr_files); } + assert(f->fd == -1); + assert(!fio_file_open(f)); return 1; } + fio_file_reset(f); + fio_file_set_open(f); + fio_file_clear_closing(f); + disk_util_inc(f->du); + + td->nr_open_files++; + get_file(f); + if (f->filetype == FIO_TYPE_PIPE) { if (td_random(td)) { log_err("fio: can't seek on pipes (no random io)\n"); @@ -334,10 +362,6 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f) } } - fio_file_reset(f); - f->flags |= FIO_FILE_OPEN; - f->flags &= ~FIO_FILE_CLOSING; - if (td->io_ops->flags & FIO_DISKLESSIO) goto done; @@ -359,15 +383,26 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f) } } - if (f->file_map) - memset(f->file_map, 0, f->num_maps * sizeof(long)); +#ifdef FIO_OS_DIRECTIO + /* + * Some OS's have a distinct call to mark the file non-buffered, + * instead of using O_DIRECT (Solaris) + */ + if (td->o.odirect) { + int ret = fio_set_odirect(f->fd); + + if (ret) { + td_verror(td, ret, "fio_set_odirect"); + goto err; + } + } +#endif done: log_file(td, f, FIO_LOG_OPEN_FILE); - td->nr_open_files++; - get_file(f); return 0; err: + disk_util_dec(f->du); if (td->io_ops->close_file) td->io_ops->close_file(td, f); return 1; @@ -375,15 +410,24 @@ err: int td_io_close_file(struct thread_data *td, struct fio_file *f) { - if (!(f->flags & FIO_FILE_CLOSING)) + if (!fio_file_closing(f)) log_file(td, f, FIO_LOG_CLOSE_FILE); /* * mark as closing, do real close when last io on it has completed */ - f->flags |= FIO_FILE_CLOSING; + fio_file_set_closing(f); + disk_util_dec(f->du); unlock_file_all(td, f); return put_file(td, f); } + +int td_io_get_file_size(struct thread_data *td, struct fio_file *f) +{ + if (!td->io_ops->get_file_size) + return 0; + + return td->io_ops->get_file_size(td, f); +}