Show IOPS as well as bw numbers

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index a395da15a95c113fb241981eb84b1fc32c009fd0..88e91ccbbf0b2f29b422f9be5552930bf010dcfd 100644 (file)
--- 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;
 }
 
@@ -211,6 +202,8 @@ 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) {
@@ -257,3 +250,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;
+       }
+}