X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=4f57ba31705e151f44859ce80109d3fb1c3a110e;hb=509df2bc49284a93efd6b890bdf5e3c4ea2aba4a;hp=dcad1b392828f7ab1be5065011b641ea226b18f9;hpb=ee56ad500f6692381e131cc37299d23fa910a24a;p=fio.git diff --git a/init.c b/init.c index dcad1b39..4f57ba31 100644 --- a/init.c +++ b/init.c @@ -17,7 +17,7 @@ #include "fio.h" #include "parse.h" -static char fio_version_string[] = "fio 1.17.3"; +static char fio_version_string[] = "fio 1.19"; #define FIO_RANDSEED (0xb1899bedUL) @@ -34,6 +34,7 @@ int eta_print; unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; +char *job_section = NULL; int write_bw_log = 0; int read_only = 0; @@ -110,6 +111,11 @@ static struct option long_options[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'd', }, + { + .name = "section", + .has_arg = required_argument, + .val = 'x', + }, { .name = NULL, }, @@ -213,13 +219,6 @@ static int fixup_options(struct thread_data *td) o->write_iolog_file = NULL; } - if (td->io_ops->flags & FIO_SYNCIO) - o->iodepth = 1; - else { - if (!o->iodepth) - o->iodepth = o->open_files; - } - /* * only really works for sequential io for now, and with 1 file */ @@ -302,6 +301,10 @@ static int fixup_options(struct thread_data *td) if (o->fill_device && !o->size) o->size = ULONG_LONG_MAX; + + if (td_rw(td) && td->o.verify != VERIFY_NONE) + log_info("fio: mixed read/write workload with verify. May not " + "work as expected, unless you pre-populated the file\n"); return 0; } @@ -551,6 +554,16 @@ err: return -1; } +static int skip_this_section(const char *name) +{ + if (!job_section) + return 0; + if (!strncmp(name, "global", 6)) + return 0; + + return strncmp(job_section, name, strlen(job_section)); +} + static int is_empty_or_comment(char *line) { unsigned int i; @@ -580,6 +593,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag) int ret = 0, stonewall; int first_sect = 1; int skip_fgets = 0; + int inside_skip = 0; if (!strcmp(file, "-")) f = stdin; @@ -618,10 +632,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag) if (is_empty_or_comment(p)) continue; if (sscanf(p, "[%255s]", name) != 1) { + if (inside_skip) + continue; log_err("fio: option <%s> outside of [] job section\n", p); break; } + if (skip_this_section(name)) { + inside_skip = 1; + continue; + } else + inside_skip = 0; + global = !strncmp(name, "global", 6); name[strlen(name) - 1] = '\0'; @@ -777,22 +799,23 @@ static void usage(const char *name) printf("\t--showcmd\tTurn a job file into command line options\n"); printf("\t--eta=when\tWhen ETA estimate should be printed\n"); printf("\t \tMay be \"always\", \"never\" or \"auto\"\n"); + printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n"); + printf("\t--section=name\tOnly run specified section in job file\n"); } -struct debug_level { - const char *name; - unsigned long mask; -}; - +#ifdef FIO_INC_DEBUG struct debug_level debug_levels[] = { - { .name = "process", .mask = FD_PROCESS, }, - { .name = "file", .mask = FD_PROCESS, }, - { .name = "io", .mask = FD_IO, }, - { .name = "mem", .mask = FD_MEM, }, + { .name = "process", .shift = FD_PROCESS, }, + { .name = "file", .shift = FD_FILE, }, + { .name = "io", .shift = FD_IO, }, + { .name = "mem", .shift = FD_MEM, }, + { .name = "blktrace", .shift = FD_BLKTRACE }, + { .name = "verify", .shift = FD_VERIFY }, + { .name = "random", .shift = FD_RANDOM }, { }, }; -static void set_debug(const char *string) +static int set_debug(const char *string) { struct debug_level *dl; char *p = (char *) string; @@ -807,8 +830,11 @@ static void set_debug(const char *string) dl = &debug_levels[i]; log_info("%s,", dl->name); } - log_info("\n"); - return; + log_info("all\n"); + return 1; + } else if (!strcmp(string, "all")) { + fio_debug = ~0UL; + return 0; } while ((opt = strsep(&p, ",")) != NULL) { @@ -819,7 +845,7 @@ static void set_debug(const char *string) if (!strncmp(opt, dl->name, strlen(opt))) { log_info("fio: set debug option %s\n", opt); found = 1; - fio_debug |= dl->mask; + fio_debug |= (1UL << dl->shift); break; } } @@ -827,12 +853,20 @@ static void set_debug(const char *string) if (!found) log_err("fio: debug mask %s not found\n", opt); } + return 0; +} +#else +static void set_debug(const char *string) +{ + log_err("fio: debug tracing not included in build\n"); + return 1; } +#endif static int parse_cmd_line(int argc, char *argv[]) { struct thread_data *td = NULL; - int c, ini_idx = 0, lidx, ret, dont_add_job = 0; + int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0; while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) { switch (c) { @@ -877,7 +911,19 @@ static int parse_cmd_line(int argc, char *argv[]) eta_print = FIO_ETA_NEVER; break; case 'd': - set_debug(optarg); + if (set_debug(optarg)) + do_exit++; + break; + case 'x': + if (!strcmp(optarg, "global")) { + log_err("fio: can't use global as only section\n"); + do_exit++; + exit_val = 1; + break; + } + if (job_section) + free(job_section); + job_section = strdup(optarg); break; case FIO_GETOPT_JOB: { const char *opt = long_options[lidx].name; @@ -892,35 +938,38 @@ static int parse_cmd_line(int argc, char *argv[]) td = NULL; } if (!td) { + int is_section = !strncmp(opt, "name", 4); int global = 0; - if (strncmp(opt, "name", 4) || - !strncmp(val, "global", 6)) + if (!is_section || !strncmp(val, "global", 6)) global = 1; + if (is_section && skip_this_section(val)) + continue; + td = get_new_job(global, &def_thread); if (!td) return 0; } ret = fio_cmd_option_parse(td, opt, val); - if (ret) - dont_add_job = 1; break; } default: + do_exit++; + exit_val = 1; break; } } + if (do_exit) + exit(exit_val); + if (td) { - if (dont_add_job) - put_job(td); - else { + if (!ret) ret = add_job(td, td->o.name ?: "fio", 0); - if (ret) - put_job(td); - } + if (ret) + put_job(td); } while (optind < argc) { @@ -933,7 +982,6 @@ static int parse_cmd_line(int argc, char *argv[]) return ini_idx; } - int parse_options(int argc, char *argv[]) { int job_files, i;