Fix bad interaction with file open/close and queuing

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index bd2eb4a71ed899f2b7d3857d97ce87312b05aa2e..9e1c55639a477db0031b9b8583aeb7b87deb73a5 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -23,7 +23,8 @@ static LIST_HEAD(engine_list);
 static int check_engine_ops(struct ioengine_ops *ops)
 {
        if (ops->version != FIO_IOOPS_VERSION) {
-               log_err("bad ioops version %d (want %d)\n", ops->version, FIO_IOOPS_VERSION);
+               log_err("bad ioops version %d (want %d)\n", ops->version,
+                                                       FIO_IOOPS_VERSION);
                return 1;
        }
 
@@ -37,7 +38,7 @@ static int check_engine_ops(struct ioengine_ops *ops)
         */
        if (ops->flags & FIO_SYNCIO)
                return 0;
-       
+
        if (!ops->event) {
                log_err("%s: no event handler\n", ops->name);
                return 1;
@@ -50,7 +51,7 @@ static int check_engine_ops(struct ioengine_ops *ops)
                log_err("%s: no queue handler\n", ops->name);
                return 1;
        }
-               
+
        return 0;
 }
 
@@ -168,14 +169,14 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
        dprint_io_u(io_u, "prep");
        fio_ro_check(td, io_u);
 
-       lock_file(td, io_u->file);
+       lock_file(td, io_u->file, io_u->ddir);
 
        if (td->io_ops->prep) {
                int ret = td->io_ops->prep(td, io_u);
 
                dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
                if (ret)
-                       unlock_file(io_u->file);
+                       unlock_file(td, io_u->file);
                return ret;
        }
 
@@ -218,12 +219,14 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        if (td->io_ops->flags & FIO_SYNCIO) {
                fio_gettime(&io_u->issue_time, NULL);
-               memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
+               memcpy(&td->last_issue, &io_u->issue_time,
+                                       sizeof(struct timeval));
 
                /*
                 * for a sync engine, set the timeout upfront
                 */
-               if (mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+               if (mtime_since(&td->timeout_end, &io_u->issue_time)
+                   < IO_U_TIMEOUT)
                        io_u_set_timeout(td);
        }
 
@@ -232,16 +235,22 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        ret = td->io_ops->queue(td, io_u);
 
-       unlock_file(io_u->file);
-
-       if (ret != FIO_Q_BUSY)
-               io_u_mark_depth(td, io_u);
+       unlock_file(td, io_u->file);
 
-       if (ret == FIO_Q_QUEUED) {
+       if (ret == FIO_Q_COMPLETED) {
+               if (io_u->ddir != DDIR_SYNC) {
+                       io_u_mark_depth(td, 1);
+                       td->ts.total_io_u[io_u->ddir]++;
+               }
+       } else if (ret == FIO_Q_QUEUED) {
                int r;
 
-               td->io_u_queued++;
-               if (td->io_u_queued > td->o.iodepth_batch) {
+               if (io_u->ddir != DDIR_SYNC) {
+                       td->io_u_queued++;
+                       td->ts.total_io_u[io_u->ddir]++;
+               }
+
+               if (td->io_u_queued >= td->o.iodepth_batch) {
                        r = td_io_commit(td);
                        if (r < 0)
                                return r;
@@ -250,14 +259,17 @@ 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);
-               memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
+               memcpy(&td->last_issue, &io_u->issue_time,
+                               sizeof(struct timeval));
 
                /*
                 * async engine, set the timeout here
                 */
                if (ret == FIO_Q_QUEUED &&
-                   mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+                   (mtime_since(&td->timeout_end, &io_u->issue_time)
+                       < IO_U_TIMEOUT)) {
                        io_u_set_timeout(td);
+               }
        }
 
        return ret;
@@ -269,8 +281,10 @@ int td_io_init(struct thread_data *td)
 
        if (td->io_ops->init) {
                ret = td->io_ops->init(td);
-               if (ret && td->o.iodepth > 1)
-                       log_err("fio: io engine init failed. Perhaps try reducing io depth?\n");
+               if (ret && td->o.iodepth > 1) {
+                       log_err("fio: io engine init failed. Perhaps try"
+                               " reducing io depth?\n");
+               }
        }
 
        return ret;
@@ -280,10 +294,12 @@ int td_io_commit(struct thread_data *td)
 {
        dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
 
-       if (!td->cur_depth)
+       if (!td->cur_depth || !td->io_u_queued)
                return 0;
 
+       io_u_mark_depth(td, td->io_u_queued);
        td->io_u_queued = 0;
+
        if (td->io_ops->commit)
                return td->io_ops->commit(td);
 
@@ -295,8 +311,11 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        if (td->io_ops->open_file(td, f)) {
                if (td->error == EINVAL && td->o.odirect)
                        log_err("fio: destination does not support O_DIRECT\n");
-               if (td->error == EMFILE)
-                       log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+               if (td->error == EMFILE) {
+                       log_err("fio: try reducing/setting openfiles (failed"
+                               " at %u of %u)\n", td->nr_open_files,
+                                                       td->o.nr_files);
+               }
 
                return 1;
        }
@@ -308,8 +327,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       f->last_free_lookup = 0;
-       f->last_pos = f->file_offset;
+       fio_file_reset(f);
        f->flags |= FIO_FILE_OPEN;
        f->flags &= ~FIO_FILE_CLOSING;
 
@@ -321,7 +339,6 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 
        if (td->o.fadvise_hint &&
            (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
-               
                int flags;
 
                if (td_random(td))
@@ -359,10 +376,7 @@ int td_io_close_file(struct thread_data *td, struct fio_file *f)
         */
        f->flags |= FIO_FILE_CLOSING;
 
-       if (f->sem_owner == td && f->sem_batch) {
-               f->sem_batch = 0;
-               unlock_file(f);
-       }
+       unlock_file_all(td, f);
 
        return put_file(td, f);
 }