X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=634dda20afd904d71b19095c2507c4b365b69cc5;hp=60ba299379ddb024844be83dbf4b6d4b72a3d7a1;hb=8dc6ebac4b1b406969fb5698505f0c88a1b7d80b;hpb=435d195a9da120c5a618129cdb73418f4748c20a diff --git a/init.c b/init.c index 60ba2993..634dda20 100644 --- a/init.c +++ b/init.c @@ -9,13 +9,14 @@ #include #include #include -#ifndef FIO_NO_HAVE_SHM_H -#include -#endif #include #include #include "fio.h" +#ifndef FIO_NO_HAVE_SHM_H +#include +#endif + #include "parse.h" #include "smalloc.h" #include "filehash.h" @@ -25,6 +26,7 @@ #include "idletime.h" #include "lib/getopt.h" +#include "lib/strcasestr.h" const char fio_version_string[] = FIO_VERSION; @@ -34,14 +36,15 @@ static char **ini_file; static int max_jobs = FIO_MAX_JOBS; static int dump_cmdline; static int def_timeout; +static int parse_only; static struct thread_data def_thread; struct thread_data *threads = NULL; int exitall_on_terminate = 0; int output_format = FIO_OUTPUT_NORMAL; -int eta_print; -unsigned long long mlock_size = 0; +int eta_print = FIO_ETA_AUTO; +int eta_new_line = 0; FILE *f_out = NULL; FILE *f_err = NULL; char **job_sections = NULL; @@ -139,11 +142,21 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'e' | FIO_CLIENT_FLAG, }, + { + .name = (char *) "eta-newline", + .has_arg = required_argument, + .val = 'E' | FIO_CLIENT_FLAG, + }, { .name = (char *) "debug", .has_arg = required_argument, .val = 'd' | FIO_CLIENT_FLAG, }, + { + .name = (char *) "parse-only", + .has_arg = no_argument, + .val = 'P' | FIO_CLIENT_FLAG, + }, { .name = (char *) "section", .has_arg = required_argument, @@ -203,7 +216,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = { }, }; -static void free_shm(void) +void free_threads_shm(void) { struct shmid_ds sbuf; @@ -211,11 +224,19 @@ static void free_shm(void) void *tp = threads; threads = NULL; + shmdt(tp); + shmctl(shm_id, IPC_RMID, &sbuf); + shm_id = -1; + } +} + +void free_shm(void) +{ + if (threads) { file_hash_exit(); flow_exit(); fio_debug_jobp = NULL; - shmdt(tp); - shmctl(shm_id, IPC_RMID, &sbuf); + free_threads_shm(); } scleanup(); @@ -408,7 +429,7 @@ static int fixup_options(struct thread_data *td) /* * only really works with 1 file */ - if (o->zone_size && o->open_files == 1) + if (o->zone_size && o->open_files > 1) o->zone_size = 0; /* @@ -546,6 +567,13 @@ static int fixup_options(struct thread_data *td) } } + if (!o->unit_base) { + if (td->io_ops->flags & FIO_BIT_BASED) + o->unit_base = 1; + else + o->unit_base = 8; + } + #ifndef CONFIG_FDATASYNC if (o->fdatasync_blocks) { log_info("fio: this platform does not support fdatasync()" @@ -593,7 +621,7 @@ static int fixup_options(struct thread_data *td) /* * This function leaks the buffer */ -static char *to_kmg(unsigned int val) +char *fio_uint_to_kmg(unsigned int val) { char *buf = malloc(32); char post[] = { 0, 'K', 'M', 'G', 'P', 'E', 0 }; @@ -786,19 +814,94 @@ static int setup_random_seeds(struct thread_data *td) return 0; } +enum { + FPRE_NONE = 0, + FPRE_JOBNAME, + FPRE_JOBNUM, + FPRE_FILENUM +}; + +static struct fpre_keyword { + const char *keyword; + size_t strlen; + int key; +} fpre_keywords[] = { + { .keyword = "$jobname", .key = FPRE_JOBNAME, }, + { .keyword = "$jobnum", .key = FPRE_JOBNUM, }, + { .keyword = "$filenum", .key = FPRE_FILENUM, }, + { .keyword = NULL, }, + }; + +static char *make_filename(char *buf, struct thread_options *o, + const char *jobname, int jobnum, int filenum) +{ + struct fpre_keyword *f; + char copy[PATH_MAX]; + + if (!o->filename_format || !strlen(o->filename_format)) { + sprintf(buf, "%s.%d.%d", jobname, jobnum, filenum); + return NULL; + } + + for (f = &fpre_keywords[0]; f->keyword; f++) + f->strlen = strlen(f->keyword); + + strcpy(buf, o->filename_format); + memset(copy, 0, sizeof(copy)); + for (f = &fpre_keywords[0]; f->keyword; f++) { + do { + size_t pre_len, post_start = 0; + char *str, *dst = copy; + + str = strcasestr(buf, f->keyword); + if (!str) + break; + + pre_len = str - buf; + if (strlen(str) != f->strlen) + post_start = pre_len + f->strlen; + + if (pre_len) { + strncpy(dst, buf, pre_len); + dst += pre_len; + } + + switch (f->key) { + case FPRE_JOBNAME: + dst += sprintf(dst, "%s", jobname); + break; + case FPRE_JOBNUM: + dst += sprintf(dst, "%d", jobnum); + break; + case FPRE_FILENUM: + dst += sprintf(dst, "%d", filenum); + break; + default: + assert(0); + break; + } + + if (post_start) + strcpy(dst, buf + post_start); + + strcpy(buf, copy); + } while (1); + } + + return buf; +} /* * Adds a job to the list of things todo. Sanitizes the various options * to make sure we don't have conflicts, and initializes various * members of td. */ -static int add_job(struct thread_data *td, const char *jobname, int job_add_num) +static int add_job(struct thread_data *td, const char *jobname, int job_add_num, + int recursed, int client_type) { - const char *ddir_str[] = { NULL, "read", "write", "rw", NULL, - "randread", "randwrite", "randrw", - "trim", NULL, NULL, NULL, "randtrim" }; unsigned int i; char fname[PATH_MAX]; int numjobs, file_alloced; + struct thread_options *o = &td->o; /* * the def_thread is just for options, it's not a real job @@ -811,37 +914,31 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) /* * if we are just dumping the output command line, don't add the job */ - if (dump_cmdline) { + if (dump_cmdline || parse_only) { put_job(td); return 0; } + td->client_type = client_type; + if (profile_td_init(td)) goto err; if (ioengine_load(td)) goto err; - if (td->o.use_thread) - nr_thread++; - else - nr_process++; - - if (td->o.odirect) + if (o->odirect) td->io_ops->flags |= FIO_RAWIO; file_alloced = 0; - if (!td->o.filename && !td->files_index && !td->o.read_iolog_file) { + if (!o->filename && !td->files_index && !o->read_iolog_file) { file_alloced = 1; - if (td->o.nr_files == 1 && exists_and_not_file(jobname)) + if (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); - add_file(td, fname); - } + for (i = 0; i < o->nr_files; i++) + add_file(td, make_filename(fname, o, jobname, td->thread_number, i)); } } @@ -866,9 +963,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->mutex = fio_mutex_init(FIO_MUTEX_LOCKED); - td->ts.clat_percentiles = td->o.clat_percentiles; - td->ts.percentile_precision = td->o.percentile_precision; - memcpy(td->ts.percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list)); + td->ts.clat_percentiles = o->clat_percentiles; + td->ts.percentile_precision = o->percentile_precision; + memcpy(td->ts.percentile_list, o->percentile_list, sizeof(o->percentile_list)); for (i = 0; i < DDIR_RWDIR_CNT; i++) { td->ts.clat_stat[i].min_val = ULONG_MAX; @@ -876,9 +973,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->ts.lat_stat[i].min_val = ULONG_MAX; td->ts.bw_stat[i].min_val = ULONG_MAX; } - td->ddir_seq_nr = td->o.ddir_seq_nr; + td->ddir_seq_nr = o->ddir_seq_nr; - if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { + if ((o->stonewall || o->new_group) && prev_group_jobs) { prev_group_jobs = 0; groupid++; } @@ -894,43 +991,40 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (setup_rate(td)) goto err; - if (td->o.write_lat_log) { - setup_log(&td->lat_log, td->o.log_avg_msec); - setup_log(&td->slat_log, td->o.log_avg_msec); - setup_log(&td->clat_log, td->o.log_avg_msec); + if (o->lat_log_file) { + setup_log(&td->lat_log, o->log_avg_msec, IO_LOG_TYPE_LAT); + setup_log(&td->slat_log, o->log_avg_msec, IO_LOG_TYPE_SLAT); + setup_log(&td->clat_log, o->log_avg_msec, IO_LOG_TYPE_CLAT); } - if (td->o.write_bw_log) - setup_log(&td->bw_log, td->o.log_avg_msec); - if (td->o.write_iops_log) - setup_log(&td->iops_log, td->o.log_avg_msec); + if (o->bw_log_file) + setup_log(&td->bw_log, o->log_avg_msec, IO_LOG_TYPE_BW); + if (o->iops_log_file) + setup_log(&td->iops_log, o->log_avg_msec, IO_LOG_TYPE_IOPS); - if (!td->o.name) - td->o.name = strdup(jobname); + if (!o->name) + o->name = strdup(jobname); if (output_format == FIO_OUTPUT_NORMAL) { 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 (is_backend && !recursed) + fio_server_send_add_job(td); + + if (!(td->io_ops->flags & FIO_NOIO)) { char *c1, *c2, *c3, *c4, *c5, *c6; - c1 = to_kmg(td->o.min_bs[DDIR_READ]); - c2 = to_kmg(td->o.max_bs[DDIR_READ]); - c3 = to_kmg(td->o.min_bs[DDIR_WRITE]); - c4 = to_kmg(td->o.max_bs[DDIR_WRITE]); - c5 = to_kmg(td->o.min_bs[DDIR_TRIM]); - c6 = to_kmg(td->o.max_bs[DDIR_TRIM]); + c1 = fio_uint_to_kmg(o->min_bs[DDIR_READ]); + c2 = fio_uint_to_kmg(o->max_bs[DDIR_READ]); + c3 = fio_uint_to_kmg(o->min_bs[DDIR_WRITE]); + c4 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]); + c5 = fio_uint_to_kmg(o->min_bs[DDIR_TRIM]); + c6 = fio_uint_to_kmg(o->max_bs[DDIR_TRIM]); log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s/%s-%s," " ioengine=%s, iodepth=%u\n", td->o.name, td->groupid, - ddir_str[td->o.td_ddir], + ddir_str(o->td_ddir), c1, c2, c3, c4, c5, c6, - td->io_ops->name, - td->o.iodepth); + td->io_ops->name, o->iodepth); free(c1); free(c2); @@ -947,7 +1041,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) * recurse add identical jobs, clear numjobs and stonewall options * as they don't apply to sub-jobs */ - numjobs = td->o.numjobs; + numjobs = o->numjobs; while (--numjobs) { struct thread_data *td_new = get_new_job(0, td, 1); @@ -967,7 +1061,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) job_add_num = numjobs - 1; - if (add_job(td_new, jobname, job_add_num)) + if (add_job(td_new, jobname, job_add_num, 1, client_type)) goto err; } @@ -980,7 +1074,7 @@ err: /* * Parse as if 'o' was a command line */ -void add_job_opts(const char **o) +void add_job_opts(const char **o, int client_type) { struct thread_data *td, *td_parent; int i, in_global = 1; @@ -992,7 +1086,7 @@ void add_job_opts(const char **o) if (!strncmp(o[i], "name", 4)) { in_global = 0; if (td) - add_job(td, jobname, 0); + add_job(td, jobname, 0, 0, client_type); td = NULL; sprintf(jobname, "%s", o[i] + 5); } @@ -1011,7 +1105,7 @@ void add_job_opts(const char **o) } if (td) - add_job(td, jobname, 0); + add_job(td, jobname, 0, 0, client_type); } static int skip_this_section(const char *name) @@ -1049,7 +1143,7 @@ static int is_empty_or_comment(char *line) /* * This is our [ini] type file parser. */ -int parse_jobs_ini(char *file, int is_buf, int stonewall_flag) +int parse_jobs_ini(char *file, int is_buf, int stonewall_flag, int type) { unsigned int global; struct thread_data *td; @@ -1193,7 +1287,7 @@ int parse_jobs_ini(char *file, int is_buf, int stonewall_flag) for (i = 0; i < num_opts; i++) log_info("--%s ", opts[i]); - ret = add_job(td, name, 0); + ret = add_job(td, name, 0, 0, type); } else { log_err("fio: job %s dropped\n", name); put_job(td); @@ -1245,6 +1339,7 @@ static void usage(const char *name) printf(" --debug=options\tEnable debug logging. May be one/more of:\n" "\t\t\tprocess,file,io,mem,blktrace,verify,random,parse,\n" "\t\t\tdiskutil,job,mutex,profile,time,net\n"); + printf(" --parse-only\t\tParse options only, don't start any IO\n"); printf(" --output\t\tWrite output to file\n"); printf(" --runtime\t\tRuntime in seconds\n"); printf(" --latency-log\t\tGenerate per-job latency logs\n"); @@ -1264,6 +1359,8 @@ static void usage(const char *name) printf(" --showcmd\t\tTurn a job file into command line options\n"); printf(" --eta=when\t\tWhen ETA estimate should be printed\n"); printf(" \t\tMay be \"always\", \"never\" or \"auto\"\n"); + printf(" --eta-newline=time\tForce a new line for every 'time'"); + printf(" period passed\n"); printf(" --readonly\t\tTurn on safety read-only checks, preventing" " writes\n"); printf(" --section=name\tOnly run specified section in job file\n"); @@ -1283,20 +1380,62 @@ static void usage(const char *name) #ifdef FIO_INC_DEBUG struct debug_level debug_levels[] = { - { .name = "process", .shift = FD_PROCESS, }, - { .name = "file", .shift = FD_FILE, }, - { .name = "io", .shift = FD_IO, }, - { .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 }, - { .name = "job", .shift = FD_JOB }, - { .name = "mutex", .shift = FD_MUTEX }, - { .name = "profile", .shift = FD_PROFILE }, - { .name = "time", .shift = FD_TIME }, - { .name = "net", .shift = FD_NET }, + { .name = "process", + .help = "Process creation/exit logging", + .shift = FD_PROCESS, + }, + { .name = "file", + .help = "File related action logging", + .shift = FD_FILE, + }, + { .name = "io", + .help = "IO and IO engine action logging (offsets, queue, completions, etc)", + .shift = FD_IO, + }, + { .name = "mem", + .help = "Memory allocation/freeing logging", + .shift = FD_MEM, + }, + { .name = "blktrace", + .help = "blktrace action logging", + .shift = FD_BLKTRACE, + }, + { .name = "verify", + .help = "IO verification action logging", + .shift = FD_VERIFY, + }, + { .name = "random", + .help = "Random generation logging", + .shift = FD_RANDOM, + }, + { .name = "parse", + .help = "Parser logging", + .shift = FD_PARSE, + }, + { .name = "diskutil", + .help = "Disk utility logging actions", + .shift = FD_DISKUTIL, + }, + { .name = "job", + .help = "Logging related to creating/destroying jobs", + .shift = FD_JOB, + }, + { .name = "mutex", + .help = "Mutex logging", + .shift = FD_MUTEX + }, + { .name = "profile", + .help = "Logging related to profiles", + .shift = FD_PROFILE, + }, + { .name = "time", + .help = "Logging related to time keeping functions", + .shift = FD_TIME, + }, + { .name = "net", + .help = "Network logging", + .shift = FD_NET, + }, { .name = NULL, }, }; @@ -1403,7 +1542,7 @@ void parse_cmd_client(void *client, char *opt) fio_client_add_cmd_option(client, opt); } -int parse_cmd_line(int argc, char *argv[]) +int parse_cmd_line(int argc, char *argv[], int client_type) { struct thread_data *td = NULL; int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0; @@ -1505,10 +1644,24 @@ int parse_cmd_line(int argc, char *argv[]) else if (!strcmp("never", optarg)) eta_print = FIO_ETA_NEVER; break; + case 'E': { + long long t = 0; + + if (str_to_decimal(optarg, &t, 0, NULL)) { + log_err("fio: failed parsing eta time %s\n", optarg); + exit_val = 1; + do_exit++; + } + eta_new_line = t; + break; + } case 'd': if (set_debug(optarg)) do_exit++; break; + case 'P': + parse_only = 1; + break; case 'x': { size_t new_size; @@ -1533,7 +1686,7 @@ int parse_cmd_line(int argc, char *argv[]) char *val = optarg; if (!strncmp(opt, "name", 4) && td) { - ret = add_job(td, td->o.name ?: "fio", 0); + ret = add_job(td, td->o.name ?: "fio", 0, 0, client_type); if (ret) return 0; td = NULL; @@ -1613,7 +1766,7 @@ int parse_cmd_line(int argc, char *argv[]) exit_val = 1; break; } - if (fio_client_add(optarg, &cur_client)) { + if (fio_client_add(&fio_client_ops, optarg, &cur_client)) { log_err("fio: failed adding client %s\n", optarg); do_exit++; exit_val = 1; @@ -1664,7 +1817,7 @@ int parse_cmd_line(int argc, char *argv[]) if (td) { if (!ret) - ret = add_job(td, td->o.name ?: "fio", 0); + ret = add_job(td, td->o.name ?: "fio", 0, 0, client_type); } while (!ret && optind < argc) { @@ -1677,10 +1830,8 @@ int parse_cmd_line(int argc, char *argv[]) return ini_idx; } -int parse_options(int argc, char *argv[]) +int fio_init_options(void) { - int job_files, i; - f_out = stdout; f_err = stderr; @@ -1692,7 +1843,22 @@ int parse_options(int argc, char *argv[]) if (fill_def_thread()) return 1; - job_files = parse_cmd_line(argc, argv); + return 0; +} + +extern int fio_check_options(struct thread_options *); + +int parse_options(int argc, char *argv[]) +{ + const int type = FIO_CLIENT_TYPE_CLI; + int job_files, i; + + if (fio_init_options()) + return 1; + if (fio_test_cconv(&def_thread.o)) + log_err("fio: failed internal cconv test\n"); + + job_files = parse_cmd_line(argc, argv, type); if (job_files > 0) { for (i = 0; i < job_files; i++) { @@ -1703,7 +1869,7 @@ int parse_options(int argc, char *argv[]) return 1; free(ini_file[i]); } else if (!is_backend) { - if (parse_jobs_ini(ini_file[i], 0, i)) + if (parse_jobs_ini(ini_file[i], 0, i, type)) return 1; free(ini_file[i]); } @@ -1719,7 +1885,7 @@ int parse_options(int argc, char *argv[]) fio_options_free(&def_thread); if (!thread_number) { - if (dump_cmdline) + if (dump_cmdline || parse_only) return 0; if (exec_profile) return 0; @@ -1749,3 +1915,8 @@ int parse_options(int argc, char *argv[]) return 0; } + +void options_default_fill(struct thread_options *o) +{ + memcpy(o, &def_thread.o, sizeof(*o)); +}