X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=a682423e9801be03a120b6d038f0b8fd6c762c1c;hp=710e86730b7d82aa085eff13433dcc536df1f7f0;hb=108fea772db5f1dd91e2fb67737e3e0d36827b76;hpb=93bcfd20e37cef8cec350fe06d3a086724c9f257 diff --git a/init.c b/init.c index 710e8673..a682423e 100644 --- a/init.c +++ b/init.c @@ -23,16 +23,7 @@ #include "lib/getopt.h" -#include "fio_version.h" - -#if FIO_PATCH > 0 -const char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \ - __fio_stringify(FIO_MINOR) "." \ - __fio_stringify(FIO_PATCH); -#else -const char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \ - __fio_stringify(FIO_MINOR); -#endif +const char fio_version_string[] = FIO_VERSION; #define FIO_RANDSEED (0xb1899bedUL) @@ -45,7 +36,7 @@ static struct thread_data def_thread; struct thread_data *threads = NULL; int exitall_on_terminate = 0; -int terse_output = 0; +int output_format = FIO_OUTPUT_NORMAL; int eta_print; unsigned long long mlock_size = 0; FILE *f_out = NULL; @@ -74,21 +65,23 @@ static char cmd_optstr[256]; static int did_arg; const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = { - { .u.f = 1.0 }, - { .u.f = 5.0 }, - { .u.f = 10.0 }, - { .u.f = 20.0 }, - { .u.f = 30.0 }, - { .u.f = 40.0 }, - { .u.f = 50.0 }, - { .u.f = 60.0 }, - { .u.f = 70.0 }, - { .u.f = 80.0 }, - { .u.f = 90.0 }, - { .u.f = 95.0 }, - { .u.f = 99.0 }, - { .u.f = 99.5 }, - { .u.f = 99.9 }, + { .u.f = 1.00 }, + { .u.f = 5.00 }, + { .u.f = 10.00 }, + { .u.f = 20.00 }, + { .u.f = 30.00 }, + { .u.f = 40.00 }, + { .u.f = 50.00 }, + { .u.f = 60.00 }, + { .u.f = 70.00 }, + { .u.f = 80.00 }, + { .u.f = 90.00 }, + { .u.f = 95.00 }, + { .u.f = 99.00 }, + { .u.f = 99.50 }, + { .u.f = 99.90 }, + { .u.f = 99.95 }, + { .u.f = 99.99 }, }; #define FIO_CLIENT_FLAG (1 << 16) @@ -123,6 +116,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = optional_argument, .val = 'm' | FIO_CLIENT_FLAG, }, + { + .name = (char *) "output-format", + .has_arg = optional_argument, + .val = 'F' | FIO_CLIENT_FLAG, + }, { .name = (char *) "version", .has_arg = no_argument, @@ -256,7 +254,7 @@ static int setup_thread_area(void) shm_id = shmget(0, size, IPC_CREAT | 0600); if (shm_id != -1) break; - if (errno != EINVAL && errno != ENOMEM) { + if (errno != EINVAL && errno != ENOMEM && errno != ENOSPC) { perror("shmget"); break; } @@ -319,6 +317,10 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent, profile_add_hooks(td); td->thread_number = thread_number; + + if (!parent || !parent->o.group_reporting) + stat_number++; + return td; } @@ -369,6 +371,8 @@ static int setup_rate(struct thread_data *td) ret = __setup_rate(td, DDIR_READ); if (td->o.rate[DDIR_WRITE] || td->o.rate_iops[DDIR_WRITE]) ret |= __setup_rate(td, DDIR_WRITE); + if (td->o.rate[DDIR_TRIM] || td->o.rate_iops[DDIR_TRIM]) + ret |= __setup_rate(td, DDIR_TRIM); return ret; } @@ -377,7 +381,9 @@ static int fixed_block_size(struct thread_options *o) { return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] && o->min_bs[DDIR_WRITE] == o->max_bs[DDIR_WRITE] && - o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE]; + o->min_bs[DDIR_TRIM] == o->max_bs[DDIR_TRIM] && + o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE] && + o->min_bs[DDIR_READ] == o->min_bs[DDIR_TRIM]; } /* @@ -433,8 +439,14 @@ static int fixup_options(struct thread_data *td) o->min_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; if (!o->max_bs[DDIR_WRITE]) o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; + if (!o->min_bs[DDIR_TRIM]) + o->min_bs[DDIR_TRIM] = o->bs[DDIR_TRIM]; + if (!o->max_bs[DDIR_TRIM]) + o->max_bs[DDIR_TRIM] = o->bs[DDIR_TRIM]; + o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]); + o->rw_min_bs = min(o->min_bs[DDIR_TRIM], o->rw_min_bs); /* * For random IO, allow blockalign offset other than min_bs. @@ -443,9 +455,12 @@ static int fixup_options(struct thread_data *td) o->ba[DDIR_READ] = o->min_bs[DDIR_READ]; if (!o->ba[DDIR_WRITE] || !td_random(td)) o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE]; + if (!o->ba[DDIR_TRIM] || !td_random(td)) + o->ba[DDIR_TRIM] = o->min_bs[DDIR_TRIM]; if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] || - o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) && + o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE] || + o->ba[DDIR_TRIM] != o->min_bs[DDIR_TRIM]) && !o->norandommap) { log_err("fio: Any use of blockalign= turns off randommap\n"); o->norandommap = 1; @@ -498,15 +513,19 @@ 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[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]))) { + if (((o->rate[DDIR_READ] + o->rate[DDIR_WRITE] + o->rate[DDIR_TRIM]) && + (o->rate_iops[DDIR_READ] + o->rate_iops[DDIR_WRITE] + o->rate_iops[DDIR_TRIM])) || + ((o->ratemin[DDIR_READ] + o->ratemin[DDIR_WRITE] + o->ratemin[DDIR_TRIM]) && + (o->rate_iops_min[DDIR_READ] + o->rate_iops_min[DDIR_WRITE] + o->rate_iops_min[DDIR_TRIM]))) { log_err("fio: rate and rate_iops are mutually exclusive\n"); ret = 1; } - 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])) { + if ((o->rate[DDIR_READ] < o->ratemin[DDIR_READ]) || + (o->rate[DDIR_WRITE] < o->ratemin[DDIR_WRITE]) || + (o->rate[DDIR_TRIM] < o->ratemin[DDIR_TRIM]) || + (o->rate_iops[DDIR_READ] < o->rate_iops_min[DDIR_READ]) || + (o->rate_iops[DDIR_WRITE] < o->rate_iops_min[DDIR_WRITE]) || + (o->rate_iops[DDIR_TRIM] < o->rate_iops_min[DDIR_TRIM])) { log_err("fio: minimum rate exceeds rate\n"); ret = 1; } @@ -568,6 +587,15 @@ static int fixup_options(struct thread_data *td) } #endif + /* + * For fully compressible data, just zero them at init time. + * It's faster than repeatedly filling it. + */ + if (td->o.compress_percentage == 100) { + td->o.zero_buffers = 1; + td->o.compress_percentage = 0; + } + return ret; } @@ -738,7 +766,8 @@ int ioengine_load(struct thread_data *td) static int add_job(struct thread_data *td, const char *jobname, int job_add_num) { const char *ddir_str[] = { NULL, "read", "write", "rw", NULL, - "randread", "randwrite", "randrw" }; + "randread", "randwrite", "randrw", + "trim", NULL, NULL, NULL, "randtrim" }; unsigned int i; char fname[PATH_MAX]; int numjobs, file_alloced; @@ -805,7 +834,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) f->real_file_size = -1ULL; } - td->mutex = fio_mutex_init(0); + td->mutex = fio_mutex_init(FIO_MUTEX_LOCKED); td->ts.clat_percentiles = td->o.clat_percentiles; if (td->o.overwrite_plist) @@ -813,10 +842,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) else memcpy(td->ts.percentile_list, def_percentile_list, sizeof(def_percentile_list)); - 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; + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + td->ts.clat_stat[i].min_val = ULONG_MAX; + td->ts.slat_stat[i].min_val = ULONG_MAX; + 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; if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { @@ -848,7 +879,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (!td->o.name) td->o.name = strdup(jobname); - if (!terse_output) { + if (output_format == FIO_OUTPUT_NORMAL) { if (!job_add_num) { if (!strcmp(td->io_ops->name, "cpuio")) { log_info("%s: ioengine=cpu, cpuload=%u," @@ -856,18 +887,20 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->o.cpuload, td->o.cpucycle); } else { - char *c1, *c2, *c3, *c4; + 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]); - log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s," + 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], - c1, c2, c3, c4, + c1, c2, c3, c4, c5, c6, td->io_ops->name, td->o.iodepth); @@ -875,6 +908,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) free(c2); free(c3); free(c4); + free(c5); + free(c6); } } else if (job_add_num == 1) log_info("...\n"); @@ -1167,7 +1202,7 @@ static int fill_def_thread(void) fio_getaffinity(getpid(), &def_thread.o.cpumask); def_thread.o.timeout = def_timeout; - + def_thread.o.error_dump = 1; /* * fill default options */ @@ -1177,18 +1212,19 @@ static int fill_def_thread(void) static void usage(const char *name) { - printf("fio %s\n", fio_version_string); + printf("%s\n", fio_version_string); printf("%s [options] [job options] \n", 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(" --output\t\tWrite output to file\n"); - printf(" --timeout\t\tRuntime in seconds\n"); + printf(" --runtime\t\tRuntime in seconds\n"); printf(" --latency-log\t\tGenerate per-job latency logs\n"); printf(" --bandwidth-log\tGenerate per-job bandwidth logs\n"); printf(" --minimal\t\tMinimal (terse) output\n"); - printf(" --version\t\tPrint version info and exit\n"); + printf(" --output-format=x\tOutput format (terse,json,normal)\n"); printf(" --terse-version=x\tSet terse version output format to 'x'\n"); + printf(" --version\t\tPrint version info and exit\n"); printf(" --help\t\tPrint this page\n"); printf(" --cmdhelp=cmd\t\tPrint command help, \"all\" for all of" " them\n"); @@ -1380,7 +1416,17 @@ int parse_cmd_line(int argc, char *argv[]) f_err = f_out; break; case 'm': - terse_output = 1; + output_format = FIO_OUTPUT_TERSE; + break; + case 'F': + if (!strcmp(optarg, "minimal") || + !strcmp(optarg, "terse") || + !strcmp(optarg, "csv")) + output_format = FIO_OUTPUT_TERSE; + else if (!strcmp(optarg, "json")) + output_format = FIO_OUTPUT_JSON; + else + output_format = FIO_OUTPUT_NORMAL; break; case 'h': if (!cur_client) { @@ -1408,13 +1454,14 @@ int parse_cmd_line(int argc, char *argv[]) break; case 'v': if (!cur_client) { - log_info("fio %s\n", fio_version_string); + log_info("%s\n", fio_version_string); do_exit++; } break; case 'V': terse_version = atoi(optarg); - if (!(terse_version == 2 || terse_version == 3)) { + if (!(terse_version == 2 || terse_version == 3 || + terse_version == 4)) { log_err("fio: bad terse version format\n"); exit_val = 1; do_exit++; @@ -1532,6 +1579,18 @@ int parse_cmd_line(int argc, char *argv[]) exit_val = 1; break; } + /* + * If the next argument exists and isn't an option, + * assume it's a job file for this client only. + */ + while (optind < argc) { + if (!strncmp(argv[optind], "--", 2) || + !strncmp(argv[optind], "-", 1)) + break; + + fio_client_add_ini_file(cur_client, argv[optind]); + optind++; + } break; default: do_exit++; @@ -1602,6 +1661,11 @@ int parse_options(int argc, char *argv[]) free(ini_file[i]); } } + } else if (nr_clients) { + if (fill_def_thread()) + return 1; + if (fio_clients_send_ini(NULL)) + return 1; } free(ini_file); @@ -1633,8 +1697,8 @@ int parse_options(int argc, char *argv[]) fio_gtod_cpu = def_thread.o.gtod_cpu; } - if (!terse_output) - log_info("fio %s\n", fio_version_string); + if (output_format == FIO_OUTPUT_NORMAL) + log_info("%s\n", fio_version_string); return 0; }