X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=15b54116816e862f2563db8a67f41fac168e6d46;hp=475a6ad29f69a87da2463f4e020609c5e99861b5;hb=51aa2da8cf422a06ddfa1ce673f3bfc03f96b86e;hpb=521da527743088a9bd2ab882f8b64799d49d5848 diff --git a/init.c b/init.c index 475a6ad2..15b54116 100644 --- a/init.c +++ b/init.c @@ -9,7 +9,9 @@ #include #include #include +#ifndef FIO_NO_HAVE_SHM_H #include +#endif #include #include @@ -36,7 +38,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; @@ -116,6 +118,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, @@ -200,6 +207,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'C', }, + { + .name = (char *) "cpuclock-test", + .has_arg = no_argument, + .val = 'T', + }, { .name = NULL, }, @@ -249,7 +261,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; } @@ -312,6 +324,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; } @@ -362,6 +378,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; } @@ -370,7 +388,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]; } /* @@ -426,8 +446,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. @@ -436,9 +462,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; @@ -467,17 +496,8 @@ static int fixup_options(struct thread_data *td) /* * The low water mark cannot be bigger than the iodepth */ - if (o->iodepth_low > o->iodepth || !o->iodepth_low) { - /* - * syslet work around - if the workload is sequential, - * we want to let the queue drain all the way down to - * avoid seeking between async threads - */ - if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td)) - o->iodepth_low = 1; - else - o->iodepth_low = o->iodepth; - } + if (o->iodepth_low > o->iodepth || !o->iodepth_low) + o->iodepth_low = o->iodepth; /* * If batch number isn't set, default to the same as iodepth @@ -491,15 +511,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; } @@ -536,7 +560,7 @@ static int fixup_options(struct thread_data *td) } } -#ifndef FIO_HAVE_FDATASYNC +#ifndef CONFIG_FDATASYNC if (o->fdatasync_blocks) { log_info("fio: this platform does not support fdatasync()" " falling back to using fsync(). Use the 'fsync'" @@ -570,6 +594,13 @@ static int fixup_options(struct thread_data *td) td->o.compress_percentage = 0; } + /* + * Using a non-uniform random distribution excludes usage of + * a random map + */ + if (td->o.random_distribution != FIO_RAND_DIST_RANDOM) + td->o.norandommap = 1; + return ret; } @@ -625,44 +656,44 @@ static int exists_and_not_file(const char *filename) static void td_fill_rand_seeds_os(struct thread_data *td) { - os_random_seed(td->rand_seeds[0], &td->bsrange_state); - os_random_seed(td->rand_seeds[1], &td->verify_state); - os_random_seed(td->rand_seeds[2], &td->rwmix_state); + os_random_seed(td->rand_seeds[FIO_RAND_BS_OFF], &td->bsrange_state); + os_random_seed(td->rand_seeds[FIO_RAND_VER_OFF], &td->verify_state); + os_random_seed(td->rand_seeds[FIO_RAND_MIX_OFF], &td->rwmix_state); if (td->o.file_service_type == FIO_FSERVICE_RANDOM) - os_random_seed(td->rand_seeds[3], &td->next_file_state); + os_random_seed(td->rand_seeds[FIO_RAND_FILE_OFF], &td->next_file_state); - os_random_seed(td->rand_seeds[5], &td->file_size_state); - os_random_seed(td->rand_seeds[6], &td->trim_state); + os_random_seed(td->rand_seeds[FIO_RAND_FILE_SIZE_OFF], &td->file_size_state); + os_random_seed(td->rand_seeds[FIO_RAND_TRIM_OFF], &td->trim_state); if (!td_random(td)) return; if (td->o.rand_repeatable) - td->rand_seeds[4] = FIO_RANDSEED * td->thread_number; + td->rand_seeds[FIO_RAND_BLOCK_OFF] = FIO_RANDSEED * td->thread_number; - os_random_seed(td->rand_seeds[4], &td->random_state); + os_random_seed(td->rand_seeds[FIO_RAND_BLOCK_OFF], &td->random_state); } static void td_fill_rand_seeds_internal(struct thread_data *td) { - init_rand_seed(&td->__bsrange_state, td->rand_seeds[0]); - init_rand_seed(&td->__verify_state, td->rand_seeds[1]); - init_rand_seed(&td->__rwmix_state, td->rand_seeds[2]); + init_rand_seed(&td->__bsrange_state, td->rand_seeds[FIO_RAND_BS_OFF]); + init_rand_seed(&td->__verify_state, td->rand_seeds[FIO_RAND_VER_OFF]); + init_rand_seed(&td->__rwmix_state, td->rand_seeds[FIO_RAND_MIX_OFF]); if (td->o.file_service_type == FIO_FSERVICE_RANDOM) - init_rand_seed(&td->__next_file_state, td->rand_seeds[3]); + init_rand_seed(&td->__next_file_state, td->rand_seeds[FIO_RAND_FILE_OFF]); - init_rand_seed(&td->__file_size_state, td->rand_seeds[5]); - init_rand_seed(&td->__trim_state, td->rand_seeds[6]); + init_rand_seed(&td->__file_size_state, td->rand_seeds[FIO_RAND_FILE_SIZE_OFF]); + init_rand_seed(&td->__trim_state, td->rand_seeds[FIO_RAND_TRIM_OFF]); if (!td_random(td)) return; if (td->o.rand_repeatable) - td->rand_seeds[4] = FIO_RANDSEED * td->thread_number; + td->rand_seeds[FIO_RAND_BLOCK_OFF] = FIO_RANDSEED * td->thread_number; - init_rand_seed(&td->__random_state, td->rand_seeds[4]); + init_rand_seed(&td->__random_state, td->rand_seeds[FIO_RAND_BLOCK_OFF]); } void td_fill_rand_seeds(struct thread_data *td) @@ -672,7 +703,7 @@ void td_fill_rand_seeds(struct thread_data *td) else td_fill_rand_seeds_internal(td); - init_rand_seed(&td->buf_state, td->rand_seeds[7]); + init_rand_seed(&td->buf_state, td->rand_seeds[FIO_RAND_BUF_OFF]); } @@ -732,6 +763,24 @@ int ioengine_load(struct thread_data *td) return 0; } +static void init_flags(struct thread_data *td) +{ + struct thread_options *o = &td->o; + + if (o->verify_backlog) + td->flags |= TD_F_VER_BACKLOG; + if (o->trim_backlog) + td->flags |= TD_F_TRIM_BACKLOG; + if (o->read_iolog_file) + td->flags |= TD_F_READ_IOLOG; + if (o->refill_buffers) + td->flags |= TD_F_REFILL_BUFFERS; + if (o->scramble_buffers) + td->flags |= TD_F_SCRAMBLE_BUFFERS; + if (o->verify != VERIFY_NONE) + td->flags |= TD_F_VER_NONE; +} + /* * Adds a job to the list of things todo. Sanitizes the various options * to make sure we don't have conflicts, and initializes various @@ -740,7 +789,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; @@ -751,6 +801,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (td == &def_thread) return 0; + init_flags(td); + /* * if we are just dumping the output command line, don't add the job */ @@ -815,10 +867,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) { @@ -850,7 +904,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," @@ -858,18 +912,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); @@ -877,6 +933,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"); @@ -1169,7 +1227,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 */ @@ -1185,13 +1243,15 @@ static void usage(const char *name) "\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(" --cpuclock-test\tPerform test/validation of CPU clock\n"); printf(" --cmdhelp=cmd\t\tPrint command help, \"all\" for all of" " them\n"); printf(" --enghelp=engine\tPrint ioengine help, or list" @@ -1212,7 +1272,7 @@ static void usage(const char *name) printf(" --daemonize=pidfile\tBackground fio server, write pid to file\n"); printf(" --client=hostname\tTalk to remote backend fio server at hostname\n"); printf("\nFio was written by Jens Axboe "); - printf("\n Jens Axboe \n"); + printf("\n Jens Axboe \n"); } #ifdef FIO_INC_DEBUG @@ -1382,7 +1442,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) { @@ -1416,7 +1486,8 @@ int parse_cmd_line(int argc, char *argv[]) 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++; @@ -1534,6 +1605,22 @@ 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; + case 'T': + do_exit++; + exit_val = fio_monotonic_clocktest(); break; default: do_exit++; @@ -1604,6 +1691,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); @@ -1635,7 +1727,7 @@ int parse_options(int argc, char *argv[]) fio_gtod_cpu = def_thread.o.gtod_cpu; } - if (!terse_output) + if (output_format == FIO_OUTPUT_NORMAL) log_info("%s\n", fio_version_string); return 0;