Clean up file flags

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 3ef0d032938a11062ba513fe5154ba9b6b04d678..7840d2a86abb1447a3b5daeb7135ff225b275593 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -220,13 +220,14 @@ 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);
+       assert(fio_file_open(io_u->file));
 
        io_u->error = 0;
        io_u->resid = 0;
 
        if (td->io_ops->flags & FIO_SYNCIO) {
-               fio_gettime(&io_u->issue_time, NULL);
+               if (fio_fill_issue_time(td))
+                       fio_gettime(&io_u->issue_time, NULL);
 
                /*
                 * only used for iolog
@@ -269,7 +270,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        }
 
        if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
-               fio_gettime(&io_u->issue_time, NULL);
+               if (fio_fill_issue_time(td))
+                       fio_gettime(&io_u->issue_time, NULL);
 
                /*
                 * only used for iolog
@@ -328,8 +330,9 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        }
 
        fio_file_reset(f);
-       f->flags |= FIO_FILE_OPEN;
-       f->flags &= ~FIO_FILE_CLOSING;
+       fio_file_set_open(f);
+       fio_file_clear_closing(f);
+       disk_util_inc(f->du);
 
        td->nr_open_files++;
        get_file(f);
@@ -384,6 +387,7 @@ done:
        log_file(td, f, FIO_LOG_OPEN_FILE);
        return 0;
 err:
+       disk_util_dec(f->du);
        if (td->io_ops->close_file)
                td->io_ops->close_file(td, f);
        return 1;
@@ -391,15 +395,24 @@ err:
 
 int td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
-       if (!(f->flags & FIO_FILE_CLOSING))
+       if (!fio_file_closing(f))
                log_file(td, f, FIO_LOG_CLOSE_FILE);
 
        /*
         * mark as closing, do real close when last io on it has completed
         */
-       f->flags |= FIO_FILE_CLOSING;
+       fio_file_set_closing(f);
 
+       disk_util_dec(f->du);
        unlock_file_all(td, f);
 
        return put_file(td, f);
 }
+
+int td_io_get_file_size(struct thread_data *td, struct fio_file *f)
+{
+       if (!td->io_ops->get_file_size)
+               return 0;
+
+       return td->io_ops->get_file_size(td, f);
+}