Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8362951b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf report: Move hist browser selection code to separate function 

To unclutter the main function.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-agvxwpazlucy6h5sejuttw9t@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fad2918e

tools/perf/builtin-report.c

+46 −33
Original line number Original line Diff line number Diff line
@@ -441,13 +441,57 @@ static void report__warn_kptr_restrict(const struct report *rep) 
	}

	}

}

}





static int report__gtk_browse_hists(struct report *rep, const char *help)

{

	int (*hist_browser)(struct perf_evlist *evlist, const char *help,

			    struct hist_browser_timer *timer, float min_pcnt);



	hist_browser = dlsym(perf_gtk_handle, "perf_evlist__gtk_browse_hists");



	if (hist_browser == NULL) {

		ui__error("GTK browser not found!\n");

		return -1;

	}



	return hist_browser(rep->session->evlist, help, NULL, rep->min_percent);

}



static int report__browse_hists(struct report *rep)

{

	int ret;

	struct perf_session *session = rep->session;

	struct perf_evlist *evlist = session->evlist;

	const char *help = "For a higher level overview, try: perf report --sort comm,dso";



	switch (use_browser) {

	case 1:

		ret = perf_evlist__tui_browse_hists(evlist, help, NULL,

						    rep->min_percent,

						    &session->header.env);

		/*

		 * Usually "ret" is the last pressed key, and we only

		 * care if the key notifies us to switch data file.

		 */

		if (ret != K_SWITCH_INPUT_DATA)

			ret = 0;

		break;

	case 2:

		ret = report__gtk_browse_hists(rep, help);

		break;

	default:

		ret = perf_evlist__tty_browse_hists(evlist, rep, help);

		break;

	}



	return ret;

}



static int __cmd_report(struct report *rep)

static int __cmd_report(struct report *rep)

{

{

	int ret = -EINVAL;

	int ret = -EINVAL;

	u64 nr_samples;

	u64 nr_samples;

	struct perf_session *session = rep->session;

	struct perf_session *session = rep->session;

	struct perf_evsel *pos;

	struct perf_evsel *pos;

	const char *help = "For a higher level overview, try: perf report --sort comm,dso";

	struct ui_progress prog;

	struct ui_progress prog;

	struct perf_data_file *file = session->file;

	struct perf_data_file *file = session->file;
@@ -524,38 +568,7 @@ static int __cmd_report(struct report *rep) 
	list_for_each_entry(pos, &session->evlist->entries, node)

	list_for_each_entry(pos, &session->evlist->entries, node)

		hists__output_resort(&pos->hists);

		hists__output_resort(&pos->hists);





	if (use_browser > 0) {

	return report__browse_hists(rep);

		if (use_browser == 1) {

			ret = perf_evlist__tui_browse_hists(session->evlist,

							help, NULL,

							rep->min_percent,

							&session->header.env);

			/*

			 * Usually "ret" is the last pressed key, and we only

			 * care if the key notifies us to switch data file.

			 */

			if (ret != K_SWITCH_INPUT_DATA)

				ret = 0;



		} else if (use_browser == 2) {

			int (*hist_browser)(struct perf_evlist *,

					    const char *,

					    struct hist_browser_timer *,

					    float min_pcnt);



			hist_browser = dlsym(perf_gtk_handle,

					     "perf_evlist__gtk_browse_hists");

			if (hist_browser == NULL) {

				ui__error("GTK browser not found!\n");

				return ret;

			}

			hist_browser(session->evlist, help, NULL,

				     rep->min_percent);

		}

	} else

		perf_evlist__tty_browse_hists(session->evlist, rep, help);



	return ret;

}

}





static int

static int