X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=a2b70c4acb4ba51a7916eda28f90bbcf3cdb10a9;hp=09f58a3538d4c4b28974bfc64b384ab111420e19;hb=6616949337d8409ec0999f2b3ad240ea2d037a82;hpb=789b8673d37e5da124bc2511b3c31410f9b7f3e6 diff --git a/init.c b/init.c index 09f58a35..a2b70c4a 100644 --- a/init.c +++ b/init.c @@ -30,6 +30,7 @@ #include "idletime.h" #include "filelock.h" #include "steadystate.h" +#include "blktrace.h" #include "oslib/getopt.h" #include "oslib/strcasestr.h" @@ -44,15 +45,16 @@ const char fio_version_string[] = FIO_VERSION; static char **ini_file; static int max_jobs = FIO_MAX_JOBS; -static int dump_cmdline; -static int parse_only; +static bool dump_cmdline; +static bool parse_only; +static bool merge_blktrace_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; +bool exitall_on_terminate = false; int output_format = FIO_OUTPUT_NORMAL; int eta_print = FIO_ETA_AUTO; unsigned int eta_interval_msec = 1000; @@ -62,13 +64,13 @@ FILE *f_err = NULL; char *exec_profile = NULL; int warnings_fatal = 0; int terse_version = 3; -int is_backend = 0; -int is_local_backend = 0; +bool is_backend = false; +bool is_local_backend = false; int nr_clients = 0; -int log_syslog = 0; +bool log_syslog = false; -int write_bw_log = 0; -int read_only = 0; +bool write_bw_log = false; +bool read_only = false; int status_interval = 0; char *trigger_file = NULL; @@ -286,6 +288,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'K', }, + { + .name = (char *) "merge-blktrace-only", + .has_arg = no_argument, + .val = 'A' | FIO_CLIENT_FLAG, + }, { .name = NULL, }, @@ -737,19 +744,12 @@ static int fixup_options(struct thread_data *td) /* * There's no need to check for in-flight overlapping IOs if the job * isn't changing data or the maximum iodepth is guaranteed to be 1 + * when we are not in offload mode */ if (o->serialize_overlap && !(td->flags & TD_F_READ_IOLOG) && - (!(td_write(td) || td_trim(td)) || o->iodepth == 1)) + (!(td_write(td) || td_trim(td)) || o->iodepth == 1) && + o->io_submit_mode != IO_MODE_OFFLOAD) o->serialize_overlap = 0; - /* - * Currently can't check for overlaps in offload mode - */ - if (o->serialize_overlap && o->io_submit_mode == IO_MODE_OFFLOAD) { - log_err("fio: checking for in-flight overlaps when the " - "io_submit_mode is offload is not supported\n"); - o->serialize_overlap = 0; - ret |= warnings_fatal; - } if (o->nr_files > td->files_index) o->nr_files = td->files_index; @@ -1681,6 +1681,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, char *c1, *c2, *c3, *c4; char *c5 = NULL, *c6 = NULL; int i2p = is_power_of_2(o->kb_base); + struct buf_output out; c1 = num2str(o->min_bs[DDIR_READ], o->sig_figs, 1, i2p, N2S_BYTE); c2 = num2str(o->max_bs[DDIR_READ], o->sig_figs, 1, i2p, N2S_BYTE); @@ -1692,19 +1693,22 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, c6 = num2str(o->max_bs[DDIR_TRIM], o->sig_figs, 1, i2p, N2S_BYTE); } - log_info("%s: (g=%d): rw=%s, ", td->o.name, + buf_output_init(&out); + __log_buf(&out, "%s: (g=%d): rw=%s, ", td->o.name, td->groupid, ddir_str(o->td_ddir)); if (o->bs_is_seq_rand) - log_info("bs=(R) %s-%s, (W) %s-%s, bs_is_seq_rand, ", + __log_buf(&out, "bs=(R) %s-%s, (W) %s-%s, bs_is_seq_rand, ", c1, c2, c3, c4); else - log_info("bs=(R) %s-%s, (W) %s-%s, (T) %s-%s, ", + __log_buf(&out, "bs=(R) %s-%s, (W) %s-%s, (T) %s-%s, ", c1, c2, c3, c4, c5, c6); - log_info("ioengine=%s, iodepth=%u\n", + __log_buf(&out, "ioengine=%s, iodepth=%u\n", td->io_ops->name, o->iodepth); + log_info_buf(out.buf, out.buflen); + buf_output_free(&out); free(c1); free(c2); @@ -1720,6 +1724,14 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, if (td_steadystate_init(td)) goto err; + if (o->merge_blktrace_file && !merge_blktrace_iologs(td)) + goto err; + + if (merge_blktrace_only) { + put_job(td); + return 0; + } + /* * recurse add identical jobs, clear numjobs and stonewall options * as they don't apply to sub-jobs @@ -2169,6 +2181,7 @@ static void usage(const char *name) printf(" --debug=options\tEnable debug logging. May be one/more of:\n"); show_debug_categories(); printf(" --parse-only\t\tParse options only, don't start any IO\n"); + printf(" --merge-blktrace-only\tMerge blktraces only, don't start any IO\n"); printf(" --output\t\tWrite output to file\n"); printf(" --bandwidth-log\tGenerate aggregate bandwidth logs\n"); printf(" --minimal\t\tMinimal (terse) output\n"); @@ -2467,7 +2480,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) char *ostr = cmd_optstr; char *pid_file = NULL; void *cur_client = NULL; - int backend = 0; + bool backend = false; /* * Reset optind handling, since we may call this multiple times @@ -2493,7 +2506,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) exit_val = 1; break; case 'b': - write_bw_log = 1; + write_bw_log = true; break; case 'o': { FILE *tmp; @@ -2548,7 +2561,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) break; case 's': did_arg = true; - dump_cmdline = 1; + dump_cmdline = true; break; case 'r': read_only = 1; @@ -2614,7 +2627,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) break; case 'P': did_arg = true; - parse_only = 1; + parse_only = true; break; case 'x': { size_t new_size; @@ -2739,8 +2752,8 @@ int parse_cmd_line(int argc, char *argv[], int client_type) } if (optarg) fio_server_set_arg(optarg); - is_backend = 1; - backend = 1; + is_backend = true; + backend = true; #else log_err("fio: client/server requires SHM support\n"); do_exit++; @@ -2885,6 +2898,11 @@ int parse_cmd_line(int argc, char *argv[], int client_type) } trigger_timeout /= 1000000; break; + + case 'A': + did_arg = true; + merge_blktrace_only = true; + break; case '?': log_err("%s: unrecognized option '%s'\n", argv[0], argv[optind - 1]);