projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into client-server
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 6066fc59ca2bc7f159e1862bec8a4e93b6824608..142a1637b43bd108a1d34e16a3ac6349a2dfbc54 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-37,6
+37,7
@@
static char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \
static char **ini_file;
static int max_jobs = FIO_MAX_JOBS;
static int dump_cmdline;
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;
static struct thread_data def_thread;
struct thread_data *threads = NULL;
@@
-1083,6
+1084,7
@@
static int fill_def_thread(void)
memset(&def_thread, 0, sizeof(def_thread));
fio_getaffinity(getpid(), &def_thread.o.cpumask);
memset(&def_thread, 0, sizeof(def_thread));
fio_getaffinity(getpid(), &def_thread.o.cpumask);
+ def_thread.o.timeout = def_timeout;
/*
* fill default options
/*
* fill default options
@@
-1240,7
+1242,7
@@
int parse_cmd_line(int argc, char *argv[])
break;
case 't':
fio_client_add_cmd_option(cur_client, argv[optind-1]);
break;
case 't':
fio_client_add_cmd_option(cur_client, argv[optind-1]);
- def_t
hread.o.t
imeout = atoi(optarg);
+ def_timeout = atoi(optarg);
break;
case 'l':
fio_client_add_cmd_option(cur_client, argv[optind-1]);
break;
case 'l':
fio_client_add_cmd_option(cur_client, argv[optind-1]);