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

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

perf hists browser: Factor out hist_browser__show_callchain_entry() 



Factor out duplicate callchain printing code into the hist_browser__
show_callchain_entry().

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1408522080-26556-3-git-send-email-namhyung@kernel.org


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

tools/perf/ui/browsers/hists.c

+33 −31
Original line number Diff line number Diff line
@@ -477,6 +477,29 @@ static char *callchain_list__sym_name(struct callchain_list *cl, 
	return bf;

}



static void hist_browser__show_callchain_entry(struct hist_browser *browser,

					       struct callchain_list *chain,

					       unsigned short row, int offset,

					       char folded_sign, const char *str,

					       bool *is_current_entry)

{

	int color, width;



	color = HE_COLORSET_NORMAL;

	width = browser->b.width - (offset + 2);

	if (ui_browser__is_current_entry(&browser->b, row)) {

		browser->selection = &chain->ms;

		color = HE_COLORSET_SELECTED;

		*is_current_entry = true;

	}



	ui_browser__set_color(&browser->b, color);

	hist_browser__gotorc(browser, row, 0);

	slsmg_write_nstring(" ", offset);

	slsmg_printf("%c ", folded_sign);

	slsmg_write_nstring(str, width);

}



#define LEVEL_OFFSET_STEP 3



static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browser,
@@ -487,7 +510,7 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse 
						     bool *is_current_entry)

{

	struct rb_node *node;

	int first_row = row, width, offset = level * LEVEL_OFFSET_STEP;

	int first_row = row, offset = level * LEVEL_OFFSET_STEP;

	u64 new_total;



	if (callchain_param.mode == CHAIN_GRAPH_REL)
@@ -508,7 +531,6 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse 
		list_for_each_entry(chain, &child->val, list) {

			char bf[1024], *alloc_str;

			const char *str;

			int color;

			bool was_first = first;



			if (first)
@@ -534,19 +556,10 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *browse 
					str = alloc_str;

			}



			color = HE_COLORSET_NORMAL;

			width = browser->b.width - (offset + extra_offset + 2);

			if (ui_browser__is_current_entry(&browser->b, row)) {

				browser->selection = &chain->ms;

				color = HE_COLORSET_SELECTED;

				*is_current_entry = true;

			}



			ui_browser__set_color(&browser->b, color);

			hist_browser__gotorc(browser, row, 0);

			slsmg_write_nstring(" ", offset + extra_offset);

			slsmg_printf("%c ", folded_sign);

			slsmg_write_nstring(str, width);

			hist_browser__show_callchain_entry(browser, chain, row,

							   offset + extra_offset,

							   folded_sign, str,

							   is_current_entry);

			free(alloc_str);



			if (++row == browser->b.rows)
@@ -577,14 +590,12 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser, 
					     bool *is_current_entry)

{

	struct callchain_list *chain;

	int first_row = row,

	     offset = level * LEVEL_OFFSET_STEP,

	     width = browser->b.width - offset;

	int first_row = row;

	int offset = level * LEVEL_OFFSET_STEP;

	char folded_sign = ' ';



	list_for_each_entry(chain, &node->val, list) {

		char bf[1024], *s;

		int color;



		folded_sign = callchain_list__folded(chain);
@@ -593,20 +604,11 @@ static int hist_browser__show_callchain_node(struct hist_browser *browser, 
			continue;

		}



		color = HE_COLORSET_NORMAL;

		if (ui_browser__is_current_entry(&browser->b, row)) {

			browser->selection = &chain->ms;

			color = HE_COLORSET_SELECTED;

			*is_current_entry = true;

		}



		s = callchain_list__sym_name(chain, bf, sizeof(bf),

					     browser->show_dso);

		hist_browser__gotorc(browser, row, 0);

		ui_browser__set_color(&browser->b, color);

		slsmg_write_nstring(" ", offset);

		slsmg_printf("%c ", folded_sign);

		slsmg_write_nstring(s, width - 2);

		hist_browser__show_callchain_entry(browser, chain, row,

						   offset, folded_sign, s,

						   is_current_entry);



		if (++row == browser->b.rows)

			goto out;