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

Commit 5a1a99cd authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf c2c report: Add main TUI browser 



Add the main cachelines TUI browser. It allows to navigate through
cachelines and display their details and callchains (implemented in the
following patches).

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-pk632k4h1uwc5t0lqc7k61zg@git.kernel.org
Link: http://lkml.kernel.org/r/20161021001706.GB23970@krava


[ Handle file with no entries, fixing segfault reported by Kim Phillips ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2d388bd0

tools/perf/builtin-c2c.c

+115 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "data.h"

#include "sort.h"

#include <asm/bug.h>

#include "ui/browsers/hists.h"



struct c2c_hists {

	struct hists		hists;
@@ -53,6 +54,7 @@ struct perf_c2c { 
	int			 node_info;



	bool			 show_src;

	bool			 use_stdio;

};



static struct perf_c2c c2c;
@@ -657,6 +659,10 @@ percent_color(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, 
	c2c_he = container_of(he, struct c2c_hist_entry, he);

	per = get_percent(c2c_he);



#ifdef HAVE_SLANG_SUPPORT

	if (use_browser)

		return __hpp__slsmg_color_printf(hpp, "%*.2f%%", width - 1, per);

#endif

	return hpp_color_scnprintf(hpp, "%*.2f%%", width - 1, per);

}
@@ -1077,6 +1083,8 @@ static struct c2c_dimension dim_dcacheline = { 
	.width		= 18,

};



static struct c2c_header header_offset_tui = HEADER_LOW("Off");



static struct c2c_dimension dim_offset = {

	.header		= HEADER_BOTH("Data address", "Offset"),

	.name		= "offset",
@@ -1803,6 +1811,100 @@ static void perf_c2c__hists_fprintf(FILE *out) 
	print_pareto(out);

}



#ifdef HAVE_SLANG_SUPPORT

static void c2c_browser__update_nr_entries(struct hist_browser *hb)

{

	u64 nr_entries = 0;

	struct rb_node *nd = rb_first(&hb->hists->entries);



	while (nd) {

		struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);



		if (!he->filtered)

			nr_entries++;



		nd = rb_next(nd);

	}



	hb->nr_non_filtered_entries = nr_entries;

}



static int perf_c2c_browser__title(struct hist_browser *browser,

				   char *bf, size_t size)

{

	scnprintf(bf, size,

		  "Shared Data Cache Line Table "

		  "(%lu entries)", browser->nr_non_filtered_entries);

	return 0;

}



static struct hist_browser*

perf_c2c_browser__new(struct hists *hists)

{

	struct hist_browser *browser = hist_browser__new(hists);



	if (browser) {

		browser->title = perf_c2c_browser__title;

		browser->c2c_filter = true;

	}



	return browser;

}



static int perf_c2c__hists_browse(struct hists *hists)

{

	struct hist_browser *browser;

	int key = -1;



	browser = perf_c2c_browser__new(hists);

	if (browser == NULL)

		return -1;



	/* reset abort key so that it can get Ctrl-C as a key */

	SLang_reset_tty();

	SLang_init_tty(0, 0, 0);



	c2c_browser__update_nr_entries(browser);



	while (1) {

		key = hist_browser__run(browser, "help");



		switch (key) {

		case 'q':

			goto out;

		default:

			break;

		}

	}



out:

	hist_browser__delete(browser);

	return 0;

}



static void perf_c2c_display(void)

{

	if (c2c.use_stdio)

		perf_c2c__hists_fprintf(stdout);

	else

		perf_c2c__hists_browse(&c2c.hists.hists);

}

#else

static void perf_c2c_display(void)

{

	use_browser = 0;

	perf_c2c__hists_fprintf(stdout);

}

#endif /* HAVE_SLANG_SUPPORT */



static void ui_quirks(void)

{

	if (!c2c.use_stdio) {

		dim_offset.width  = 5;

		dim_offset.header = header_offset_tui;

	}

}



static int perf_c2c__report(int argc, const char **argv)

{

	struct perf_session *session;
@@ -1819,6 +1921,9 @@ static int perf_c2c__report(int argc, const char **argv) 
		   "the input file to process"),

	OPT_INCR('N', "node-info", &c2c.node_info,

		 "show extra node info in report (repeat for more info)"),

#ifdef HAVE_SLANG_SUPPORT

	OPT_BOOLEAN(0, "stdio", &c2c.use_stdio, "Use the stdio interface"),

#endif

	OPT_END()

	};

	int err = 0;
@@ -1828,6 +1933,13 @@ static int perf_c2c__report(int argc, const char **argv) 
	if (argc)

		usage_with_options(report_c2c_usage, c2c_options);



	if (c2c.use_stdio)

		use_browser = 0;

	else

		use_browser = 1;



	setup_browser(false);



	if (!input_name || !strlen(input_name))

		input_name = "perf.data";
@@ -1886,8 +1998,9 @@ static int perf_c2c__report(int argc, const char **argv) 


	ui_progress__finish();



	use_browser = 0;

	perf_c2c__hists_fprintf(stdout);

	ui_quirks();



	perf_c2c_display();



out_session:

	perf_session__delete(session);

tools/perf/ui/browsers/hists.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct rb_node *hists__filter_entries(struct rb_node *nd, 


static bool hist_browser__has_filter(struct hist_browser *hb)

{

	return hists__has_filter(hb->hists) || hb->min_pcnt || symbol_conf.has_filter;

	return hists__has_filter(hb->hists) || hb->min_pcnt || symbol_conf.has_filter || hb->c2c_filter;

}



static int hist_browser__get_folding(struct hist_browser *browser)

tools/perf/ui/browsers/hists.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ struct hist_browser { 
	u64		     nr_non_filtered_entries;

	u64		     nr_hierarchy_entries;

	u64		     nr_callchain_rows;

	bool		     c2c_filter;



	/* Get title string. */

	int                  (*title)(struct hist_browser *browser,