projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix misspellings using 'codespell' tool
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index b3c2e51f952c735cc81879214598d0c8c1b62879..d71e372048112e19010c1dd494a7a4b2872eb5fa 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-104,7
+104,9
@@
static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
* Unlike the included modules, external engines should have a
* non-static ioengine structure that we can reference.
*/
* Unlike the included modules, external engines should have a
* non-static ioengine structure that we can reference.
*/
- ops = dlsym(dlhandle, "ioengine");
+ ops = dlsym(dlhandle, engine_lib);
+ if (!ops)
+ ops = dlsym(dlhandle, "ioengine");
if (!ops) {
td_vmsg(td, -1, dlerror(), "dlsym");
dlclose(dlhandle);
if (!ops) {
td_vmsg(td, -1, dlerror(), "dlsym");
dlclose(dlhandle);
@@
-258,6
+260,11
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
assert(fio_file_open(io_u->file));
assert(fio_file_open(io_u->file));
+ /*
+ * If using a write iolog, store this entry.
+ */
+ log_io_u(td, io_u);
+
io_u->error = 0;
io_u->resid = 0;
io_u->error = 0;
io_u->resid = 0;
@@
-273,13
+280,20
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
sizeof(struct timeval));
}
sizeof(struct timeval));
}
- if (ddir_rw(
io_u->ddir
))
- td->io_issues[
io_u->ddir
]++;
+ if (ddir_rw(
acct_ddir(io_u)
))
+ td->io_issues[
acct_ddir(io_u)
]++;
ret = td->io_ops->queue(td, io_u);
unlock_file(td, io_u->file);
ret = td->io_ops->queue(td, io_u);
unlock_file(td, io_u->file);
+ /*
+ * If an error was seen and the io engine didn't propagate it
+ * back to 'td', do so.
+ */
+ if (io_u->error && !td->error)
+ td_verror(td, io_u->error, "td_io_queue");
+
/*
* Add warning for O_DIRECT so that users have an easier time
* spotting potentially bad alignment. If this triggers for the first
/*
* Add warning for O_DIRECT so that users have an easier time
* spotting potentially bad alignment. If this triggers for the first
@@
-293,7
+307,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
"support direct IO, or iomem_align= is bad.\n");
}
"support direct IO, or iomem_align= is bad.\n");
}
- if (!td->io_ops->commit) {
+ if (!td->io_ops->commit
|| ddir_trim(io_u->ddir)
) {
io_u_mark_submit(td, 1);
io_u_mark_complete(td, 1);
}
io_u_mark_submit(td, 1);
io_u_mark_complete(td, 1);
}
@@
-302,8
+316,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
if (ddir_rw(io_u->ddir)) {
io_u_mark_depth(td, 1);
td->ts.total_io_u[io_u->ddir]++;
if (ddir_rw(io_u->ddir)) {
io_u_mark_depth(td, 1);
td->ts.total_io_u[io_u->ddir]++;
- } else if (io_u->ddir == DDIR_TRIM)
- td->ts.total_io_u[2]++;
+ }
} else if (ret == FIO_Q_QUEUED) {
int r;
} else if (ret == FIO_Q_QUEUED) {
int r;
@@
-396,7
+409,7
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
return 1;
}
return 1;
}
- fio_file_reset(f);
+ fio_file_reset(
td,
f);
fio_file_set_open(f);
fio_file_clear_closing(f);
disk_util_inc(f->du);
fio_file_set_open(f);
fio_file_clear_closing(f);
disk_util_inc(f->du);
@@
-469,7
+482,9
@@
int td_io_close_file(struct thread_data *td, struct fio_file *f)
fio_file_set_closing(f);
disk_util_dec(f->du);
fio_file_set_closing(f);
disk_util_dec(f->du);
- unlock_file_all(td, f);
+
+ if (td->o.file_lock_mode != FILE_LOCK_NONE)
+ unlock_file_all(td, f);
return put_file(td, f);
}
return put_file(td, f);
}
@@
-502,7
+517,7
@@
int do_io_u_sync(struct thread_data *td, struct io_u *io_u)
if (io_u->ddir == DDIR_SYNC) {
ret = fsync(io_u->file->fd);
} else if (io_u->ddir == DDIR_DATASYNC) {
if (io_u->ddir == DDIR_SYNC) {
ret = fsync(io_u->file->fd);
} else if (io_u->ddir == DDIR_DATASYNC) {
-#ifdef
FIO_HAVE
_FDATASYNC
+#ifdef
CONFIG
_FDATASYNC
ret = fdatasync(io_u->file->fd);
#else
ret = io_u->xfer_buflen;
ret = fdatasync(io_u->file->fd);
#else
ret = io_u->xfer_buflen;