#include "lib/getopt.h"
-static char fio_version_string[] = "fio 1.50-rc3";
+static char fio_version_string[] = "fio 1.51";
#define FIO_RANDSEED (0xb1899bedUL)
unsigned long long mlock_size = 0;
FILE *f_out = NULL;
FILE *f_err = NULL;
-char *job_section = NULL;
+char **job_sections = NULL;
+int nr_job_sections = 0;
char *exec_profile = NULL;
int warnings_fatal = 0;
unsigned int fio_debug_jobno = -1;
unsigned int *fio_debug_jobp = NULL;
+static char cmd_optstr[256];
+
/*
* Command line options. These will contain the above, plus a few
* extra that only pertain to fio itself and not jobs.
static int fixup_options(struct thread_data *td)
{
struct thread_options *o = &td->o;
- int ret;
+ int ret = 0;
#ifndef FIO_HAVE_PSHARED_MUTEX
if (!o->use_thread) {
o->size = -1ULL;
if (o->verify != VERIFY_NONE) {
- if (td_rw(td)) {
- log_info("fio: mixed read/write workload with verify. "
- "May not work as expected, unless you "
- "pre-populated the file\n");
- ret = warnings_fatal;
- }
- if (td_write(td) && o->numjobs) {
+ if (td_write(td) && o->do_verify && o->numjobs > 1) {
log_info("Multiple writers may overwrite blocks that "
"belong to other jobs. This can cause "
"verification failures.\n");
static int skip_this_section(const char *name)
{
- if (!job_section)
+ int i;
+
+ if (!nr_job_sections)
return 0;
if (!strncmp(name, "global", 6))
return 0;
- return strcmp(job_section, name);
+ for (i = 0; i < nr_job_sections; i++)
+ if (!strcmp(job_sections[i], name))
+ return 0;
+
+ return 1;
}
static int is_empty_or_comment(char *line)
int i;
if (!strcmp(string, "?") || !strcmp(string, "help")) {
- int i;
-
log_info("fio: dumping debug options:");
for (i = 0; debug_levels[i].name; i++) {
dl = &debug_levels[i];
}
#endif
+static void fio_options_fill_optstring(void)
+{
+ char *ostr = cmd_optstr;
+ int i, c;
+
+ c = i = 0;
+ while (l_opts[i].name) {
+ ostr[c++] = l_opts[i].val;
+ if (l_opts[i].has_arg == required_argument)
+ ostr[c++] = ':';
+ else if (l_opts[i].has_arg == optional_argument) {
+ ostr[c++] = ':';
+ ostr[c++] = ':';
+ }
+ i++;
+ }
+ ostr[c] = '\0';
+}
+
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
+ char *ostr = cmd_optstr;
- while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
+ while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
switch (c) {
case 'a':
smalloc_pool_size = atoi(optarg);
read_only = 1;
break;
case 'v':
- /* already being printed, just quit */
+ log_info("%s\n", fio_version_string);
exit(0);
case 'e':
if (!strcmp("always", optarg))
if (set_debug(optarg))
do_exit++;
break;
- case 'x':
+ case 'x': {
+ size_t new_size;
+
if (!strcmp(optarg, "global")) {
log_err("fio: can't use global as only "
"section\n");
exit_val = 1;
break;
}
- if (job_section)
- free(job_section);
- job_section = strdup(optarg);
+ new_size = (nr_job_sections + 1) * sizeof(char *);
+ job_sections = realloc(job_sections, new_size);
+ job_sections[nr_job_sections] = strdup(optarg);
+ nr_job_sections++;
break;
+ }
case 'p':
exec_profile = strdup(optarg);
break;
f_out = stdout;
f_err = stderr;
- log_info("%s\n", fio_version_string);
-
+ fio_options_fill_optstring();
fio_options_dup_and_init(l_opts);
if (setup_thread_area())
fio_gtod_cpu = def_thread.o.gtod_cpu;
}
+ log_info("%s\n", fio_version_string);
return 0;
}