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

perf ui/gtk: Support flat callchains 



The flat callchain mode is to print all chains in a simple flat
hierarchy so make it easy to see.

Currently perf report --gtk doesn't show flat callchains properly.  With
flat callchains, only leaf nodes are added to the final rbtree so it
should show entries in parent nodes.  To do that, add parent_val list to
struct callchain_node and show them along with the (normal) val list.

See the previous commit on TUI support for more information.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarBrendan Gregg <brendan.d.gregg@gmail.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1447047946-1691-10-git-send-email-namhyung@kernel.org


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

tools/perf/ui/gtk/hists.c

+76 −4
Original line number Diff line number Diff line
@@ -89,7 +89,70 @@ void perf_gtk__init_hpp(void) 
				perf_gtk__hpp_color_overhead_acc;

}



static void perf_gtk__add_callchain(struct rb_root *root, GtkTreeStore *store,

static void perf_gtk__add_callchain_flat(struct rb_root *root, GtkTreeStore *store,

					 GtkTreeIter *parent, int col, u64 total)

{

	struct rb_node *nd;

	bool has_single_node = (rb_first(root) == rb_last(root));



	for (nd = rb_first(root); nd; nd = rb_next(nd)) {

		struct callchain_node *node;

		struct callchain_list *chain;

		GtkTreeIter iter, new_parent;

		bool need_new_parent;



		node = rb_entry(nd, struct callchain_node, rb_node);



		new_parent = *parent;

		need_new_parent = !has_single_node;



		callchain_node__make_parent_list(node);



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

			char buf[128];



			gtk_tree_store_append(store, &iter, &new_parent);



			callchain_node__scnprintf_value(node, buf, sizeof(buf), total);

			gtk_tree_store_set(store, &iter, 0, buf, -1);



			callchain_list__sym_name(chain, buf, sizeof(buf), false);

			gtk_tree_store_set(store, &iter, col, buf, -1);



			if (need_new_parent) {

				/*

				 * Only show the top-most symbol in a callchain

				 * if it's not the only callchain.

				 */

				new_parent = iter;

				need_new_parent = false;

			}

		}



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

			char buf[128];



			gtk_tree_store_append(store, &iter, &new_parent);



			callchain_node__scnprintf_value(node, buf, sizeof(buf), total);

			gtk_tree_store_set(store, &iter, 0, buf, -1);



			callchain_list__sym_name(chain, buf, sizeof(buf), false);

			gtk_tree_store_set(store, &iter, col, buf, -1);



			if (need_new_parent) {

				/*

				 * Only show the top-most symbol in a callchain

				 * if it's not the only callchain.

				 */

				new_parent = iter;

				need_new_parent = false;

			}

		}

	}

}



static void perf_gtk__add_callchain_graph(struct rb_root *root, GtkTreeStore *store,

					  GtkTreeIter *parent, int col, u64 total)

{

	struct rb_node *nd;
@@ -134,11 +197,20 @@ static void perf_gtk__add_callchain(struct rb_root *root, GtkTreeStore *store, 
			child_total = total;



		/* Now 'iter' contains info of the last callchain_list */

		perf_gtk__add_callchain(&node->rb_root, store, &iter, col,

		perf_gtk__add_callchain_graph(&node->rb_root, store, &iter, col,

					      child_total);

	}

}



static void perf_gtk__add_callchain(struct rb_root *root, GtkTreeStore *store,

				    GtkTreeIter *parent, int col, u64 total)

{

	if (callchain_param.mode == CHAIN_FLAT)

		perf_gtk__add_callchain_flat(root, store, parent, col, total);

	else

		perf_gtk__add_callchain_graph(root, store, parent, col, total);

}



static void on_row_activated(GtkTreeView *view, GtkTreePath *path,

			     GtkTreeViewColumn *col __maybe_unused,

			     gpointer user_data __maybe_unused)

CRA Git | Maintained and supported by SUSTech CRA and CCSE