diff options
author | Martin Liška <mliska@suse.cz> | 2015-05-29 08:06:44 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-05-29 11:43:34 -0400 |
commit | 44848cdbbd1bacbac2a825920b699adc000d51c7 (patch) | |
tree | 2759c8238e1c3721957ddded0b274e3043033384 /tools/perf/builtin-annotate.c | |
parent | f1942b96b4b44c1ab0e0b82fef93ba7e1fada7af (diff) |
perf annotate: Fix -i option, which is currently ignored.
Assign input_name, received from program arguments, to file data
structure.
Signed-off-by: Martin Liska <mliska@suse.cz>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/55685654.2010209@suse.cz
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r-- | tools/perf/builtin-annotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index c434e1264087..4e08c2d2090e 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
@@ -289,7 +289,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) | |||
289 | }, | 289 | }, |
290 | }; | 290 | }; |
291 | struct perf_data_file file = { | 291 | struct perf_data_file file = { |
292 | .path = input_name, | ||
293 | .mode = PERF_DATA_MODE_READ, | 292 | .mode = PERF_DATA_MODE_READ, |
294 | }; | 293 | }; |
295 | const struct option options[] = { | 294 | const struct option options[] = { |
@@ -346,6 +345,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) | |||
346 | else if (annotate.use_gtk) | 345 | else if (annotate.use_gtk) |
347 | use_browser = 2; | 346 | use_browser = 2; |
348 | 347 | ||
348 | file.path = input_name; | ||
349 | |||
349 | setup_browser(true); | 350 | setup_browser(true); |
350 | 351 | ||
351 | annotate.session = perf_session__new(&file, false, &annotate.tool); | 352 | annotate.session = perf_session__new(&file, false, &annotate.tool); |