X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=6666f372171d8f188a8fa3493b05feadf5eef9c2;hp=19c6340e2fa7d4e9a5b1e224d5f03c6651473e01;hb=refs%2Ftags%2Ffio-1.50-rc4;hpb=d3e829b399a44b6d6ce9596a05f7a4bff5025573 diff --git a/init.c b/init.c index 19c6340e..6666f372 100644 --- a/init.c +++ b/init.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -19,8 +18,11 @@ #include "smalloc.h" #include "filehash.h" #include "verify.h" +#include "profile.h" -static char fio_version_string[] = "fio 1.37"; +#include "lib/getopt.h" + +static char fio_version_string[] = "fio 1.50-rc4"; #define FIO_RANDSEED (0xb1899bedUL) @@ -38,6 +40,8 @@ unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; char *job_section = NULL; +char *exec_profile = NULL; +int warnings_fatal = 0; int write_bw_log = 0; int read_only = 0; @@ -51,6 +55,8 @@ unsigned long fio_debug = 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. @@ -131,31 +137,16 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'p', }, + { + .name = "warnings-fatal", + .has_arg = no_argument, + .val = 'w', + }, { .name = NULL, }, }; -static const char *tiobench_opts[] = { - "buffered=0", "size=4*1024*$mb_memory", "bs=4k", "timeout=600", - "numjobs=4", "group_reporting", "thread", "overwrite=1", - "filename=.fio.tio.1:.fio.tio.2:.fio.tio.3:.fio.tio.4", - "name=seqwrite", "rw=write", "end_fsync=1", - "name=randwrite", "stonewall", "rw=randwrite", "end_fsync=1", - "name=seqread", "stonewall", "rw=read", - "name=randread", "stonewall", "rw=randread", NULL, -}; - -static const char **fio_prof_strings[PROFILE_END] = { - NULL, - tiobench_opts, -}; - -static const char *profiles[PROFILE_END] = { - "none", - "tiobench", -}; - FILE *get_f_out() { return f_out; @@ -175,8 +166,11 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) if (global) return &def_thread; - if (thread_number >= max_jobs) + if (thread_number >= max_jobs) { + log_err("error: maximum number of jobs (%d) reached.\n", + max_jobs); return NULL; + } td = &threads[thread_number++]; *td = *parent; @@ -186,6 +180,8 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) dup_files(td, parent); options_mem_dupe(td); + profile_add_hooks(td); + td->thread_number = thread_number; return td; } @@ -194,6 +190,8 @@ static void put_job(struct thread_data *td) { if (td == &def_thread) return; + + profile_td_exit(td); if (td->error) log_info("fio: %s\n", td->verror); @@ -207,6 +205,8 @@ static int __setup_rate(struct thread_data *td, enum fio_ddir ddir) unsigned int bs = td->o.min_bs[ddir]; unsigned long long bytes_per_sec; + assert(ddir_rw(ddir)); + if (td->o.rate[ddir]) bytes_per_sec = td->o.rate[ddir]; else @@ -248,13 +248,15 @@ static int fixed_block_size(struct thread_options *o) static int fixup_options(struct thread_data *td) { struct thread_options *o = &td->o; + int ret = 0; #ifndef FIO_HAVE_PSHARED_MUTEX - if (!td->o.use_thread) { + if (!o->use_thread) { log_info("fio: this platform does not support process shared" " mutexes, forcing use of threads. Use the 'thread'" " option to get rid of this warning.\n"); - td->o.use_thread = 1; + o->use_thread = 1; + ret = warnings_fatal; } #endif @@ -262,6 +264,7 @@ static int fixup_options(struct thread_data *td) log_err("fio: read iolog overrides write_iolog\n"); free(o->write_iolog_file); o->write_iolog_file = NULL; + ret = warnings_fatal; } /* @@ -297,9 +300,10 @@ static int fixup_options(struct thread_data *td) if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] || o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) && - !td->o.norandommap) { + !o->norandommap) { log_err("fio: Any use of blockalign= turns off randommap\n"); - td->o.norandommap = 1; + o->norandommap = 1; + ret = warnings_fatal; } if (!o->file_size_high) @@ -310,6 +314,7 @@ static int fixup_options(struct thread_data *td) log_err("fio: norandommap given for variable block sizes, " "verify disabled\n"); o->verify = VERIFY_NONE; + ret = warnings_fatal; } if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO)) log_err("fio: bs_unaligned may not work with raw io\n"); @@ -351,49 +356,66 @@ static int fixup_options(struct thread_data *td) ((o->ratemin[0] + o->ratemin[1]) && (o->rate_iops_min[0] + o->rate_iops_min[1]))) { log_err("fio: rate and rate_iops are mutually exclusive\n"); - return 1; + ret = 1; } if ((o->rate[0] < o->ratemin[0]) || (o->rate[1] < o->ratemin[1]) || (o->rate_iops[0] < o->rate_iops_min[0]) || (o->rate_iops[1] < o->rate_iops_min[1])) { log_err("fio: minimum rate exceeds rate\n"); - return 1; + ret = 1; } if (!o->timeout && o->time_based) { log_err("fio: time_based requires a runtime/timeout setting\n"); o->time_based = 0; + ret = warnings_fatal; } if (o->fill_device && !o->size) o->size = -1ULL; - 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"); + 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->do_verify && o->numjobs > 1) { + log_info("Multiple writers may overwrite blocks that " + "belong to other jobs. This can cause " + "verification failures.\n"); + ret = warnings_fatal; + } - if (td->o.verify != VERIFY_NONE) - td->o.refill_buffers = 1; + o->refill_buffers = 1; + if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] && + !o->verify_interval) + o->verify_interval = o->min_bs[DDIR_WRITE]; + } - if (td->o.pre_read) { - td->o.invalidate_cache = 0; - if (td->io_ops->flags & FIO_PIPEIO) + if (o->pre_read) { + o->invalidate_cache = 0; + if (td->io_ops->flags & FIO_PIPEIO) { log_info("fio: cannot pre-read files with an IO engine" " that isn't seekable. Pre-read disabled.\n"); + ret = warnings_fatal; + } } #ifndef FIO_HAVE_FDATASYNC - if (td->o.fdatasync_blocks) { + if (o->fdatasync_blocks) { log_info("fio: this platform does not support fdatasync()" " falling back to using fsync(). Use the 'fsync'" " option instead of 'fdatasync' to get rid of" " this warning\n"); - td->o.fsync_blocks = td->o.fdatasync_blocks; - td->o.fdatasync_blocks = 0; + o->fsync_blocks = o->fdatasync_blocks; + o->fdatasync_blocks = 0; + ret = warnings_fatal; } #endif - return 0; + return ret; } /* @@ -438,7 +460,9 @@ static int exists_and_not_file(const char *filename) if (lstat(filename, &sb) == -1) return 0; - if (S_ISREG(sb.st_mode)) + /* \\.\ is the device namespace in Windows, where every file + * is a device node */ + if (S_ISREG(sb.st_mode) && strncmp(filename, "\\\\.\\", 4) != 0) return 0; return 1; @@ -454,6 +478,7 @@ void td_fill_rand_seeds(struct thread_data *td) os_random_seed(td->rand_seeds[3], &td->next_file_state); os_random_seed(td->rand_seeds[5], &td->file_size_state); + os_random_seed(td->rand_seeds[6], &td->trim_state); if (!td_random(td)) return; @@ -518,6 +543,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) return 0; } + if (profile_td_init(td)) + return 1; + engine = get_engine_name(td->o.ioengine); td->io_ops = load_ioengine(td, engine); if (!td->io_ops) { @@ -562,8 +590,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) 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; + td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX; td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX; - td->ddir_nr = td->o.ddir_nr; + td->ddir_seq_nr = td->o.ddir_seq_nr; if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { prev_group_jobs = 0; @@ -580,6 +609,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) goto err; if (td->o.write_lat_log) { + setup_log(&td->ts.lat_log); setup_log(&td->ts.slat_log); setup_log(&td->ts.clat_log); } @@ -655,6 +685,43 @@ err: return -1; } +/* + * Parse as if 'o' was a command line + */ +void add_job_opts(const char **o) +{ + struct thread_data *td, *td_parent; + int i, in_global = 1; + char jobname[32]; + + i = 0; + td_parent = td = NULL; + while (o[i]) { + if (!strncmp(o[i], "name", 4)) { + in_global = 0; + if (td) + add_job(td, jobname, 0); + td = NULL; + sprintf(jobname, "%s", o[i] + 5); + } + if (in_global && !td_parent) + td_parent = get_new_job(1, &def_thread); + else if (!in_global && !td) { + if (!td_parent) + td_parent = &def_thread; + td = get_new_job(0, td_parent); + } + if (in_global) + fio_options_parse(td_parent, (char **) &o[i], 1); + else + fio_options_parse(td, (char **) &o[i], 1); + i++; + } + + if (td) + add_job(td, jobname, 0); +} + static int skip_this_section(const char *name) { if (!job_section) @@ -746,6 +813,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag) break; } + name[strlen(name) - 1] = '\0'; + if (skip_this_section(name)) { inside_skip = 1; continue; @@ -754,8 +823,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag) global = !strncmp(name, "global", 6); - name[strlen(name) - 1] = '\0'; - if (dump_cmdline) { if (first_sect) log_info("fio "); @@ -851,9 +918,6 @@ static int fill_def_thread(void) fio_fill_default_options(&def_thread); def_thread.o.timeout = def_timeout; - def_thread.o.write_bw_log = write_bw_log; - def_thread.o.write_lat_log = write_lat_log; - return 0; } @@ -925,7 +989,6 @@ static int setup_thread_area(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"); @@ -945,7 +1008,9 @@ static void usage(const char *name) printf("\t--section=name\tOnly run specified section in job file\n"); printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb" " (def 1024)\n"); - printf("\nFio was written by Jens Axboe \n"); + printf("\t--warnings-fatal Fio parser warnings are fatal\n"); + printf("\nFio was written by Jens Axboe "); + printf("\n Jens Axboe \n"); } #ifdef FIO_INC_DEBUG @@ -961,6 +1026,8 @@ struct debug_level debug_levels[] = { { .name = "diskutil", .shift = FD_DISKUTIL }, { .name = "job", .shift = FD_JOB }, { .name = "mutex", .shift = FD_MUTEX }, + { .name = "profile", .shift = FD_PROFILE }, + { .name = "time", .shift = FD_TIME }, { .name = NULL, }, }; @@ -972,8 +1039,6 @@ static int set_debug(const char *string) 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]; @@ -1028,63 +1093,32 @@ static int set_debug(const char *string) } #endif -static int load_profile(const char *profile) +static void fio_options_fill_optstring(void) { - struct thread_data *td, *td_parent; - const char **o; - int i, in_global = 1; - char jobname[32]; - - dprint(FD_PARSE, "loading profile %s\n", profile); - - for (i = 0; i < PROFILE_END; i++) { - if (!strcmp(profile, profiles[i])) - break; - } - - if (i == PROFILE_END) { - log_err("fio: unknown profile %s\n", profile); - return 1; - } - - o = fio_prof_strings[i]; - if (!o) - return 0; - - i = 0; - td_parent = td = NULL; - while (o[i]) { - if (!strncmp(o[i], "name", 4)) { - in_global = 0; - if (td) - add_job(td, jobname, 0); - td = NULL; - sprintf(jobname, "%s", o[i] + 5); - } - if (in_global && !td_parent) - td_parent = get_new_job(1, &def_thread); - else if (!in_global && !td) { - if (!td_parent) - td_parent = &def_thread; - td = get_new_job(0, td_parent); + 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++] = ':'; } - if (in_global) - fio_options_parse(td_parent, (char **) &o[i], 1); - else - fio_options_parse(td, (char **) &o[i], 1); i++; } - if (td) - add_job(td, jobname, 0); - return 0; + 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); @@ -1095,7 +1129,7 @@ static int parse_cmd_line(int argc, char *argv[]) case 'l': write_lat_log = 1; break; - case 'w': + case 'b': write_bw_log = 1; break; case 'o': @@ -1121,7 +1155,7 @@ static int parse_cmd_line(int argc, char *argv[]) read_only = 1; break; case 'v': - printf("%s\n", fio_version_string); + /* already being printed, just quit */ exit(0); case 'e': if (!strcmp("always", optarg)) @@ -1146,8 +1180,7 @@ static int parse_cmd_line(int argc, char *argv[]) job_section = strdup(optarg); break; case 'p': - if (load_profile(optarg)) - do_exit++; + exec_profile = strdup(optarg); break; case FIO_GETOPT_JOB: { const char *opt = l_opts[lidx].name; @@ -1179,6 +1212,9 @@ static int parse_cmd_line(int argc, char *argv[]) ret = fio_cmd_option_parse(td, opt, val); break; } + case 'w': + warnings_fatal = 1; + break; default: do_exit++; exit_val = 1; @@ -1213,6 +1249,9 @@ int parse_options(int argc, char *argv[]) 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()) @@ -1236,8 +1275,10 @@ int parse_options(int argc, char *argv[]) if (!thread_number) { if (dump_cmdline) return 0; + if (exec_profile) + return 0; - log_err("No jobs defined(s)\n\n"); + log_err("No jobs(s) defined\n\n"); usage(argv[0]); return 1; }