Move thread options into a seperate structure

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 9de7ca16b2e3401ed877859db41f1047d957dd07..0e5ea62d0d5cb59d62c5e8929d13a7b9526e40b0 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->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;
 
        io_u->error = 0;
        io_u->resid = 0;
 


@@ -202,13 +204,18 @@ 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]++;
 
        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);
 
        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;
 
                td->io_u_queued++;
        if (ret == FIO_Q_QUEUED) {
                int r;
 
                td->io_u_queued++;

-               if (td->io_u_queued > td->iodepth_batch) {
+               if (td->io_u_queued > td->o.iodepth_batch) {

                        r = td_io_commit(td);
                        if (r < 0)
                                return r;
                        r = td_io_commit(td);
                        if (r < 0)
                                return r;


@@ -257,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->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++;
 
        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)
 {
        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);

 }
 }

+