#include "profile.h"
#include "server.h"
#include "idletime.h"
+#include "filelock.h"
#include "lib/getopt.h"
#include "lib/strcasestr.h"
static char **ini_file;
static int max_jobs = FIO_MAX_JOBS;
static int dump_cmdline;
-static int def_timeout;
+static long long def_timeout;
static int parse_only;
static struct thread_data def_thread;
}
options_free(fio_options, &def_thread);
+ fio_filelock_exit();
scleanup();
}
return 0;
}
+static void set_cmd_options(struct thread_data *td)
+{
+ struct thread_options *o = &td->o;
+
+ if (!o->timeout)
+ o->timeout = def_timeout;
+}
+
/*
* Return a free job structure.
*/
{
struct thread_data *td;
- if (global)
+ if (global) {
+ set_cmd_options(&def_thread);
return &def_thread;
+ }
if (setup_thread_area()) {
log_err("error: failed to setup shm segment\n");
return NULL;
if (!parent || !parent->o.group_reporting)
stat_number++;
+ set_cmd_options(td);
return td;
}
memset(&def_thread, 0, sizeof(def_thread));
fio_getaffinity(getpid(), &def_thread.o.cpumask);
- def_thread.o.timeout = def_timeout;
def_thread.o.error_dump = 1;
+
/*
* fill default options
*/
smalloc_pool_size = atoi(optarg);
break;
case 't':
- def_timeout = atoi(optarg);
+ if (check_str_time(optarg, &def_timeout, 1)) {
+ log_err("fio: failed parsing time %s\n", optarg);
+ do_exit++;
+ exit_val = 1;
+ }
break;
case 'l':
write_lat_log = 1;
if (job_files > 0) {
for (i = 0; i < job_files; i++) {
- if (fill_def_thread())
+ if (i && fill_def_thread())
return 1;
if (nr_clients) {
if (fio_clients_send_ini(ini_file[i]))