X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=0435dd02fa197a9731d5c123432bba54cd606152;hp=f55e5d71b3abcdfd6c03a3a0d0ff5bffdab62cc3;hb=15b87723551b424d0db4c53577b567e670c7d4d8;hpb=f57a9c59e366aa2f0621aa260bfd5ef5aeb61643 diff --git a/init.c b/init.c index f55e5d71..0435dd02 100644 --- 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.59"; #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;