#include "fio.h"
#include "parse.h"
-static char fio_version_string[] = "fio 1.15";
+static char fio_version_string[] = "fio 1.16.9";
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
static int max_jobs = MAX_JOBS;
+static int dump_cmdline;
struct thread_data def_thread;
struct thread_data *threads = NULL;
.has_arg = optional_argument,
.val = 'c',
},
+ {
+ .name = "showcmd",
+ .has_arg = no_argument,
+ .val = 's'
+ },
{
.name = NULL,
},
return 1;
}
+ if (!o->timeout && o->time_based) {
+ log_err("fio: time_based requires a runtime/timeout setting\n");
+ o->time_based = 0;
+ }
+
return 0;
}
if (td == &def_thread)
return 0;
+ /*
+ * if we are just dumping the output command line, don't add the job
+ */
+ if (dump_cmdline) {
+ put_job(td);
+ return 0;
+ }
+
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
if (fixup_options(td))
goto err;
+ if (td->io_ops->flags & FIO_DISKLESSIO) {
+ struct fio_file *f;
+
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
+ }
+
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
FILE *f;
char *p;
int ret = 0, stonewall;
+ int first_sect = 1;
f = fopen(file, "r");
if (!f) {
}
string = malloc(4096);
- name = malloc(256);
- memset(name, 0, 256);
+
+ /*
+ * it's really 256 + small bit, 280 should suffice
+ */
+ name = malloc(280);
+ memset(name, 0, 280);
stonewall = stonewall_flag;
do {
break;
strip_blank_front(&p);
+ strip_blank_end(p);
if (is_empty_or_comment(p))
continue;
- if (sscanf(p, "[%255s]", name) != 1)
- continue;
+ if (sscanf(p, "[%255s]", name) != 1) {
+ log_err("fio: option <%s> outside of [] job section\n", p);
+ break;
+ }
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
+ if (dump_cmdline) {
+ if (first_sect)
+ log_info("fio ");
+ if (!global)
+ log_info("--name=%s ", name);
+ first_sect = 0;
+ }
+
td = get_new_job(global, &def_thread);
if (!td) {
ret = 1;
* easier on the user.
*/
ret |= fio_option_parse(td, p);
+ if (!ret && dump_cmdline)
+ log_info("--%s ", p);
}
if (!ret) {
}
} while (!ret);
+ if (dump_cmdline)
+ log_info("\n");
+
free(string);
free(name);
fclose(f);
{
memset(&def_thread, 0, sizeof(def_thread));
- if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
- perror("sched_getaffinity");
- return 1;
- }
+ fio_getaffinity(getpid(), &def_thread.o.cpumask);
/*
* fill default options
def_thread.o.write_bw_log = write_bw_log;
def_thread.o.write_lat_log = write_lat_log;
-#ifdef FIO_HAVE_DISK_UTIL
- def_thread.o.do_disk_util = 1;
-#endif
-
return 0;
}
printf("\t--version\tPrint version info and exit\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
+ printf("\t--showcmd\tTurn a job file into command line options\n");
}
static int parse_cmd_line(int argc, char *argv[])
exit(0);
case 'c':
exit(fio_show_option_help(optarg));
+ case 's':
+ dump_cmdline = 1;
+ break;
case 'v':
printf("%s\n", fio_version_string);
exit(0);
td = NULL;
}
if (!td) {
- int global = !strncmp(val, "global", 6);
+ int global = 0;
+
+ if (strncmp(opt, "name", 4) ||
+ !strncmp(val, "global", 6))
+ global = 1;
td = get_new_job(global, &def_thread);
if (!td)
options_mem_free(&def_thread);
if (!thread_number) {
+ if (dump_cmdline)
+ return 0;
+
log_err("No jobs defined(s)\n");
return 1;
}