X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=5fc3b224f2d4c766a8a8cd07574fe24120cd173d;hp=9e2d1131d276637983094c1cbdf5afbb9172225a;hb=2b8c71b0f046434d22dffd15308a326bca0c8d16;hpb=9a3f110001f68968def40797bed5632c2406cdfa diff --git a/init.c b/init.c index 9e2d1131..5fc3b224 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; @@ -58,6 +59,7 @@ int log_syslog = 0; int write_bw_log = 0; int read_only = 0; +int status_interval = 0; static int write_lat_log; @@ -99,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, }, { @@ -107,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, @@ -123,9 +130,9 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .val = 'c' | FIO_CLIENT_FLAG, }, { - .name = (char *) "enghelp", + .name = (char *) "enghelp", .has_arg = optional_argument, - .val = 'i' | FIO_CLIENT_FLAG, + .val = 'i' | FIO_CLIENT_FLAG, }, { .name = (char *) "showcmd", @@ -206,17 +213,27 @@ 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, .val = 'I', }, + { + .name = (char *) "status-interval", + .has_arg = required_argument, + .val = 'L', + }, { .name = NULL, }, }; -static void free_shm(void) +void free_threads_shm(void) { struct shmid_ds sbuf; @@ -224,13 +241,22 @@ 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(); } + options_free(fio_options, &def_thread); scleanup(); } @@ -392,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. @@ -476,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, " @@ -607,13 +656,33 @@ static int fixup_options(struct thread_data *td) if (td->o.random_distribution != FIO_RAND_DIST_RANDOM) td->o.norandommap = 1; + /* + * If size is set but less than the min block size, complain + */ + if (o->size && o->size < td_min_bs(td)) { + log_err("fio: size too small, must be larger than the IO size: %llu\n", (unsigned long long) o->size); + ret = 1; + } + + /* + * O_ATOMIC implies O_DIRECT + */ + 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; + return ret; } /* * 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 }; @@ -671,6 +740,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; @@ -679,6 +749,10 @@ static void td_fill_rand_seeds_os(struct thread_data *td) td->rand_seeds[FIO_RAND_BLOCK_OFF] = FIO_RANDSEED * td->thread_number; os_random_seed(td->rand_seeds[FIO_RAND_BLOCK_OFF], &td->random_state); + + os_random_seed(td->rand_seeds[FIO_RAND_SEQ_RAND_READ_OFF], &td->seq_rand_state[DDIR_READ]); + os_random_seed(td->rand_seeds[FIO_RAND_SEQ_RAND_WRITE_OFF], &td->seq_rand_state[DDIR_WRITE]); + os_random_seed(td->rand_seeds[FIO_RAND_SEQ_RAND_TRIM_OFF], &td->seq_rand_state[DDIR_TRIM]); } static void td_fill_rand_seeds_internal(struct thread_data *td) @@ -692,6 +766,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; @@ -700,10 +775,19 @@ static void td_fill_rand_seeds_internal(struct thread_data *td) td->rand_seeds[FIO_RAND_BLOCK_OFF] = FIO_RANDSEED * td->thread_number; init_rand_seed(&td->__random_state, td->rand_seeds[FIO_RAND_BLOCK_OFF]); + init_rand_seed(&td->__seq_rand_state[DDIR_READ], td->rand_seeds[FIO_RAND_SEQ_RAND_READ_OFF]); + init_rand_seed(&td->__seq_rand_state[DDIR_WRITE], td->rand_seeds[FIO_RAND_SEQ_RAND_WRITE_OFF]); + init_rand_seed(&td->__seq_rand_state[DDIR_TRIM], td->rand_seeds[FIO_RAND_SEQ_RAND_TRIM_OFF]); } 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 @@ -725,6 +809,10 @@ int ioengine_load(struct thread_data *td) */ if (td->io_ops) return 0; + if (!td->o.ioengine) { + log_err("fio: internal fault, no IO engine specified\n"); + return 1; + } engine = get_engine_name(td->o.ioengine); td->io_ops = load_ioengine(td, engine); @@ -791,10 +879,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++) { @@ -882,16 +975,20 @@ static char *make_filename(char *buf, struct thread_options *o, return buf; } + +int parse_dryrun(void) +{ + return dump_cmdline || parse_only; +} + /* * 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; @@ -908,22 +1005,19 @@ 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 || parse_only) { + if (parse_dryrun()) { put_job(td); return 0; } + td->client_type = client_type; + if (profile_td_init(td)) goto err; if (ioengine_load(td)) goto err; - if (o->use_thread) - nr_thread++; - else - nr_process++; - if (o->odirect) td->io_ops->flags |= FIO_RAWIO; @@ -932,10 +1026,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); 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); } } @@ -988,40 +1082,50 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (setup_rate(td)) goto err; - if (o->write_lat_log) { - setup_log(&td->lat_log, o->log_avg_msec); - setup_log(&td->slat_log, o->log_avg_msec); - setup_log(&td->clat_log, 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 (o->write_bw_log) - setup_log(&td->bw_log, o->log_avg_msec); - if (o->write_iops_log) - setup_log(&td->iops_log, 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 (!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", o->name, - o->cpuload, o->cpucycle); - } else { - char *c1, *c2, *c3, *c4, *c5, *c6; - - c1 = to_kmg(o->min_bs[DDIR_READ]); - c2 = to_kmg(o->max_bs[DDIR_READ]); - c3 = to_kmg(o->min_bs[DDIR_WRITE]); - c4 = to_kmg(o->max_bs[DDIR_WRITE]); - c5 = to_kmg(o->min_bs[DDIR_TRIM]); - c6 = 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", - o->name, td->groupid, - ddir_str[o->td_ddir], - c1, c2, c3, c4, c5, c6, + if (is_backend && !recursed) + fio_server_send_add_job(td); + + if (!(td->io_ops->flags & FIO_NOIO)) { + char *c1, *c2, *c3, *c4; + char *c5 = NULL, *c6 = NULL; + + 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]); + + if (!o->bs_is_seq_rand) { + 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, ", td->o.name, + td->groupid, + ddir_str(o->td_ddir)); + + if (o->bs_is_seq_rand) + log_info("bs(seq/rand)=%s-%s/%s-%s, ", + c1, c2, c3, c4); + else + log_info("bs=%s-%s/%s-%s/%s-%s, ", + c1, c2, c3, c4, c5, c6); + + log_info("ioengine=%s, iodepth=%u\n", td->io_ops->name, o->iodepth); free(c1); @@ -1051,15 +1155,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)) + if (add_job(td_new, jobname, numjobs, 1, client_type)) goto err; } @@ -1072,7 +1185,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; @@ -1084,7 +1197,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); } @@ -1096,14 +1209,14 @@ void add_job_opts(const char **o) td = get_new_job(0, td_parent, 0); } if (in_global) - fio_options_parse(td_parent, (char **) &o[i], 1); + fio_options_parse(td_parent, (char **) &o[i], 1, 0); else - fio_options_parse(td, (char **) &o[i], 1); + fio_options_parse(td, (char **) &o[i], 1, 0); i++; } if (td) - add_job(td, jobname, 0); + add_job(td, jobname, 0, 0, client_type); } static int skip_this_section(const char *name) @@ -1141,7 +1254,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; @@ -1235,7 +1348,7 @@ int parse_jobs_ini(char *file, int is_buf, int stonewall_flag) } /* - * Seperate multiple job files by a stonewall + * Separate multiple job files by a stonewall */ if (!global && stonewall) { td->o.stonewall = stonewall; @@ -1279,14 +1392,10 @@ int parse_jobs_ini(char *file, int is_buf, int stonewall_flag) num_opts++; } - ret = fio_options_parse(td, opts, num_opts); - if (!ret) { - if (dump_cmdline) - for (i = 0; i < num_opts; i++) - log_info("--%s ", opts[i]); - - ret = add_job(td, name, 0); - } else { + ret = fio_options_parse(td, opts, num_opts, dump_cmdline); + if (!ret) + ret = add_job(td, name, 0, 0, type); + else { log_err("fio: job %s dropped\n", name); put_job(td); } @@ -1336,7 +1445,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"); @@ -1348,6 +1457,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" @@ -1359,6 +1469,8 @@ static void usage(const char *name) 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(" --status-interval=t\tForce full status dump every"); + printf(" 't' 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"); @@ -1373,25 +1485,72 @@ 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 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 = "rate", + .help = "Rate logging", + .shift = FD_RATE, + }, { .name = NULL, }, }; @@ -1498,7 +1657,9 @@ void parse_cmd_client(void *client, char *opt) fio_client_add_cmd_option(client, opt); } -int parse_cmd_line(int argc, char *argv[]) +extern int fio_crctest(const char *); + +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; @@ -1546,6 +1707,12 @@ int parse_cmd_line(int argc, char *argv[]) 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")) @@ -1555,6 +1722,9 @@ int parse_cmd_line(int argc, char *argv[]) else output_format = FIO_OUTPUT_NORMAL; break; + case 'f': + append_terse_output = 1; + break; case 'h': if (!cur_client) { usage(argv[0]); @@ -1642,7 +1812,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; @@ -1663,7 +1833,20 @@ int parse_cmd_line(int argc, char *argv[]) fio_options_set_ioengine_opts(l_opts, td); } - ret = fio_cmd_option_parse(td, opt, val); + if ((!val || !strlen(val)) && + l_opts[lidx].has_arg == required_argument) { + log_err("fio: option %s requires an argument\n", opt); + ret = 1; + } else + ret = fio_cmd_option_parse(td, opt, val); + + if (ret) { + if (td) { + put_job(td); + td = NULL; + } + do_exit++; + } if (!ret && !strcmp(opt, "ioengine")) { free_ioengine(td); @@ -1676,8 +1859,6 @@ int parse_cmd_line(int argc, char *argv[]) case FIO_GETOPT_IOENGINE: { const char *opt = l_opts[lidx].name; char *val = optarg; - opt = l_opts[lidx].name; - val = optarg; ret = fio_cmd_ioengine_option_parse(td, opt, val); break; } @@ -1722,7 +1903,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; @@ -1745,6 +1926,22 @@ int parse_cmd_line(int argc, char *argv[]) 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)) { + log_err("fio: failed parsing time %s\n", optarg); + do_exit++; + exit_val = 1; + break; + } + status_interval = val * 1000; + break; + } case '?': log_err("%s: unrecognized option '%s'\n", argv[0], argv[optind - 1]); @@ -1757,10 +1954,8 @@ int parse_cmd_line(int argc, char *argv[]) break; } - if (do_exit) { - if (exit_val && !(is_backend || nr_clients)) - exit(exit_val); - } + if (do_exit && !(is_backend || nr_clients)) + exit(exit_val); if (nr_clients && fio_clients_connect()) { do_exit++; @@ -1773,7 +1968,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) { @@ -1786,10 +1981,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; @@ -1801,7 +1994,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++) { @@ -1812,7 +2020,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]); } @@ -1826,9 +2034,10 @@ int parse_options(int argc, char *argv[]) free(ini_file); fio_options_free(&def_thread); + filesetup_mem_free(); if (!thread_number) { - if (dump_cmdline || parse_only) + if (parse_dryrun()) return 0; if (exec_profile) return 0; @@ -1858,3 +2067,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)); +}