X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=998c13ee7ce96c1123ec913e550ef0d6519d63d7;hp=66991c7cce1f3bb93b6b73981f43e5d3b82039ad;hb=0798ba36674a7a244e8bc10877e322973a5ca938;hpb=09629a90d5b68b220e3fb98318e2dcd019943eda

diff --git a/ioengines.c b/ioengines.c
index 66991c7c..998c13ee 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "fio.h"
-#include "os.h"
 
 static LIST_HEAD(engine_list);
 
@@ -28,12 +27,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;
@@ -192,6 +185,8 @@ 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;
 
+	assert(io_u->file->flags & FIO_FILE_OPEN);
+
 	io_u->error = 0;
 	io_u->resid = 0;
 
@@ -208,13 +203,18 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 	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 (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->iodepth_batch) {
+		if (td->io_u_queued > td->o.iodepth_batch) {
 			r = td_io_commit(td);
 			if (r < 0)
 				return r;
@@ -237,10 +237,15 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 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)
@@ -257,27 +262,60 @@ int td_io_commit(struct thread_data *td)
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
-	if (td->io_ops->open_file(td, f))
+	if (td->io_ops->open_file(td, f)) {
+		if (td->error == EINVAL && td->o.odirect)
+			log_err("fio: destination does not support O_DIRECT\n");
+		if (td->error == EMFILE)
+			log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+
 		return 1;
+	}
 
 	f->last_free_lookup = 0;
 	f->last_completed_pos = 0;
 	f->last_pos = 0;
-	f->open = 1;
+	f->flags |= FIO_FILE_OPEN;
+	f->flags &= ~FIO_FILE_CLOSING;
+
+	if (td->io_ops->flags & FIO_DISKLESSIO)
+		goto done;
+
+	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
+		goto err;
+
+	if (td->o.fadvise_hint) {
+		int flags;
+
+		if (td_random(td))
+			flags = POSIX_FADV_RANDOM;
+		else
+			flags = POSIX_FADV_SEQUENTIAL;
+
+		if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
+			td_verror(td, errno, "fadvise");
+			goto err;
+		}
+	}
 
 	if (f->file_map)
 		memset(f->file_map, 0, f->num_maps * sizeof(long));
 
+done:
 	td->nr_open_files++;
+	get_file(f);
 	return 0;
+err:
+	td->io_ops->close_file(td, f);
+	return 1;
 }
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
-	if (f->open) {
-		if (td->io_ops->close_file)
-			td->io_ops->close_file(td, f);
-		td->nr_open_files--;
-		f->open = 0;
-	}
+	/*
+	 * mark as closing, do real close when last io on it has completed
+	 */
+	f->flags |= FIO_FILE_CLOSING;
+
+	put_file(td, f);
 }
+