Re: [PATCH 3/3] perf report: Postpone objdump check until annotation requested

[David Ahern]

On 11/1/12 11:50 PM, Namhyung Kim wrote:

From: Namhyung Kim 

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 doens't make sense.

Reported-by: David Ahern 
Cc: Irina Tirdea 
Signed-off-by: Namhyung Kim 
---
  tools/perf/builtin-report.c|  9 ++---
  tools/perf/builtin-top.c   |  3 ++-
  tools/perf/ui/browsers/hists.c | 22 --
  tools/perf/util/hist.h |  7 +--
  4 files changed, 25 insertions(+), 16 deletions(-)


Reviewed-by/Tested-by: David Ahern 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/3] perf report: Postpone objdump check until annotation requested

[Namhyung Kim]

From: Namhyung Kim 

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 doens't make sense.

Reported-by: David Ahern 
Cc: Irina Tirdea 
Signed-off-by: Namhyung Kim 
---
 tools/perf/builtin-report.c|  9 ++---
 tools/perf/builtin-top.c   |  3 ++-
 tools/perf/ui/browsers/hists.c | 22 --
 tools/perf/util/hist.h |  7 +--
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 234f34d466e3..fc251005dd3d 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -428,7 +428,8 @@ static int __cmd_report(struct perf_report *rep)
if (use_browser > 0) {
if (use_browser == 1) {
perf_evlist__tui_browse_hists(session->evlist, help,
- NULL);
+ NULL,
+ &session->header.env);
} else if (use_browser == 2) {
perf_evlist__gtk_browse_hists(session->evlist, help,
  NULL);
@@ -672,12 +673,6 @@ int cmd_report(int argc, const char **argv, const char 
*prefix __maybe_unused)
has_br_stack = perf_header__has_feat(&session->header,
 HEADER_BRANCH_STACK);
 
-   if (!objdump_path) {
-   ret = perf_session_env__lookup_objdump(&session->header.env);
-   if (ret)
-   goto error;
-   }
-
if (sort__branch_mode == -1 && has_br_stack)
sort__branch_mode = 1;
 
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 102b43c9905d..c9ff3950cd4b 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -598,7 +598,8 @@ static void *display_thread_tui(void *arg)
list_for_each_entry(pos, &top->evlist->entries, node)
pos->hists.uid_filter_str = top->target.uid_str;
 
-   perf_evlist__tui_browse_hists(top->evlist, help, &hbt);
+   perf_evlist__tui_browse_hists(top->evlist, help, &hbt,
+ &top->session->header.env);
 
exit_browser(0);
exit(0);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index c7d32edb8057..ccc4bd161420 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -11,6 +11,7 @@
 #include "../../util/pstack.h"
 #include "../../util/sort.h"
 #include "../../util/util.h"
+#include "../../arch/common.h"
 
 #include "../browser.h"
 #include "../helpline.h"
@@ -1137,7 +1138,8 @@ static inline bool is_report_browser(void *timer)
 static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
const char *helpline, const char *ev_name,
bool left_exits,
-   struct hist_browser_timer *hbt)
+   struct hist_browser_timer *hbt,
+   struct perf_session_env *env)
 {
struct hists *hists = &evsel->hists;
struct hist_browser *browser = hist_browser__new(hists);
@@ -1367,6 +1369,9 @@ retry_popup_menu:
struct hist_entry *he;
int err;
 do_annotate:
+   if (!objdump_path && 
perf_session_env__lookup_objdump(env))
+   continue;
+
he = hist_browser__selected_entry(browser);
if (he == NULL)
continue;
@@ -1470,6 +1475,7 @@ struct perf_evsel_menu {
struct ui_browser b;
struct perf_evsel *selection;
bool lost_events, lost_events_warned;
+   struct perf_session_env *env;
 };
 
 static void perf_evsel_menu__write(struct ui_browser *browser,
@@ -1551,7 +1557,8 @@ browse_hists:
hbt->timer(hbt->arg);
ev_name = perf_evsel__name(pos);
key = perf_evsel__hists_browse(pos, nr_events, help,
-  ev_name, true, hbt);
+  ev_name, true, hbt,
+  menu->env);
ui_browser__show_title(&menu->b, title);
switch (key) {
case K_TAB:
@@ -1599,7 +1606,8 @@ out:
 
 static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist,
   const char *help,
-  struct hist_browser_timer *hbt)
+