Commit 68d80758 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Tested-by: default avatarDavid 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9783adf7

tools/perf/builtin-report.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

tools/perf/builtin-top.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

tools/perf/ui/browsers/hists.c

+16 −6
Original line number Diff line number Diff line
@@ -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)

					   struct hist_browser_timer *hbt,

					   struct perf_session_env *env)

{

	struct perf_evsel *pos;

	struct perf_evsel_menu menu = {
@@ -1611,6 +1619,7 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist, 
			.nr_entries = evlist->nr_entries,

			.priv	    = evlist,

		},

		.env = env,

	};



	ui_helpline__push("Press ESC to exit");
@@ -1627,15 +1636,16 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist, 
}



int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,

				  struct hist_browser_timer *hbt)

				  struct hist_browser_timer *hbt,

				  struct perf_session_env *env)

{

	if (evlist->nr_entries == 1) {

		struct perf_evsel *first = list_entry(evlist->entries.next,

						      struct perf_evsel, node);

		const char *ev_name = perf_evsel__name(first);

		return perf_evsel__hists_browse(first, evlist->nr_entries, help,

						ev_name, false, hbt);

						ev_name, false, hbt, env);

	}



	return __perf_evlist__tui_browse_hists(evlist, help, hbt);

	return __perf_evlist__tui_browse_hists(evlist, help, hbt, env);

}

tools/perf/util/hist.h

+5 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/types.h>

#include <pthread.h>

#include "callchain.h"

#include "header.h"



extern struct callchain_param callchain_param;
@@ -169,13 +170,15 @@ int hist_entry__tui_annotate(struct hist_entry *he, int evidx, 
			     struct hist_browser_timer *hbt);



int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,

				  struct hist_browser_timer *hbt);

				  struct hist_browser_timer *hbt,

				  struct perf_session_env *env);

int script_browse(const char *script_opt);

#else

static inline

int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused,

				  const char *help __maybe_unused,

				  struct hist_browser_timer *hbt __maybe_unused)

				  struct hist_browser_timer *hbt __maybe_unused,

				  struct perf_session_env *env __maybe_unused)

{

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE