X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=6ae78be1ed3e59dca7e5acfc78ada8e88e4c1bc1;hp=2e7a0fe38854ace4c0a4a90e9fa575d2c7013e92;hb=d2a1ed1a110d9c6f76a4a11974652c0bb9307b68;hpb=890abcad90e450484f89733d1bc1ad8a30016311 diff --git a/init.c b/init.c index 2e7a0fe3..6ae78be1 100644 --- a/init.c +++ b/init.c @@ -20,7 +20,7 @@ #include "filehash.h" #include "verify.h" -static char fio_version_string[] = "fio 1.27.1"; +static char fio_version_string[] = "fio 1.36-rc2"; #define FIO_RANDSEED (0xb1899bedUL) @@ -126,11 +126,36 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'a', }, + { + .name = "profile", + .has_arg = required_argument, + .val = 'p', + }, { .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; @@ -156,6 +181,8 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) td = &threads[thread_number++]; *td = *parent; + td->o.uid = td->o.gid = -1U; + dup_files(td, parent); options_mem_dupe(td); @@ -175,38 +202,40 @@ static void put_job(struct thread_data *td) thread_number--; } -static int setup_rate(struct thread_data *td) +static int __setup_rate(struct thread_data *td, enum fio_ddir ddir) { - unsigned long nr_reads_per_msec; + unsigned int bs = td->o.min_bs[ddir]; unsigned long long rate; - unsigned int bs; - - if (!td->o.rate && !td->o.rate_iops) - return 0; + unsigned long ios_per_msec; - if (td_rw(td)) - bs = td->o.rw_min_bs; - else if (td_read(td)) - bs = td->o.min_bs[DDIR_READ]; - else - bs = td->o.min_bs[DDIR_WRITE]; - - if (td->o.rate) { - rate = td->o.rate; - nr_reads_per_msec = (rate * 1024 * 1000LL) / bs; + if (td->o.rate[ddir]) { + rate = td->o.rate[ddir]; + ios_per_msec = (rate * 1000LL) / bs; } else - nr_reads_per_msec = td->o.rate_iops * 1000UL; + ios_per_msec = td->o.rate_iops[ddir] * 1000UL; - if (!nr_reads_per_msec) { + if (!ios_per_msec) { log_err("rate lower than supported\n"); return -1; } - td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec; - td->rate_pending_usleep = 0; + td->rate_usec_cycle[ddir] = 1000000000ULL / ios_per_msec; + td->rate_pending_usleep[ddir] = 0; return 0; } +static int setup_rate(struct thread_data *td) +{ + int ret = 0; + + if (td->o.rate[DDIR_READ] || td->o.rate_iops[DDIR_READ]) + ret = __setup_rate(td, DDIR_READ); + if (td->o.rate[DDIR_WRITE] || td->o.rate_iops[DDIR_WRITE]) + ret |= __setup_rate(td, DDIR_WRITE); + + return ret; +} + static int fixed_block_size(struct thread_options *o) { return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] && @@ -231,20 +260,6 @@ static int fixup_options(struct thread_data *td) } #endif -#ifndef FIO_HAVE_CPU_AFFINITY - if (td->o.gtod_cpu) { - log_err("fio: platform must support CPU affinity for" - "gettimeofday() offloading\n"); - return 1; - } -#endif - - if (read_only && td_write(td)) { - log_err("fio: job <%s> has write bit set, but fio is in" - " read-only mode\n", td->o.name); - return 1; - } - if (o->write_iolog_file && o->read_iolog_file) { log_err("fio: read iolog overrides write_iolog\n"); free(o->write_iolog_file); @@ -334,11 +349,15 @@ static int fixup_options(struct thread_data *td) if (o->open_files > o->nr_files || !o->open_files) o->open_files = o->nr_files; - if ((o->rate && o->rate_iops) || (o->ratemin && o->rate_iops_min)) { + if (((o->rate[0] + o->rate[1]) && (o->rate_iops[0] + o->rate_iops[1]))|| + ((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; } - if ((o->rate < o->ratemin) || (o->rate_iops < o->rate_iops_min)) { + 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; } @@ -358,8 +377,12 @@ static int fixup_options(struct thread_data *td) if (td->o.verify != VERIFY_NONE) td->o.refill_buffers = 1; - if (td->o.pre_read) + if (td->o.pre_read) { td->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"); + } return 0; } @@ -533,8 +556,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX; td->ddir_nr = td->o.ddir_nr; - if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group) - && prev_group_jobs) { + if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { prev_group_jobs = 0; groupid++; } @@ -914,6 +936,7 @@ 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"); } #ifdef FIO_INC_DEBUG @@ -996,6 +1019,57 @@ 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; @@ -1062,6 +1136,10 @@ static int parse_cmd_line(int argc, char *argv[]) free(job_section); job_section = strdup(optarg); break; + case 'p': + if (load_profile(optarg)) + do_exit++; + break; case FIO_GETOPT_JOB: { const char *opt = l_opts[lidx].name; char *val = optarg; @@ -1150,7 +1228,7 @@ int parse_options(int argc, char *argv[]) if (dump_cmdline) return 0; - log_err("No jobs defined(s)\n"); + log_err("No jobs defined(s)\n\n"); usage(argv[0]); return 1; }