#include <assert.h>
#include "fio.h"
+#include "diskutil.h"
static FLIST_HEAD(engine_list);
return r;
}
-static inline int get_issue_time(struct thread_data *td)
-{
- if (td->o.read_iolog_file ||
- !td->o.disable_clat || !td->o.disable_slat || !td->o.disable_bw)
- return 1;
-
- return 0;
-}
-
int td_io_queue(struct thread_data *td, struct io_u *io_u)
{
int ret;
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) {
- if (get_issue_time(td))
+ if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
/*
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]++;
}
}
if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
- if (get_issue_time(td))
+ if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
/*
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");
td->o.nr_files);
}
+ assert(f->fd == -1);
+ assert(!fio_file_open(f));
return 1;
}
fio_file_reset(f);
- f->flags |= FIO_FILE_OPEN;
- f->flags &= ~FIO_FILE_CLOSING;
+ fio_file_set_open(f);
+ fio_file_clear_closing(f);
+ disk_util_inc(f->du);
td->nr_open_files++;
get_file(f);
}
}
- if (f->file_map)
- 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,
log_file(td, f, FIO_LOG_OPEN_FILE);
return 0;
err:
+ disk_util_dec(f->du);
if (td->io_ops->close_file)
td->io_ops->close_file(td, f);
return 1;
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);
+}