Don't print 100% done, when we don't have a time estimate yet

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 3e17897653f6a8d57a6a18a3b65297bfdd72653c..8975591d080acb0efc55894e2f40ec830df9d1fd 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -329,6 +329,13 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
+       fio_file_reset(f);
+       f->flags |= FIO_FILE_OPEN;
+       f->flags &= ~FIO_FILE_CLOSING;
+
+       td->nr_open_files++;
+       get_file(f);
+
        if (f->filetype == FIO_TYPE_PIPE) {
                if (td_random(td)) {
                        log_err("fio: can't seek on pipes (no random io)\n");
@@ -336,10 +343,6 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       fio_file_reset(f);
-       f->flags |= FIO_FILE_OPEN;
-       f->flags &= ~FIO_FILE_CLOSING;
-
        if (td->io_ops->flags & FIO_DISKLESSIO)
                goto done;
 
@@ -364,10 +367,23 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        if (f->file_map)
                memset(f->file_map, 0, f->num_maps * sizeof(int));
 
+#ifdef FIO_OS_DIRECTIO
+       /*
+        * Some OS's have a distinct call to mark the file non-buffered,
+        * instead of using O_DIRECT (Solaris)
+        */
+       if (td->o.odirect) {
+               int ret = fio_set_odirect(f->fd);
+
+               if (ret) {
+                       td_verror(td, ret, "fio_set_odirect");
+                       goto err;
+               }
+       }
+#endif
+
 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)