Check for open files on io operations

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 88e91ccbbf0b2f29b422f9be5552930bf010dcfd..b18bc9a2010efe7cd22cf5993e1e11d492976c35 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -186,6 +186,8 @@ 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;
 
+       assert(io_u->file->flags & FIO_FILE_OPEN);
+
        io_u->error = 0;
        io_u->resid = 0;
 
@@ -206,6 +208,9 @@ 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 || ret == FIO_Q_COMPLETED)
+               get_file(io_u->file);
+
        if (ret == FIO_Q_QUEUED) {
                int r;
 
@@ -259,21 +264,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);
 }
+