Don't overwrite -t timeout setting in fill_def_thread()

[fio.git] / init.c

diff --git a/init.c b/init.c
index f55e5d71b3abcdfd6c03a3a0d0ff5bffdab62cc3..4eb0df2def2e529ca5a3165e506d0775f8a10ab0 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,13 +22,14 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.57";
+static char fio_version_string[] = "fio 1.58";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
 static char **ini_file;
 static int max_jobs = FIO_MAX_JOBS;
 static int dump_cmdline;
+static int def_timeout;
 
 static struct thread_data def_thread;
 struct thread_data *threads = NULL;
@@ -959,6 +960,7 @@ static int fill_def_thread(void)
        memset(&def_thread, 0, sizeof(def_thread));
 
        fio_getaffinity(getpid(), &def_thread.o.cpumask);
+       def_thread.o.timeout = def_timeout;
 
        /*
         * fill default options
@@ -1173,7 +1175,7 @@ static int parse_cmd_line(int argc, char *argv[])
                        smalloc_pool_size = atoi(optarg);
                        break;
                case 't':
-                       def_thread.o.timeout = atoi(optarg);
+                       def_timeout = atoi(optarg);
                        break;
                case 'l':
                        write_lat_log = 1;