X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=2e443f66422ac60671b2704950f5bd25320dfca6;hp=b9dee19bb2894a39d0000a56b013279087d4026f;hb=45ddf6761c54e55d5a31a6fbed546291254324a4;hpb=ba3e4e0ca697f83c97a250d85a74506ace69de2c diff --git a/init.c b/init.c index b9dee19b..2e443f66 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.36-rc2"; +#include "lib/getopt.h" + +static char fio_version_string[] = "fio 1.44.2"; #define FIO_RANDSEED (0xb1899bedUL) @@ -38,6 +40,7 @@ unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; char *job_section = NULL; +char *exec_profile = NULL; int write_bw_log = 0; int read_only = 0; @@ -136,26 +139,6 @@ static struct option l_opts[FIO_NR_OPTIONS] = { }, }; -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; @@ -186,6 +169,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 +179,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 +194,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 @@ -250,11 +239,11 @@ static int fixup_options(struct thread_data *td) struct thread_options *o = &td->o; #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; } #endif @@ -297,9 +286,9 @@ 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; } if (!o->file_size_high) @@ -368,20 +357,35 @@ static int fixup_options(struct thread_data *td) if (o->fill_device && !o->size) o->size = -1ULL; - if (td_rw(td) && td->o.verify != VERIFY_NONE) + if (td_rw(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 (td->o.verify != VERIFY_NONE) - td->o.refill_buffers = 1; + if (o->verify != VERIFY_NONE) { + 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 (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"); } +#ifndef FIO_HAVE_FDATASYNC + 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"); + o->fsync_blocks = o->fdatasync_blocks; + o->fdatasync_blocks = 0; + } +#endif + return 0; } @@ -443,6 +447,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; @@ -507,6 +512,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) { @@ -551,8 +559,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; @@ -569,6 +578,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); } @@ -644,6 +654,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) @@ -735,6 +782,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; @@ -743,8 +792,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 "); @@ -840,9 +887,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; } @@ -934,7 +978,8 @@ 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("\nFio was written by Jens Axboe "); + printf("\n Jens Axboe \n"); } #ifdef FIO_INC_DEBUG @@ -950,6 +995,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, }, }; @@ -1017,57 +1064,6 @@ static int set_debug(const char *string) } #endif -static int load_profile(const char *profile) -{ - 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); - } - 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; -} - static int parse_cmd_line(int argc, char *argv[]) { struct thread_data *td = NULL; @@ -1084,7 +1080,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': @@ -1135,8 +1131,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; @@ -1225,6 +1220,8 @@ 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"); usage(argv[0]);