X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=9de7ca16b2e3401ed877859db41f1047d957dd07;hp=a7ccad66f810b982b7a0d15b355aa6efcbde0334;hb=9cedf16704b71cec33138bb4cf524d3fc9ad338a;hpb=bc5b77a8c46aabea554c4a2c8cca37f27f97969a

diff --git a/ioengines.c b/ioengines.c
index a7ccad66..9de7ca16 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;
@@ -158,10 +152,7 @@ void close_ioengine(struct thread_data *td)
 	if (td->io_ops->dlhandle)
 		dlclose(td->io_ops->dlhandle);
 
-#if 0
-	/* we can't do this for threads, so just leak it, it's exiting */
 	free(td->io_ops);
-#endif
 	td->io_ops = NULL;
 }
 
@@ -195,6 +186,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);
 
@@ -254,3 +248,30 @@ 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))
+		return 1;
+
+	f->last_free_lookup = 0;
+	f->last_completed_pos = 0;
+	f->last_pos = 0;
+	f->open = 1;
+
+	if (f->file_map)
+		memset(f->file_map, 0, f->num_maps * sizeof(long));
+
+	td->nr_open_files++;
+	return 0;
+}
+
+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;
+	}
+}