X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=ioengines.c;h=3e17897653f6a8d57a6a18a3b65297bfdd72653c;hb=3c48c2c1c702047f8a92fa21fdd1471781b9dab4;hp=d3ee4b98e3dc3741c614ea366c2c21378c8405b8;hpb=d8005759746a2cb5c8269201911b1997aa714e80;p=fio.git

diff --git a/ioengines.c b/ioengines.c
index d3ee4b98..3e178976 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -18,7 +18,7 @@
 
 #include "fio.h"
 
-static LIST_HEAD(engine_list);
+static FLIST_HEAD(engine_list);
 
 static int check_engine_ops(struct ioengine_ops *ops)
 {
@@ -58,24 +58,24 @@ 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);
+	flist_del(&ops->list);
+	INIT_FLIST_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);
+	INIT_FLIST_HEAD(&ops->list);
+	flist_add_tail(&ops->list, &engine_list);
 }
 
 static struct ioengine_ops *find_ioengine(const char *name)
 {
 	struct ioengine_ops *ops;
-	struct list_head *entry;
+	struct flist_head *entry;
 
-	list_for_each(entry, &engine_list) {
-		ops = list_entry(entry, struct ioengine_ops, list);
+	flist_for_each(entry, &engine_list) {
+		ops = flist_entry(entry, struct ioengine_ops, list);
 		if (!strcmp(name, ops->name))
 			return ops;
 	}
@@ -154,8 +154,10 @@ void close_ioengine(struct thread_data *td)
 {
 	dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
 
-	if (td->io_ops->cleanup)
+	if (td->io_ops->cleanup) {
 		td->io_ops->cleanup(td);
+		td->io_ops->data = NULL;
+	}
 
 	if (td->io_ops->dlhandle)
 		dlclose(td->io_ops->dlhandle);
@@ -198,6 +200,8 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
 	if (td->io_ops->getevents)
 		r = td->io_ops->getevents(td, min, max, t);
 out:
+	if (r >= 0)
+		io_u_mark_complete(td, r);
 	dprint(FD_IO, "getevents: %d\n", r);
 	return r;
 }
@@ -237,6 +241,11 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	unlock_file(td, io_u->file);
 
+	if (!td->io_ops->commit) {
+		io_u_mark_submit(td, 1);
+		io_u_mark_complete(td, 1);
+	}
+
 	if (ret == FIO_Q_COMPLETED) {
 		if (io_u->ddir != DDIR_SYNC) {
 			io_u_mark_depth(td, 1);
@@ -327,8 +336,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 		}
 	}
 
-	f->last_free_lookup = 0;
-	f->last_pos = f->file_offset;
+	fio_file_reset(f);
 	f->flags |= FIO_FILE_OPEN;
 	f->flags &= ~FIO_FILE_CLOSING;
 
@@ -354,7 +362,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 	}
 
 	if (f->file_map)
-		memset(f->file_map, 0, f->num_maps * sizeof(long));
+		memset(f->file_map, 0, f->num_maps * sizeof(int));
 
 done:
 	log_file(td, f, FIO_LOG_OPEN_FILE);