X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=2cc328883d806497b4f9028919cefe360ef3a377;hp=16ea928fe727c094f651e75922f52308eb36c70a;hb=cb5ab5121ac4fa62e0ca2612b359f19bfdd30f29;hpb=755200a326a33e5e19b16dfd5e013dd98bcf1916

diff --git a/ioengines.c b/ioengines.c
index 16ea928f..2cc32888 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
+#include <assert.h>
 
 #include "fio.h"
 #include "os.h"
@@ -66,11 +67,10 @@ void unregister_ioengine(struct ioengine_ops *ops)
 	INIT_LIST_HEAD(&ops->list);
 }
 
-int register_ioengine(struct ioengine_ops *ops)
+void register_ioengine(struct ioengine_ops *ops)
 {
 	INIT_LIST_HEAD(&ops->list);
 	list_add_tail(&ops->list, &engine_list);
-	return 0;
 }
 
 static struct ioengine_ops *find_ioengine(const char *name)
@@ -102,7 +102,7 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
 	dlerror();
 	dlhandle = dlopen(engine_lib, RTLD_LAZY);
 	if (!dlhandle) {
-		td_vmsg(td, -1, dlerror());
+		td_vmsg(td, -1, dlerror(), "dlopen");
 		return NULL;
 	}
 
@@ -112,7 +112,7 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
 	 */
 	ops = dlsym(dlhandle, "ioengine");
 	if (!ops) {
-		td_vmsg(td, -1, dlerror());
+		td_vmsg(td, -1, dlerror(), "dlsym");
 		dlclose(dlhandle);
 		return NULL;
 	}
@@ -164,7 +164,10 @@ void close_ioengine(struct thread_data *td)
 	if (td->io_ops->dlhandle)
 		dlclose(td->io_ops->dlhandle);
 
+#if 0
+	/* we can't do this for threads, so just leak it, it's exiting */
 	free(td->io_ops);
+#endif
 	td->io_ops = NULL;
 }
 
@@ -179,6 +182,12 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
 int td_io_getevents(struct thread_data *td, int min, int max,
 		    struct timespec *t)
 {
+	if (min > 0 && td->io_ops->commit) {
+		int r = td->io_ops->commit(td);
+
+		if (r < 0)
+			return r;
+	}
 	if (td->io_ops->getevents)
 		return td->io_ops->getevents(td, min, max, t);
 
@@ -187,12 +196,41 @@ int td_io_getevents(struct thread_data *td, int min, int max,
 
 int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
-	fio_gettime(&io_u->issue_time, NULL);
+	int ret;
+
+	assert((io_u->flags & IO_U_F_FLIGHT) == 0);
+	io_u->flags |= IO_U_F_FLIGHT;
+
+	if (td->io_ops->flags & FIO_SYNCIO) {
+		fio_gettime(&io_u->issue_time, NULL);
+
+		/*
+		 * for a sync engine, set the timeout upfront
+		 */
+		if (mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+			io_u_set_timeout(td);
+	}
 
 	if (io_u->ddir != DDIR_SYNC)
 		td->io_issues[io_u->ddir]++;
 
-	return td->io_ops->queue(td, io_u);
+	ret = td->io_ops->queue(td, io_u);
+
+	if (ret == FIO_Q_QUEUED)
+		td->io_u_queued++;
+
+	if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
+		fio_gettime(&io_u->issue_time, NULL);
+
+		/*
+		 * async engine, set the timeout here
+		 */
+		if (ret == FIO_Q_QUEUED &&
+		    mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+			io_u_set_timeout(td);
+	}
+
+	return ret;
 }
 
 int td_io_init(struct thread_data *td)
@@ -205,6 +243,10 @@ int td_io_init(struct thread_data *td)
 
 int td_io_commit(struct thread_data *td)
 {
+	if (!td->cur_depth)
+		return 0;
+
+	td->io_u_queued = 0;
 	if (td->io_ops->commit)
 		return td->io_ops->commit(td);