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

diff --git a/ioengines.c b/ioengines.c
index 66991c7c..c0e30c9b 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;
@@ -63,12 +56,14 @@ static int check_engine_ops(struct ioengine_ops *ops)
 
 void unregister_ioengine(struct ioengine_ops *ops)
 {
+	dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
 	list_del(&ops->list);
 	INIT_LIST_HEAD(&ops->list);
 }
 
 void register_ioengine(struct ioengine_ops *ops)
 {
+	dprint(FD_IO, "ioengine %s registered\n", ops->name);
 	INIT_LIST_HEAD(&ops->list);
 	list_add_tail(&ops->list, &engine_list);
 }
@@ -93,6 +88,8 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
 	struct ioengine_ops *ops;
 	void *dlhandle;
 
+	dprint(FD_IO, "dload engine %s\n", engine_lib);
+
 	dlerror();
 	dlhandle = dlopen(engine_lib, RTLD_LAZY);
 	if (!dlhandle) {
@@ -120,6 +117,8 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 	struct ioengine_ops *ops, *ret;
 	char engine[16];
 
+	dprint(FD_IO, "load ioengine %s\n", name);
+
 	strncpy(engine, name, sizeof(engine) - 1);
 
 	/*
@@ -152,6 +151,8 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 
 void close_ioengine(struct thread_data *td)
 {
+	dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
+
 	if (td->io_ops->cleanup)
 		td->io_ops->cleanup(td);
 
@@ -162,41 +163,65 @@ void close_ioengine(struct thread_data *td)
 	td->io_ops = NULL;
 }
 
+static void dprint_io_u(struct io_u *io_u, const char *p)
+{
+	struct fio_file *f = io_u->file;
+
+	dprint(FD_IO, "%s: off=%llu/len=%lu/ddir=%d", p, io_u->offset,
+					io_u->buflen, io_u->ddir);
+	if (f)
+		dprint(FD_IO, "/%s", f->file_name);
+	dprint(FD_IO, "\n");
+}
+
 int td_io_prep(struct thread_data *td, struct io_u *io_u)
 {
+	dprint_io_u(io_u, "prep");
+	fio_ro_check(td, io_u);
+
 	if (td->io_ops->prep)
 		return td->io_ops->prep(td, io_u);
 
 	return 0;
 }
 
-int td_io_getevents(struct thread_data *td, int min, int max,
+int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
 		    struct timespec *t)
 {
-	if (min > 0 && td->io_ops->commit) {
-		int r = td->io_ops->commit(td);
+	int r = 0;
 
+	if (min > 0 && td->io_ops->commit) {
+		r = td->io_ops->commit(td);
 		if (r < 0)
-			return r;
+			goto out;
 	}
-	if (td->io_ops->getevents)
-		return td->io_ops->getevents(td, min, max, t);
 
-	return 0;
+	r = 0;
+	if (td->io_ops->getevents)
+		r = td->io_ops->getevents(td, min, max, t);
+out:
+	dprint(FD_IO, "getevents: %d\n", r);
+	return r;
 }
 
 int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
 	int ret;
 
+	dprint_io_u(io_u, "queue");
+	fio_ro_check(td, 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;
 
 	if (td->io_ops->flags & FIO_SYNCIO) {
 		fio_gettime(&io_u->issue_time, NULL);
+		memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
 
 		/*
 		 * for a sync engine, set the timeout upfront
@@ -208,13 +233,15 @@ 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) {
 		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;
@@ -223,6 +250,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
 		fio_gettime(&io_u->issue_time, NULL);
+		memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
 
 		/*
 		 * async engine, set the timeout here
@@ -237,14 +265,21 @@ 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 depth?\n");
+	}
+
+	return ret;
 }
 
 int td_io_commit(struct thread_data *td)
 {
+	dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
+
 	if (!td->cur_depth)
 		return 0;
 
@@ -257,27 +292,73 @@ 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;
+	}
+
+	if (f->filetype == FIO_TYPE_PIPE) {
+		if (td_random(td)) {
+			log_err("fio: can't seek on pipes (no random io)\n");
+			goto err;
+		}
+	}
 
 	f->last_free_lookup = 0;
 	f->last_completed_pos = 0;
-	f->last_pos = 0;
-	f->open = 1;
+	f->last_pos = f->file_offset;
+	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 &&
+	    (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
+		
+		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:
+	log_file(td, f, FIO_LOG_OPEN_FILE);
 	td->nr_open_files++;
+	get_file(f);
 	return 0;
+err:
+	if (td->io_ops->close_file)
+		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;
-	}
+	if (!(f->flags & FIO_FILE_CLOSING))
+		log_file(td, f, FIO_LOG_CLOSE_FILE);
+
+	/*
+	 * mark as closing, do real close when last io on it has completed
+	 */
+	f->flags |= FIO_FILE_CLOSING;
+
+	put_file(td, f);
 }