X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=9d7453bafcaef77ce32b64d76d99c5d033600555;hp=2cc328883d806497b4f9028919cefe360ef3a377;hb=b5af82930ccfd7dda6a1b11794efb452eb76d8dc;hpb=cb5ab5121ac4fa62e0ca2612b359f19bfdd30f29

diff --git a/ioengines.c b/ioengines.c
index 2cc32888..9d7453ba 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -77,16 +77,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;
 	}
 
@@ -201,6 +195,9 @@ 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;
 
+	io_u->error = 0;
+	io_u->resid = 0;
+
 	if (td->io_ops->flags & FIO_SYNCIO) {
 		fio_gettime(&io_u->issue_time, NULL);
 
@@ -216,8 +213,16 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	ret = td->io_ops->queue(td, io_u);
 
-	if (ret == FIO_Q_QUEUED)
+	if (ret == FIO_Q_QUEUED) {
+		int r;
+
 		td->io_u_queued++;
+		if (td->io_u_queued > td->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);
@@ -252,3 +257,20 @@ int td_io_commit(struct thread_data *td)
 
 	return 0;
 }
+
+int td_io_open_file(struct thread_data *td, struct fio_file *f)
+{
+	if (!td->io_ops->open_file(td, f)) {
+		td->nr_open_files++;
+		return 0;
+	}
+
+	return 1;
+}
+
+void td_io_close_file(struct thread_data *td, struct fio_file *f)
+{
+	if (td->io_ops->close_file)
+		td->io_ops->close_file(td, f);
+	td->nr_open_files--;
+}