Make sure that exec_prerun/postrun work for shell commands

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index f0665e072ccbd5f6ac3f4dcd52a5edfe015cbf31..62fab49c17ea4be20e416344f90c9278333976f2 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -52,6 +52,7 @@ int temp_stall_ts;
 unsigned long done_secs = 0;
 
 static struct fio_mutex *startup_mutex;
+static struct fio_mutex *writeout_mutex;
 static volatile int fio_abort;
 static int exit_value;
 static struct itimerval itimer;
@@ -924,6 +925,22 @@ static void clear_io_state(struct thread_data *td)
                f->flags &= ~FIO_FILE_DONE;
 }
 
+static int exec_string(const char *string)
+{
+       int ret, newlen = strlen(string) + 1 + 8;
+       char *str;
+
+       str = malloc(newlen);
+       sprintf(str, "sh -c %s", string);
+
+       ret = system(str);
+       if (ret == -1)
+               log_err("fio: exec of cmd <%s> failed\n", str);
+
+       free(str);
+       return ret;
+}
+
 /*
  * Entry point for the thread based jobs. The process based jobs end up
  * here as well, after a little setup.
@@ -1013,7 +1030,12 @@ static void *thread_main(void *data)
                goto err;
 
        if (td->o.exec_prerun) {
-               if (system(td->o.exec_prerun) < 0)
+               if (exec_string(td->o.exec_prerun))
+                       goto err;
+       }
+
+       if (td->o.pre_read) {
+               if (pre_read_files(td) < 0)
                        goto err;
        }
 
@@ -1086,6 +1108,7 @@ static void *thread_main(void *data)
        td->ts.io_bytes[0] = td->io_bytes[0];
        td->ts.io_bytes[1] = td->io_bytes[1];
 
+       fio_mutex_down(writeout_mutex);
        if (td->ts.bw_log) {
                if (td->o.bw_log_file) {
                        finish_log_named(td, td->ts.bw_log,
@@ -1107,10 +1130,9 @@ static void *thread_main(void *data)
                } else
                        finish_log(td, td->ts.clat_log, "clat");
        }
-       if (td->o.exec_postrun) {
-               if (system(td->o.exec_postrun) < 0)
-                       log_err("fio: postrun %s failed\n", td->o.exec_postrun);
-       }
+       fio_mutex_up(writeout_mutex);
+       if (td->o.exec_postrun)
+               exec_string(td->o.exec_postrun);
 
        if (exitall_on_terminate)
                terminate_threads(td->groupid);
@@ -1554,6 +1576,7 @@ int main(int argc, char *argv[])
        }
 
        startup_mutex = fio_mutex_init(0);
+       writeout_mutex = fio_mutex_init(1);
 
        set_genesis_time();
 
@@ -1571,5 +1594,6 @@ int main(int argc, char *argv[])
        }
 
        fio_mutex_remove(startup_mutex);
+       fio_mutex_remove(writeout_mutex);
        return exit_value;
 }