Fix bug with stonewall option causing segfault

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 4ab08ce7472ca806573cf4fcb9875c96645c9b5f..998c13ee7ce96c1123ec913e550ef0d6519d63d7 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);
 
@@ -263,8 +262,14 @@ 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;
+       }
 
        f->last_free_lookup = 0;
        f->last_completed_pos = 0;
@@ -272,12 +277,36 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        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) {
+               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:
+       td->io_ops->close_file(td, f);
+       return 1;
 }
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)