blktrace replay: delay support

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 02455b8540af5644e98918abd4b2a8eb03e6b737..feb986a844bba2342c5844094bacc89f6ed26821 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "fio.h"
-#include "os.h"
 
 static LIST_HEAD(engine_list);
 
@@ -186,11 +185,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);
+
        io_u->error = 0;
        io_u->resid = 0;
 
        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));
 
                /*
                 * for a sync engine, set the timeout upfront
@@ -210,7 +212,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                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;
@@ -219,6 +221,7 @@ 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));
 
                /*
                 * async engine, set the timeout here
@@ -233,10 +236,15 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 int td_io_init(struct thread_data *td)
 {
-       if (td->io_ops->init)
-               return td->io_ops->init(td);
+       int ret = 0;
 
-       return 0;
+       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 dpeth?\n");
+       }
+
+       return ret;
 }
 
 int td_io_commit(struct thread_data *td)
@@ -253,27 +261,69 @@ int td_io_commit(struct thread_data *td)
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
-       if (td->io_ops->open_file(td, 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);
+
                return 1;
+       }
+
+       if (f->filetype == FIO_TYPE_PIPE) {
+               if (td_random(td)) {
+                       log_err("fio: can't seek on pipes (no random io)\n");
+                       goto err;
+               }
+       }
 
        f->last_free_lookup = 0;
        f->last_completed_pos = 0;
        f->last_pos = 0;
        f->flags |= FIO_FILE_OPEN;
+       f->flags &= ~FIO_FILE_CLOSING;
+
+       if (td->io_ops->flags & FIO_DISKLESSIO)
+               goto done;
+
+       if (td->o.invalidate_cache && file_invalidate_cache(td, f))
+               goto err;
+
+       if (td->o.fadvise_hint &&
+           (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
+               
+               int flags;
+
+               if (td_random(td))
+                       flags = POSIX_FADV_RANDOM;
+               else
+                       flags = POSIX_FADV_SEQUENTIAL;
+
+               if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
+                       td_verror(td, errno, "fadvise");
+                       goto err;
+               }
+       }
 
        if (f->file_map)
                memset(f->file_map, 0, f->num_maps * sizeof(long));
 
+done:
        td->nr_open_files++;
+       get_file(f);
        return 0;
+err:
+       if (td->io_ops->close_file)
+               td->io_ops->close_file(td, f);
+       return 1;
 }
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
-       if (f->flags & FIO_FILE_OPEN) {
-               if (td->io_ops->close_file)
-                       td->io_ops->close_file(td, f);
-               td->nr_open_files--;
-               f->flags &= ~FIO_FILE_OPEN;
-       }
+       /*
+        * mark as closing, do real close when last io on it has completed
+        */
+       f->flags |= FIO_FILE_CLOSING;
+
+       put_file(td, f);
 }