Revert "filesetup: don't call create_work_dirs() for ioengine with FIO_DISKLESSIO"

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index d64cc9922114b48cc241f9e3b6d67e52767dabc7..1c339408fa5fd0338cdd0e98444b5a7a2fa509a8 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -281,6 +281,7 @@ static bool fio_io_sync(struct thread_data *td, struct fio_file *f)
 
        io_u->ddir = DDIR_SYNC;
        io_u->file = f;
+       io_u_set(td, io_u, IO_U_F_NO_FILE_PUT);
 
        if (td_io_prep(td, io_u)) {
                put_io_u(td, io_u);
@@ -314,7 +315,7 @@ requeue:
 
 static int fio_file_fsync(struct thread_data *td, struct fio_file *f)
 {
-       int ret;
+       int ret, ret2;
 
        if (fio_file_open(f))
                return fio_io_sync(td, f);
@@ -323,8 +324,10 @@ static int fio_file_fsync(struct thread_data *td, struct fio_file *f)
                return 1;
 
        ret = fio_io_sync(td, f);
-       td_io_close_file(td, f);
-       return ret;
+       ret2 = 0;
+       if (fio_file_open(f))
+               ret2 = td_io_close_file(td, f);
+       return (ret || ret2);
 }
 
 static inline void __update_ts_cache(struct thread_data *td)
@@ -1124,7 +1127,7 @@ reap:
                                td->error = 0;
                }
 
-               if (should_fsync(td) && td->o.end_fsync) {
+               if (should_fsync(td) && (td->o.end_fsync || td->o.fsync_on_close)) {
                        td_set_runstate(td, TD_FSYNCING);
 
                        for_each_file(td, f, i) {
@@ -1233,7 +1236,7 @@ static int init_io_u(struct thread_data *td)
                ptr = fio_memalign(cl_align, sizeof(*io_u), td_offload_overlap(td));
                if (!ptr) {
                        log_err("fio: unable to allocate aligned memory\n");
-                       break;
+                       return 1;
                }
 
                io_u = ptr;
@@ -1466,12 +1469,12 @@ static bool keep_running(struct thread_data *td)
 
 static int exec_string(struct thread_options *o, const char *string, const char *mode)
 {
-       size_t newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1;
+       size_t newlen = strlen(string) + strlen(o->name) + strlen(mode) + 13 + 1;
        int ret;
        char *str;
 
        str = malloc(newlen);
-       sprintf(str, "%s &> %s.%s.txt", string, o->name, mode);
+       sprintf(str, "%s > %s.%s.txt 2>&1", string, o->name, mode);
 
        log_info("%s : Saving output of %s in %s.%s.txt\n",o->name, mode, o->name, mode);
        ret = system(str);
@@ -1698,9 +1701,15 @@ static void *thread_main(void *data)
        if (!init_iolog(td))
                goto err;
 
+       if (td_io_init(td))
+               goto err;
+
        if (init_io_u(td))
                goto err;
 
+       if (td->io_ops->post_init && td->io_ops->post_init(td))
+               goto err;
+
        if (o->verify_async && verify_async_init(td))
                goto err;
 
@@ -1728,9 +1737,6 @@ static void *thread_main(void *data)
        if (!o->create_serialize && setup_files(td))
                goto err;
 
-       if (td_io_init(td))
-               goto err;
-
        if (!init_random_map(td))
                goto err;