X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=ioengines.c;h=6a5073cf87ce06f1f851fed9bdf5815c4638f7cc;hb=bb8895e07c6d6417410545f45d34b1b7916cd90a;hp=82b7ec3f6f25957832e2f56fc2de83829a519aeb;hpb=c1d5725eaad49dbf5b3a05c27b0b3677af69f64c;p=fio.git

diff --git a/ioengines.c b/ioengines.c
index 82b7ec3f..6a5073cf 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,13 +14,38 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
+
 #include "fio.h"
 #include "os.h"
 
-struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
+static int check_engine_ops(struct ioengine_ops *ops)
+{
+	/*
+	 * cpu thread doesn't need to provide anything
+	 */
+	if (ops->flags & FIO_CPUIO)
+		return 0;
+
+	if (!ops->event) {
+		log_err("%s: no event handler)\n", ops->name);
+		return 1;
+	}
+	if (!ops->getevents) {
+		log_err("%s: no getevents handler)\n", ops->name);
+		return 1;
+	}
+	if (!ops->queue) {
+		log_err("%s: no queue handler)\n", ops->name);
+		return 1;
+	}
+		
+	return 0;
+}
+
+struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 {
 	char engine[16], engine_lib[256];
-	struct ioengine_ops *ops;
+	struct ioengine_ops *ops, *ret;
 	void *dlhandle;
 
 	strcpy(engine, name);
@@ -52,8 +77,20 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
 		return NULL;
 	}
 
-	ops->dlhandle = dlhandle;
-	return ops;
+	/*
+	 * Check that the required methods are there.
+	 */
+	if (check_engine_ops(ops)) {
+		dlclose(dlhandle);
+		return NULL;
+	}
+
+	ret = malloc(sizeof(*ret));
+	memcpy(ret, ops, sizeof(*ret));
+	ret->data = NULL;
+	ret->dlhandle = dlhandle;
+
+	return ret;
 }
 
 void close_ioengine(struct thread_data *td)
@@ -62,4 +99,35 @@ void close_ioengine(struct thread_data *td)
 		td->io_ops->cleanup(td);
 
 	dlclose(td->io_ops->dlhandle);
+	free(td->io_ops);
+	td->io_ops = NULL;
+}
+
+int td_io_prep(struct thread_data *td, struct io_u *io_u)
+{
+	if (td->io_ops->prep && td->io_ops->prep(td, io_u))
+		return 1;
+
+	return 0;
+}
+
+int td_io_getevents(struct thread_data *td, int min, int max,
+		    struct timespec *t)
+{
+	return td->io_ops->getevents(td, min, max, t);
+}
+
+int td_io_queue(struct thread_data *td, struct io_u *io_u)
+{
+	gettimeofday(&io_u->issue_time, NULL);
+
+	return td->io_ops->queue(td, io_u);
+}
+
+int td_io_init(struct thread_data *td)
+{
+	if (td->io_ops->init)
+		return td->io_ops->init(td);
+
+	return 0;
 }