diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-11-02 01:50:06 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-11-05 12:03:58 -0500 |
commit | 68d807586ba83d9cb77f12c8fb7c97ea438d34ad (patch) | |
tree | 15794b3d68f8770312c4e089ff50ece2b78318bc /tools/perf/util | |
parent | 9783adf777a445a1e9d0db4857a3a896a9f42d4a (diff) |
perf report: Postpone objdump check until annotation requested
David reported that current perf report refused to run on a data file
captured from a different machine because of objdump.
Since the objdump tools won't be used unless annotation was requested,
checking its presence at init time doesn't make sense.
Reported-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: David Ahern <dsahern@gmail.com>
Tested-by: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Irina Tirdea <irina.tirdea@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1351835406-15208-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/hist.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 96664cce7c7b..a4f45dd04697 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <pthread.h> | 5 | #include <pthread.h> |
6 | #include "callchain.h" | 6 | #include "callchain.h" |
7 | #include "header.h" | ||
7 | 8 | ||
8 | extern struct callchain_param callchain_param; | 9 | extern struct callchain_param callchain_param; |
9 | 10 | ||
@@ -169,13 +170,15 @@ int hist_entry__tui_annotate(struct hist_entry *he, int evidx, | |||
169 | struct hist_browser_timer *hbt); | 170 | struct hist_browser_timer *hbt); |
170 | 171 | ||
171 | int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help, | 172 | int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help, |
172 | struct hist_browser_timer *hbt); | 173 | struct hist_browser_timer *hbt, |
174 | struct perf_session_env *env); | ||
173 | int script_browse(const char *script_opt); | 175 | int script_browse(const char *script_opt); |
174 | #else | 176 | #else |
175 | static inline | 177 | static inline |
176 | int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused, | 178 | int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused, |
177 | const char *help __maybe_unused, | 179 | const char *help __maybe_unused, |
178 | struct hist_browser_timer *hbt __maybe_unused) | 180 | struct hist_browser_timer *hbt __maybe_unused, |
181 | struct perf_session_env *env __maybe_unused) | ||
179 | { | 182 | { |
180 | return 0; | 183 | return 0; |
181 | } | 184 | } |