X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=e7245ade0313ef92fa659e60250223b729448986;hp=305f6605f08ab7d749ea415d78a04fa518ba1b03;hb=d990588ef84dacb107971143c239565e149d6f73;hpb=c103f2440db0ceab0eb6c0d6669be285766fb495 diff --git a/init.c b/init.c index 305f6605..e7245ade 100644 --- a/init.c +++ b/init.c @@ -19,8 +19,9 @@ #include "smalloc.h" #include "filehash.h" #include "verify.h" +#include "profile.h" -static char fio_version_string[] = "fio 1.29-rc1"; +static char fio_version_string[] = "fio 1.37"; #define FIO_RANDSEED (0xb1899bedUL) @@ -38,6 +39,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; @@ -126,6 +128,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'a', }, + { + .name = "profile", + .has_arg = required_argument, + .val = 'p', + }, { .name = NULL, }, @@ -156,9 +163,13 @@ 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); + profile_add_hooks(td); + td->thread_number = thread_number; return td; } @@ -167,6 +178,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); @@ -178,21 +191,19 @@ static void put_job(struct thread_data *td) static int __setup_rate(struct thread_data *td, enum fio_ddir ddir) { unsigned int bs = td->o.min_bs[ddir]; - unsigned long long rate; - unsigned long ios_per_msec; + unsigned long long bytes_per_sec; - if (td->o.rate[ddir]) { - rate = td->o.rate[ddir]; - ios_per_msec = (rate * 1000LL) / bs; - } else - ios_per_msec = td->o.rate_iops[ddir] * 1000UL; + if (td->o.rate[ddir]) + bytes_per_sec = td->o.rate[ddir]; + else + bytes_per_sec = td->o.rate_iops[ddir] * bs; - if (!ios_per_msec) { + if (!bytes_per_sec) { log_err("rate lower than supported\n"); return -1; } - td->rate_usec_cycle[ddir] = 1000000000ULL / ios_per_msec; + td->rate_nsec_cycle[ddir] = 1000000000ULL / bytes_per_sec; td->rate_pending_usleep[ddir] = 0; return 0; } @@ -347,20 +358,31 @@ static int fixup_options(struct thread_data *td) 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) + if (td->o.verify != VERIFY_NONE) { td->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) + 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"); + } - if (td->o.mem_align) { - if (td->o.odirect && !is_power_of_2(td->o.mem_align)) { - log_err("fio: given IO mem alignment conflicts with" - " direct=1. Resetting.\n"); - td->o.mem_align = page_mask; - } +#ifndef FIO_HAVE_FDATASYNC + if (td->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; } - +#endif + return 0; } @@ -486,6 +508,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) { @@ -533,8 +558,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++; } @@ -624,6 +648,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) @@ -930,6 +991,7 @@ 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 = NULL, }, }; @@ -1063,6 +1125,9 @@ static int parse_cmd_line(int argc, char *argv[]) free(job_section); job_section = strdup(optarg); break; + case 'p': + exec_profile = strdup(optarg); + break; case FIO_GETOPT_JOB: { const char *opt = l_opts[lidx].name; char *val = optarg; @@ -1150,6 +1215,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]);