[PATCH] Fix fileoffset option

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 3e8d886ae89c95c155e61608b622fb97af4ac3b5..8cdabe6f2551dd5217d1927f46a0836b8ac8a053 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);
 
@@ -193,6 +192,7 @@ 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));
 
                /*
                 * for a sync engine, set the timeout upfront
@@ -208,9 +208,6 @@ int td_io_queue(struct thread_data *td, struct io_u *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;
 
@@ -224,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
@@ -263,31 +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)) {
-               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 (f->file_map)
-                       memset(f->file_map, 0, f->num_maps * sizeof(long));
-
-               td->nr_open_files++;
-               get_file(f);
-               return 0;
+       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;
+               }
        }
 
-       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);
+       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;
+
+       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:
+       log_file(td, f, FIO_LOG_OPEN_FILE);
+       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_CLOSING))
+               log_file(td, f, FIO_LOG_CLOSE_FILE);
+
        /*
         * mark as closing, do real close when last io on it has completed
         */
@@ -295,4 +331,3 @@ void td_io_close_file(struct thread_data *td, struct fio_file *f)
 
        put_file(td, f);
 }
-