X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=iolog.c;h=cf264916a9ecd83f7b3079bd186573441dba65fb;hb=d3dacdc61dfe878fda0c363084c4330492e38b2b;hp=fa40c8572664a4e14d1e53d39eae3547dc43b672;hpb=3c1f3ca75b447a2bd0a93deb0a2a1210529d2ccb;p=fio.git diff --git a/iolog.c b/iolog.c index fa40c857..cf264916 100644 --- a/iolog.c +++ b/iolog.c @@ -607,12 +607,11 @@ static int open_socket(const char *path) /* * open iolog, check version, and call appropriate parser */ -static bool init_iolog_read(struct thread_data *td) +static bool init_iolog_read(struct thread_data *td, char *fname) { - char buffer[256], *p, *fname; + char buffer[256], *p; FILE *f = NULL; - fname = get_name_by_idx(td->o.read_iolog_file, td->subjob_number); dprint(FD_IO, "iolog: name=%s\n", fname); if (is_socket(fname)) { @@ -701,15 +700,16 @@ bool init_iolog(struct thread_data *td) if (td->o.read_iolog_file) { int need_swap; + char * fname = get_name_by_idx(td->o.read_iolog_file, td->subjob_number); /* * Check if it's a blktrace file and load that if possible. * Otherwise assume it's a normal log file and load that. */ - if (is_blktrace(td->o.read_iolog_file, &need_swap)) - ret = load_blktrace(td, td->o.read_iolog_file, need_swap); + if (is_blktrace(fname, &need_swap)) + ret = load_blktrace(td, fname, need_swap); else - ret = init_iolog_read(td); + ret = init_iolog_read(td, fname); } else if (td->o.write_iolog_file) ret = init_iolog_write(td); else