X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=4ab08ce7472ca806573cf4fcb9875c96645c9b5f;hp=1704418735367e92e48dfb42f5fb85e0902eed6a;hb=eeb121607c2a7f36b0fac17649cb8081d6fd853b;hpb=0c6e75175bcaf8d05bfa88aa8caa584fbb848b74

diff --git a/ioengines.c b/ioengines.c
index 17044187..4ab08ce7 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -28,12 +28,6 @@ static int check_engine_ops(struct ioengine_ops *ops)
 		return 1;
 	}
 
-	/*
-	 * cpu thread doesn't need to provide anything
-	 */
-	if (ops->flags & FIO_CPUIO)
-		return 0;
-
 	if (!ops->queue) {
 		log_err("%s: no queue handler\n", ops->name);
 		return 1;
@@ -77,16 +71,10 @@ static struct ioengine_ops *find_ioengine(const char *name)
 {
 	struct ioengine_ops *ops;
 	struct list_head *entry;
-	char engine[16];
-
-	strncpy(engine, name, sizeof(engine) - 1);
-
-	if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
-		strcpy(engine, "libaio");
 
 	list_for_each(entry, &engine_list) {
 		ops = list_entry(entry, struct ioengine_ops, list);
-		if (!strcmp(engine, ops->name))
+		if (!strcmp(name, ops->name))
 			return ops;
 	}
 
@@ -102,7 +90,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 +100,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;
 	}
@@ -179,6 +167,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);
 
@@ -192,32 +186,107 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 	assert((io_u->flags & IO_U_F_FLIGHT) == 0);
 	io_u->flags |= IO_U_F_FLIGHT;
 
-	if (td->io_ops->flags & FIO_SYNCIO)
+	assert(io_u->file->flags & FIO_FILE_OPEN);
+
+	io_u->error = 0;
+	io_u->resid = 0;
+
+	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]++;
 
+	io_u_mark_depth(td, io_u);
+
 	ret = td->io_ops->queue(td, io_u);
 
-	if ((td->io_ops->flags & FIO_SYNCIO) == 0)
+	if (ret == FIO_Q_QUEUED || ret == FIO_Q_COMPLETED)
+		get_file(io_u->file);
+
+	if (ret == FIO_Q_QUEUED) {
+		int r;
+
+		td->io_u_queued++;
+		if (td->io_u_queued > td->o.iodepth_batch) {
+			r = td_io_commit(td);
+			if (r < 0)
+				return r;
+		}
+	}
+
+	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)
 {
-	if (td->io_ops->init)
-		return td->io_ops->init(td);
+	int ret = 0;
 
-	return 0;
+	if (td->io_ops->init) {
+		ret = td->io_ops->init(td);
+		if (ret && td->o.iodepth > 1)
+			log_err("fio: io engine init failed. Perhaps try reducing io dpeth?\n");
+	}
+
+	return ret;
 }
 
 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);
 
 	return 0;
 }
+
+int td_io_open_file(struct thread_data *td, struct fio_file *f)
+{
+	if (td->io_ops->open_file(td, f))
+		return 1;
+
+	f->last_free_lookup = 0;
+	f->last_completed_pos = 0;
+	f->last_pos = 0;
+	f->flags |= FIO_FILE_OPEN;
+	f->flags &= ~FIO_FILE_CLOSING;
+
+	if (f->file_map)
+		memset(f->file_map, 0, f->num_maps * sizeof(long));
+
+	td->nr_open_files++;
+	get_file(f);
+	return 0;
+}
+
+void td_io_close_file(struct thread_data *td, struct fio_file *f)
+{
+	/*
+	 * mark as closing, do real close when last io on it has completed
+	 */
+	f->flags |= FIO_FILE_CLOSING;
+
+	put_file(td, f);
+}
+