Messages in this thread Patch in this message | | | Date | Fri, 29 May 2015 11:35:03 -0700 | From | "tip-bot for Martin Liška" <> | Subject | [tip:perf/core] perf annotate: Fix -i option, which is currently ignored. |
| |
Commit-ID: 44848cdbbd1bacbac2a825920b699adc000d51c7 Gitweb: http://git.kernel.org/tip/44848cdbbd1bacbac2a825920b699adc000d51c7 Author: Martin Liška <mliska@suse.cz> AuthorDate: Fri, 29 May 2015 14:06:44 +0200 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Fri, 29 May 2015 12:43:34 -0300
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> --- tools/perf/builtin-annotate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index c434e12..4e08c2d 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) }, }; struct perf_data_file file = { - .path = input_name, .mode = PERF_DATA_MODE_READ, }; const struct option options[] = { @@ -346,6 +345,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) else if (annotate.use_gtk) use_browser = 2; + file.path = input_name; + setup_browser(true); annotate.session = perf_session__new(&file, false, &annotate.tool);
| |