Normal vs special files fixups

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 66991c7cce1f3bb93b6b73981f43e5d3b82039ad..185314f05fd41f7bb6291217012f8c7f6f3f8beb 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;
@@ -208,8 +202,13 @@ 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 || ret == FIO_Q_COMPLETED)
+               get_file(io_u->file);
+
        if (ret == FIO_Q_QUEUED) {
                int r;
 
@@ -263,21 +262,24 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        f->last_free_lookup = 0;
        f->last_completed_pos = 0;
        f->last_pos = 0;
-       f->open = 1;
+       f->flags |= FIO_FILE_OPEN;
+       f->flags &= ~FIO_FILE_CLOSING;
 
        if (f->file_map)
                memset(f->file_map, 0, f->num_maps * sizeof(long));
 
        td->nr_open_files++;
+       get_file(f);
        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;
-       }
+       /*
+        * mark as closing, do real close when last io on it has completed
+        */
+       f->flags |= FIO_FILE_CLOSING;
+
+       put_file(td, f);
 }
+