X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=4d336fa3eb6c08888a9cd7d0d2a3394d40b90479;hp=2a1ee149cc85dc15601a7ad86ec8a01021987d3c;hb=380065aa652b87093d6bbd240e70db30bd6f193d;hpb=724e4435c1374e97309b122429ad9291744966c0 diff --git a/init.c b/init.c index 2a1ee149..4d336fa3 100644 --- a/init.c +++ b/init.c @@ -16,32 +16,38 @@ #include "fio.h" #include "parse.h" +#include "smalloc.h" +#include "filehash.h" -static char fio_version_string[] = "fio 1.17.1"; +static char fio_version_string[] = "fio 1.19"; #define FIO_RANDSEED (0xb1899bedUL) static char **ini_file; static int max_jobs = MAX_JOBS; static int dump_cmdline; -static int read_only; struct thread_data def_thread; struct thread_data *threads = NULL; int exitall_on_terminate = 0; int terse_output = 0; +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; static int def_timeout = 0; static int write_lat_log = 0; static int prev_group_jobs; +unsigned long fio_debug = 0; + /* * Command line options. These will contain the above, plus a few * extra that only pertain to fio itself and not jobs. @@ -97,6 +103,21 @@ static struct option long_options[FIO_NR_OPTIONS] = { .has_arg = no_argument, .val = 'r', }, + { + .name = "eta", + .has_arg = required_argument, + .val = 'e', + }, + { + .name = "debug", + .has_arg = required_argument, + .val = 'd', + }, + { + .name = "section", + .has_arg = required_argument, + .val = 'x', + }, { .name = NULL, }, @@ -200,13 +221,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 */ @@ -287,6 +301,13 @@ static int fixup_options(struct thread_data *td) o->time_based = 0; } + 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; } @@ -447,7 +468,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) f->real_file_size = -1ULL; } - td->mutex = fio_sem_init(0); + td->mutex = fio_mutex_init(0); td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX; td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX; @@ -535,6 +556,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; @@ -559,13 +590,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag) unsigned int global; struct thread_data *td; char *string, *name; - fpos_t off; FILE *f; char *p; int ret = 0, stonewall; int first_sect = 1; + int skip_fgets = 0; + int inside_skip = 0; + + if (!strcmp(file, "-")) + f = stdin; + else + f = fopen(file, "r"); - f = fopen(file, "r"); if (!f) { perror("fopen job file"); return 1; @@ -581,20 +617,35 @@ static int parse_jobs_ini(char *file, int stonewall_flag) stonewall = stonewall_flag; do { - p = fgets(string, 4095, f); - if (!p) - break; + /* + * if skip_fgets is set, we already have loaded a line we + * haven't handled. + */ + if (!skip_fgets) { + p = fgets(string, 4095, f); + if (!p) + break; + } + skip_fgets = 0; strip_blank_front(&p); strip_blank_end(p); 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'; @@ -621,20 +672,23 @@ static int parse_jobs_ini(char *file, int stonewall_flag) stonewall = 0; } - fgetpos(f, &off); while ((p = fgets(string, 4096, f)) != NULL) { if (is_empty_or_comment(p)) continue; strip_blank_front(&p); - if (p[0] == '[') + /* + * new section, break out and make sure we don't + * fgets() a new line at the top. + */ + if (p[0] == '[') { + skip_fgets = 1; break; + } strip_blank_end(p); - fgetpos(f, &off); - /* * Don't break here, continue parsing options so we * dump all the bad ones. Makes trial/error fixups @@ -645,10 +699,9 @@ static int parse_jobs_ini(char *file, int stonewall_flag) log_info("--%s ", p); } - if (!ret) { - fsetpos(f, &off); + if (!ret) ret = add_job(td, name, 0); - } else { + else { log_err("fio: job %s dropped\n", name); put_job(td); } @@ -659,7 +712,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag) free(string); free(name); - fclose(f); + if (f != stdin) + fclose(f); return ret; } @@ -690,15 +744,20 @@ static void free_shm(void) threads = NULL; shmctl(shm_id, IPC_RMID, &sbuf); } + + scleanup(); } /* * The thread area is shared between the main process and the job * threads/processes. So setup a shared memory segment that will hold - * all the job info. + * all the job info. We use the end of the region for keeping track of + * open files across jobs, for file sharing. */ static int setup_thread_area(void) { + void *hash; + /* * 1024 is too much on some machines, scale max_jobs if * we get a failure that looks like too large a shm segment @@ -706,6 +765,8 @@ static int setup_thread_area(void) do { size_t size = max_jobs * sizeof(struct thread_data); + size += file_hash_size; + shm_id = shmget(0, size, IPC_CREAT | 0600); if (shm_id != -1) break; @@ -726,13 +787,18 @@ static int setup_thread_area(void) return 1; } + memset(threads, 0, max_jobs * sizeof(struct thread_data)); + hash = (void *) threads + max_jobs * sizeof(struct thread_data); + file_hash_init(hash); atexit(free_shm); return 0; } -static void usage(void) +static void usage(const char *name) { printf("%s\n", fio_version_string); + printf("%s [options] [job options] \n", name); + printf("\t--debug=options\tEnable debug logging\n"); printf("\t--output\tWrite output to file\n"); printf("\t--timeout\tRuntime in seconds\n"); printf("\t--latency-log\tGenerate per-job latency logs\n"); @@ -742,12 +808,77 @@ static void usage(void) 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"); + 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"); } +#ifdef FIO_INC_DEBUG +struct debug_level debug_levels[] = { + { .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 }, + { .name = "parse", .shift = FD_PARSE }, + { }, +}; + +static int set_debug(const char *string) +{ + struct debug_level *dl; + char *p = (char *) string; + char *opt; + 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]; + log_info("%s,", dl->name); + } + log_info("all\n"); + return 1; + } else if (!strcmp(string, "all")) { + fio_debug = ~0UL; + return 0; + } + + while ((opt = strsep(&p, ",")) != NULL) { + int found = 0; + + for (i = 0; debug_levels[i].name; i++) { + dl = &debug_levels[i]; + if (!strncmp(opt, dl->name, strlen(opt))) { + log_info("fio: set debug option %s\n", opt); + found = 1; + fio_debug |= (1UL << dl->shift); + break; + } + } + + 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) { @@ -772,7 +903,7 @@ static int parse_cmd_line(int argc, char *argv[]) terse_output = 1; break; case 'h': - usage(); + usage(argv[0]); exit(0); case 'c': exit(fio_show_option_help(optarg)); @@ -785,6 +916,27 @@ static int parse_cmd_line(int argc, char *argv[]) case 'v': printf("%s\n", fio_version_string); exit(0); + case 'e': + if (!strcmp("always", optarg)) + eta_print = FIO_ETA_ALWAYS; + else if (!strcmp("never", optarg)) + eta_print = FIO_ETA_NEVER; + break; + case 'd': + 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; char *val = optarg; @@ -798,35 +950,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) { @@ -839,7 +994,6 @@ static int parse_cmd_line(int argc, char *argv[]) return ini_idx; } - int parse_options(int argc, char *argv[]) { int job_files, i; @@ -872,6 +1026,7 @@ int parse_options(int argc, char *argv[]) return 0; log_err("No jobs defined(s)\n"); + usage(argv[0]); return 1; }