X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=a2aba3338c38a7c68477988d7a5b93cf2bdb8581;hp=134d5f24cdb3ef9147b17b5088c950cd3d949a58;hb=691c8fb014da9dd82e999a90b5511423f4eee188;hpb=dbe1a0180a6cc94a780b4963f2de4ba8503b76aa diff --git a/init.c b/init.c index 134d5f24..a2aba333 100644 --- a/init.c +++ b/init.c @@ -16,8 +16,10 @@ #include "fio.h" #include "parse.h" +#include "smalloc.h" +#include "filehash.h" -static char fio_version_string[] = "fio 1.18"; +static char fio_version_string[] = "fio 1.20-rc2"; #define FIO_RANDSEED (0xb1899bedUL) @@ -34,12 +36,13 @@ 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 def_timeout; +static int write_lat_log; static int prev_group_jobs; @@ -49,7 +52,7 @@ 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. */ -static struct option long_options[FIO_NR_OPTIONS] = { +static struct option l_opts[FIO_NR_OPTIONS] = { { .name = "output", .has_arg = required_argument, @@ -110,6 +113,11 @@ static struct option long_options[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'd', }, + { + .name = "section", + .has_arg = required_argument, + .val = 'x', + }, { .name = NULL, }, @@ -200,10 +208,11 @@ static int fixup_options(struct thread_data *td) struct thread_options *o = &td->o; 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); + log_err("fio: job <%s> has write bit set, but fio is in" + " read-only mode\n", td->o.name); return 1; } - + if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100) o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ]; @@ -226,11 +235,11 @@ static int fixup_options(struct thread_data *td) o->overwrite = 1; if (!o->min_bs[DDIR_READ]) - o->min_bs[DDIR_READ]= o->bs[DDIR_READ]; + o->min_bs[DDIR_READ] = o->bs[DDIR_READ]; if (!o->max_bs[DDIR_READ]) o->max_bs[DDIR_READ] = o->bs[DDIR_READ]; if (!o->min_bs[DDIR_WRITE]) - o->min_bs[DDIR_WRITE]= o->bs[DDIR_WRITE]; + o->min_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; if (!o->max_bs[DDIR_WRITE]) o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; @@ -296,6 +305,10 @@ static int fixup_options(struct thread_data *td) 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; } @@ -433,14 +446,15 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->io_ops->flags |= FIO_RAWIO; file_alloced = 0; - if (!td->o.filename && !td->files_index) { + if (!td->o.filename && !td->files_index && !td->o.read_iolog_file) { file_alloced = 1; if (td->o.nr_files == 1 && exists_and_not_file(jobname)) add_file(td, jobname); else { for (i = 0; i < td->o.nr_files; i++) { - sprintf(fname, "%s.%d.%d", jobname, td->thread_number, i); + sprintf(fname, "%s.%d.%d", jobname, + td->thread_number, i); add_file(td, fname); } } @@ -456,7 +470,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; @@ -490,9 +504,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (!terse_output) { if (!job_add_num) { - if (!strcmp(td->io_ops->name, "cpuio")) - log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->o.name, td->o.cpuload, td->o.cpucycle); - else { + if (!strcmp(td->io_ops->name, "cpuio")) { + log_info("%s: ioengine=cpu, cpuload=%u," + " cpucycle=%u\n", td->o.name, + td->o.cpuload, + td->o.cpucycle); + } else { char *c1, *c2, *c3, *c4; c1 = to_kmg(td->o.min_bs[DDIR_READ]); @@ -500,7 +517,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) c3 = to_kmg(td->o.min_bs[DDIR_WRITE]); c4 = to_kmg(td->o.max_bs[DDIR_WRITE]); - log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->o.name, td->groupid, ddir_str[td->o.td_ddir], c1, c2, c3, c4, td->io_ops->name, td->o.iodepth); + log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s," + " ioengine=%s, iodepth=%u\n", + td->o.name, td->groupid, + ddir_str[td->o.td_ddir], + c1, c2, c3, c4, + td->io_ops->name, + td->o.iodepth); free(c1); free(c2); @@ -544,6 +567,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; @@ -573,6 +606,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag) int ret = 0, stonewall; int first_sect = 1; int skip_fgets = 0; + int inside_skip = 0; if (!strcmp(file, "-")) f = stdin; @@ -611,10 +645,19 @@ static int parse_jobs_ini(char *file, int stonewall_flag) if (is_empty_or_comment(p)) continue; if (sscanf(p, "[%255s]", name) != 1) { - log_err("fio: option <%s> outside of [] job section\n", p); + 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'; @@ -713,15 +756,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 @@ -729,6 +777,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; @@ -750,6 +800,8 @@ static int setup_thread_area(void) } 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; } @@ -766,10 +818,14 @@ static void usage(const char *name) printf("\t--minimal\tMinimal (terse) output\n"); printf("\t--version\tPrint version info and exit\n"); printf("\t--help\t\tPrint this page\n"); - printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\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 @@ -780,10 +836,13 @@ struct debug_level debug_levels[] = { { .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 }, + { .name = "diskutil", .shift = FD_DISKUTIL }, { }, }; -static void set_debug(const char *string) +static int set_debug(const char *string) { struct debug_level *dl; char *p = (char *) string; @@ -799,10 +858,10 @@ static void set_debug(const char *string) log_info("%s,", dl->name); } log_info("all\n"); - return; + return 1; } else if (!strcmp(string, "all")) { fio_debug = ~0UL; - return; + return 0; } while ((opt = strsep(&p, ",")) != NULL) { @@ -821,20 +880,22 @@ static void set_debug(const char *string) 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) { + while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) { switch (c) { case 't': def_timeout = atoi(optarg); @@ -877,10 +938,23 @@ static int parse_cmd_line(int argc, char *argv[]) eta_print = FIO_ETA_NEVER; break; case 'd': - set_debug(optarg); + 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; + const char *opt = l_opts[lidx].name; char *val = optarg; if (!strncmp(opt, "name", 4) && td) { @@ -892,35 +966,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) { @@ -940,7 +1017,7 @@ int parse_options(int argc, char *argv[]) f_out = stdout; f_err = stderr; - fio_options_dup_and_init(long_options); + fio_options_dup_and_init(l_opts); if (setup_thread_area()) return 1;