Fix ETA display for iolog replay

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 34ae91671a4348c43bacdf9f7eddc2f5e81f020d..8cdabe6f2551dd5217d1927f46a0836b8ac8a053 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -192,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
@@ -207,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;
 
@@ -223,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
@@ -280,7 +279,7 @@ 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_pos = f->file_offset;
        f->flags |= FIO_FILE_OPEN;
        f->flags &= ~FIO_FILE_CLOSING;
 
@@ -310,6 +309,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                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;
@@ -321,6 +321,9 @@ err:
 
 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
         */