Allow marking of queue depth for more than 1 io_u at the time

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index c0e30c9bbd90f21d574132becc7901504e3e337b..984c01ac7e6442a99868ee03388a684c654318e8 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;
 }
 
@@ -163,24 +164,21 @@ void close_ioengine(struct thread_data *td)
        td->io_ops = NULL;
 }
 
-static void dprint_io_u(struct io_u *io_u, const char *p)
-{
-       struct fio_file *f = io_u->file;
-
-       dprint(FD_IO, "%s: off=%llu/len=%lu/ddir=%d", p, io_u->offset,
-                                       io_u->buflen, io_u->ddir);
-       if (f)
-               dprint(FD_IO, "/%s", f->file_name);
-       dprint(FD_IO, "\n");
-}
-
 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);
 
-       if (td->io_ops->prep)
-               return td->io_ops->prep(td, io_u);
+       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(td, io_u->file);
+               return ret;
+       }
 
        return 0;
 }
@@ -221,22 +219,27 @@ 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);
        }
 
        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);
 
+       unlock_file(td, io_u->file);
+
+       if (ret != FIO_Q_BUSY)
+               io_u_mark_depth(td, io_u, 1);
+
        if (ret == FIO_Q_QUEUED) {
                int r;
 
@@ -250,14 +253,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 +275,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;
@@ -295,8 +303,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;
        }
@@ -309,7 +320,6 @@ 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 = f->file_offset;
        f->flags |= FIO_FILE_OPEN;
        f->flags &= ~FIO_FILE_CLOSING;
@@ -322,7 +332,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))
@@ -350,7 +359,7 @@ err:
        return 1;
 }
 
-void td_io_close_file(struct thread_data *td, struct fio_file *f)
+int td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
        if (!(f->flags & FIO_FILE_CLOSING))
                log_file(td, f, FIO_LOG_CLOSE_FILE);
@@ -360,5 +369,7 @@ void td_io_close_file(struct thread_data *td, struct fio_file *f)
         */
        f->flags |= FIO_FILE_CLOSING;
 
-       put_file(td, f);
+       unlock_file_all(td, f);
+
+       return put_file(td, f);
 }