X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=adb9066b14a86631e0019967889863c091f0b2ac;hp=4dd0c9ae13a38e3d66af6f1b782b03f464daeddd;hb=7cd0ec5dc7fafa028fec04bb6e47b81e7dfc600e;hpb=e171fde52d9c2d0247365793d464a2a3c5e3af22 diff --git a/init.c b/init.c index 4dd0c9ae..adb9066b 100644 --- a/init.c +++ b/init.c @@ -43,6 +43,7 @@ struct thread_data *threads = NULL; int exitall_on_terminate = 0; int output_format = FIO_OUTPUT_NORMAL; +int append_terse_output = 0; int eta_print = FIO_ETA_AUTO; int eta_new_line = 0; FILE *f_out = NULL; @@ -100,7 +101,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = { }, { .name = (char *) "minimal", - .has_arg = optional_argument, + .has_arg = no_argument, .val = 'm' | FIO_CLIENT_FLAG, }, { @@ -108,6 +109,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = optional_argument, .val = 'F' | FIO_CLIENT_FLAG, }, + { + .name = (char *) "append-terse", + .has_arg = optional_argument, + .val = 'f', + }, { .name = (char *) "version", .has_arg = no_argument, @@ -207,6 +213,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = no_argument, .val = 'T', }, + { + .name = (char *) "crctest", + .has_arg = optional_argument, + .val = 'G', + }, { .name = (char *) "idle-prof", .has_arg = required_argument, @@ -245,6 +256,7 @@ void free_shm(void) free_threads_shm(); } + options_free(fio_options, &def_thread); scleanup(); } @@ -406,6 +418,26 @@ static int fixed_block_size(struct thread_options *o) o->min_bs[DDIR_READ] == o->min_bs[DDIR_TRIM]; } + +static unsigned long long get_rand_start_delay(struct thread_data *td) +{ + unsigned long long delayrange; + unsigned long r; + + delayrange = td->o.start_delay_high - td->o.start_delay; + + if (td->o.use_os_rand) { + r = os_random_long(&td->delay_state); + delayrange = (unsigned long long) ((double) delayrange * (r / (OS_RAND_MAX + 1.0))); + } else { + r = __rand(&td->__delay_state); + delayrange = (unsigned long long) ((double) delayrange * (r / (FRAND_MAX + 1.0))); + } + + delayrange += td->o.start_delay; + return delayrange; +} + /* * Lazy way of fixing up options that depend on each other. We could also * define option callback handlers, but this is easier. @@ -490,6 +522,9 @@ static int fixup_options(struct thread_data *td) if (!o->file_size_high) o->file_size_high = o->file_size_low; + if (o->start_delay_high) + o->start_delay = get_rand_start_delay(td); + if (o->norandommap && o->verify != VERIFY_NONE && !fixed_block_size(o)) { log_err("fio: norandommap given for variable block sizes, " @@ -635,6 +670,17 @@ static int fixup_options(struct thread_data *td) if (td->o.oatomic) td->o.odirect = 1; + /* + * If randseed is set, that overrides randrepeat + */ + if (td->o.rand_seed) + td->o.rand_repeatable = 0; + + if ((td->io_ops->flags & FIO_NOEXTEND) && td->o.file_append) { + log_err("fio: can't append/extent with IO engine %s\n", td->io_ops->name); + ret = 1; + } + return ret; } @@ -699,6 +745,7 @@ static void td_fill_rand_seeds_os(struct thread_data *td) 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); + os_random_seed(td->rand_seeds[FIO_RAND_START_DELAY], &td->delay_state); if (!td_random(td)) return; @@ -724,6 +771,7 @@ static void td_fill_rand_seeds_internal(struct thread_data *td) 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]); + init_rand_seed(&td->__delay_state, td->rand_seeds[FIO_RAND_START_DELAY]); if (!td_random(td)) return; @@ -739,6 +787,12 @@ static void td_fill_rand_seeds_internal(struct thread_data *td) void td_fill_rand_seeds(struct thread_data *td) { + if (td->o.allrand_repeatable) { + for (int i = 0; i < FIO_RAND_NR_OFFS; i++) + td->rand_seeds[i] = FIO_RANDSEED * td->thread_number + + i; + } + if (td->o.use_os_rand) td_fill_rand_seeds_os(td); else @@ -830,10 +884,15 @@ static int setup_random_seeds(struct thread_data *td) unsigned long seed; unsigned int i; - if (!td->o.rand_repeatable) + if (!td->o.rand_repeatable && !td->o.rand_seed) return init_random_state(td, td->rand_seeds, sizeof(td->rand_seeds)); - for (seed = 0x89, i = 0; i < 4; i++) + if (!td->o.rand_seed) + seed = 0x89; + else + seed = td->o.rand_seed; + + for (i = 0; i < 4; i++) seed *= 0x9e370001UL; for (i = 0; i < FIO_RAND_NR_OFFS; i++) { @@ -972,10 +1031,10 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, file_alloced = 1; if (o->nr_files == 1 && exists_and_not_file(jobname)) - add_file(td, jobname); + add_file(td, jobname, job_add_num, 0); else { for (i = 0; i < o->nr_files; i++) - add_file(td, make_filename(fname, o, jobname, td->thread_number, i)); + add_file(td, make_filename(fname, o, jobname, job_add_num, i), job_add_num, 0); } } @@ -1101,15 +1160,24 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, td_new->o.new_group = 0; if (file_alloced) { - td_new->o.filename = NULL; td_new->files_index = 0; td_new->files_size = 0; - td_new->files = NULL; + if (td_new->files) { + struct fio_file *f; + for_each_file(td_new, f, i) { + if (f->file_name) + free(f->file_name); + free(f); + } + td_new->files = NULL; + } + if (td_new->o.filename) { + free(td_new->o.filename); + td_new->o.filename = NULL; + } } - job_add_num = numjobs - 1; - - if (add_job(td_new, jobname, job_add_num, 1, client_type)) + if (add_job(td_new, jobname, numjobs, 1, client_type)) goto err; } @@ -1382,7 +1450,7 @@ static void usage(const char *name) 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"); + "\t\t\tdiskutil,job,mutex,profile,time,net,rate\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"); @@ -1394,6 +1462,7 @@ static void usage(const char *name) 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(" --crctest\t\tTest speed of checksum functions\n"); printf(" --cmdhelp=cmd\t\tPrint command help, \"all\" for all of" " them\n"); printf(" --enghelp=engine\tPrint ioengine help, or list" @@ -1421,7 +1490,8 @@ static void usage(const char *name) "\t\t\t(option=system,percpu) or run unit work\n" "\t\t\tcalibration only (option=calibrate)\n"); printf("\nFio was written by Jens Axboe "); - printf("\n Jens Axboe \n"); + printf("\n Jens Axboe "); + printf("\n Jens Axboe \n"); } #ifdef FIO_INC_DEBUG @@ -1482,6 +1552,10 @@ struct debug_level debug_levels[] = { .help = "Network logging", .shift = FD_NET, }, + { .name = "rate", + .help = "Rate logging", + .shift = FD_RATE, + }, { .name = NULL, }, }; @@ -1588,6 +1662,8 @@ void parse_cmd_client(void *client, char *opt) fio_client_add_cmd_option(client, opt); } +extern int fio_crctest(const char *); + int parse_cmd_line(int argc, char *argv[], int client_type) { struct thread_data *td = NULL; @@ -1636,6 +1712,12 @@ int parse_cmd_line(int argc, char *argv[], int client_type) output_format = FIO_OUTPUT_TERSE; break; case 'F': + if (!optarg) { + log_err("fio: missing --output-format argument\n"); + exit_val = 1; + do_exit++; + break; + } if (!strcmp(optarg, "minimal") || !strcmp(optarg, "terse") || !strcmp(optarg, "csv")) @@ -1645,6 +1727,9 @@ int parse_cmd_line(int argc, char *argv[], int client_type) else output_format = FIO_OUTPUT_NORMAL; break; + case 'f': + append_terse_output = 1; + break; case 'h': if (!cur_client) { usage(argv[0]); @@ -1693,7 +1778,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) case 'E': { long long t = 0; - if (str_to_decimal(optarg, &t, 0, NULL)) { + if (str_to_decimal(optarg, &t, 0, NULL, 1)) { log_err("fio: failed parsing eta time %s\n", optarg); exit_val = 1; do_exit++; @@ -1846,10 +1931,14 @@ int parse_cmd_line(int argc, char *argv[], int client_type) do_exit++; exit_val = fio_monotonic_clocktest(); break; + case 'G': + do_exit++; + exit_val = fio_crctest(optarg); + break; case 'L': { long long val; - if (check_str_time(optarg, &val)) { + if (check_str_time(optarg, &val, 0)) { log_err("fio: failed parsing time %s\n", optarg); do_exit++; exit_val = 1; @@ -1950,6 +2039,7 @@ int parse_options(int argc, char *argv[]) free(ini_file); fio_options_free(&def_thread); + filesetup_mem_free(); if (!thread_number) { if (parse_dryrun())