projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of https://github.com/smartxworks/fio
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 47f606a75409c9a2679443ad02ba7f818e6f6ed4..aa4ccd2755c96f843d69333448795b0b16061723 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-131,7
+131,7
@@
static struct ioengine_ops *__load_ioengine(const char *name)
/*
* linux libaio has alias names, so convert to what we want
*/
/*
* linux libaio has alias names, so convert to what we want
*/
- if (!strncmp(engine, "linuxaio", 8)
|| !strncmp(engine, "aio", 3)
) {
+ if (!strncmp(engine, "linuxaio", 8)) {
dprint(FD_IO, "converting ioengine name: %s -> libaio\n", name);
strcpy(engine, "libaio");
}
dprint(FD_IO, "converting ioengine name: %s -> libaio\n", name);
strcpy(engine, "libaio");
}
@@
-288,7
+288,14
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
io_u_set(td, io_u, IO_U_F_FLIGHT);
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
io_u_set(td, io_u, IO_U_F_FLIGHT);
- if (td->o.serialize_overlap && td->o.io_submit_mode == IO_MODE_OFFLOAD)
+
+ /*
+ * If overlap checking was enabled in offload mode we
+ * can release this lock that was acquired when we
+ * started the overlap check because the IO_U_F_FLIGHT
+ * flag is now set
+ */
+ if (td_offload_overlap(td))
pthread_mutex_unlock(&overlap_check);
assert(fio_file_open(io_u->file));
pthread_mutex_unlock(&overlap_check);
assert(fio_file_open(io_u->file));
@@
-301,7
+308,9
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
io_u->error = 0;
io_u->resid = 0;
io_u->error = 0;
io_u->resid = 0;
- if (td_ioengine_flagged(td, FIO_SYNCIO)) {
+ if (td_ioengine_flagged(td, FIO_SYNCIO) ||
+ (td_ioengine_flagged(td, FIO_ASYNCIO_SYNC_TRIM) &&
+ io_u->ddir == DDIR_TRIM)) {
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
@@
-322,10
+331,7
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
}
ret = td->io_ops->queue(td, io_u);
}
ret = td->io_ops->queue(td, io_u);
- if (ret != FIO_Q_BUSY && io_u->post_submit) {
- io_u->post_submit(io_u, io_u->error == 0);
- io_u->post_submit = NULL;
- }
+ zbd_queue_io_u(io_u, ret);
unlock_file(td, io_u->file);
unlock_file(td, io_u->file);
@@
-367,6
+373,7
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
if (!td->io_ops->commit) {
io_u_mark_submit(td, 1);
io_u_mark_complete(td, 1);
if (!td->io_ops->commit) {
io_u_mark_submit(td, 1);
io_u_mark_complete(td, 1);
+ zbd_put_io_u(io_u);
}
if (ret == FIO_Q_COMPLETED) {
}
if (ret == FIO_Q_COMPLETED) {
@@
-384,7
+391,9
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
td_io_commit(td);
}
td_io_commit(td);
}
- if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
+ if (!td_ioengine_flagged(td, FIO_SYNCIO) &&
+ (!td_ioengine_flagged(td, FIO_ASYNCIO_SYNC_TRIM) ||
+ io_u->ddir != DDIR_TRIM)) {
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);