#include "fio.h"
-static LIST_HEAD(engine_list);
+static FLIST_HEAD(engine_list);
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;
}
{
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);
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)
+ io_u_mark_complete(td, r);
dprint(FD_IO, "getevents: %d\n", r);
return r;
}
unlock_file(td, io_u->file);
- if (ret != FIO_Q_BUSY)
- io_u_mark_depth(td, io_u);
+ if (!td->io_ops->commit) {
+ io_u_mark_submit(td, 1);
+ io_u_mark_complete(td, 1);
+ }
- if (ret == FIO_Q_QUEUED) {
+ 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;
{
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
- if (!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);
return 1;
}
+ fio_file_reset(f);
+ f->flags |= FIO_FILE_OPEN;
+ f->flags &= ~FIO_FILE_CLOSING;
+
+ 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");
}
}
- f->last_free_lookup = 0;
- f->last_pos = f->file_offset;
- f->flags |= FIO_FILE_OPEN;
- f->flags &= ~FIO_FILE_CLOSING;
-
if (td->io_ops->flags & FIO_DISKLESSIO)
goto done;
}
if (f->file_map)
- memset(f->file_map, 0, f->num_maps * sizeof(long));
+ memset(f->file_map, 0, f->num_maps * sizeof(int));
+
+#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:
if (td->io_ops->close_file)