X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=e944856031b9623753b0add9a003b26119caf590;hp=fa1df8e7e760eac9c7a37f7d8afaa3ff9614c6cd;hb=45aeca74dc812f33a6617687fc7cb25a1cd2779b;hpb=eb0c74ae74ce458dd55b7a7d11c5ba7ae59bf5ed diff --git a/init.c b/init.c index fa1df8e7..e9448560 100644 --- a/init.c +++ b/init.c @@ -28,6 +28,8 @@ #include "lib/getopt.h" #include "lib/strcasestr.h" +#include "crc/test.h" + const char fio_version_string[] = FIO_VERSION; #define FIO_RANDSEED (0xb1899bedUL) @@ -40,15 +42,16 @@ static int parse_only; static struct thread_data def_thread; struct thread_data *threads = NULL; +static char **job_sections; +static int nr_job_sections; 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; FILE *f_err = NULL; -char **job_sections = NULL; -int nr_job_sections = 0; char *exec_profile = NULL; int warnings_fatal = 0; int terse_version = 3; @@ -108,6 +111,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, @@ -241,7 +249,7 @@ void free_threads_shm(void) } } -void free_shm(void) +static void free_shm(void) { if (threads) { file_hash_exit(); @@ -412,6 +420,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. @@ -496,6 +524,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, " @@ -647,6 +678,11 @@ static int fixup_options(struct thread_data *td) 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; } @@ -711,6 +747,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; @@ -736,6 +773,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; @@ -751,6 +789,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 @@ -989,10 +1033,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); } } @@ -1045,12 +1089,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, if (setup_rate(td)) goto err; - if (o->lat_log_file) { + if (o->lat_log_file || write_lat_log) { 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 (o->bw_log_file) + if (o->bw_log_file || write_bw_log) 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); @@ -1118,15 +1162,25 @@ 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; + if (td_new->files) { + struct fio_file *f; + for_each_file(td_new, f, i) { + if (f->file_name) + sfree(f->file_name); + sfree(f); + } + free(td_new->files); + td_new->files = NULL; + } td_new->files_index = 0; td_new->files_size = 0; - 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; } @@ -1606,13 +1660,11 @@ static int client_flag_set(char c) return 0; } -void parse_cmd_client(void *client, char *opt) +static 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; @@ -1676,6 +1728,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]); @@ -1724,7 +1779,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++; @@ -1884,7 +1939,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) 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; @@ -1908,11 +1963,8 @@ int parse_cmd_line(int argc, char *argv[], int client_type) if (do_exit && !(is_backend || nr_clients)) exit(exit_val); - if (nr_clients && fio_clients_connect()) { - do_exit++; - exit_val = 1; - return -1; - } + if (nr_clients && fio_clients_connect()) + exit(1); if (is_backend && backend) return fio_start_server(pid_file); @@ -1985,6 +2037,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())