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

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

perf hists: Add helper functions for hierarchy mode 



The rb_hierarchy_{next,prev,last} functions are to traverse all hist
entries in a hierarchy.  They will be used by various function which
supports hierarchy output.

As the rb_hierarchy_next() is used to traverse the whole hierarchy, it
sometime needs to visit entries regardless of current folding state.  So
add enum hierarchy_move_dir and pass it to __rb_hierarchy_next() for
those cases.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1456326830-30456-5-git-send-email-namhyung@kernel.org


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

tools/perf/util/hist.c

+56 −0
Original line number Diff line number Diff line
@@ -1500,6 +1500,62 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog) 
	output_resort(hists, prog, symbol_conf.use_callchain);

}



static bool can_goto_child(struct hist_entry *he, enum hierarchy_move_dir hmd)

{

	if (he->leaf || hmd == HMD_FORCE_SIBLING)

		return false;



	if (he->unfolded || hmd == HMD_FORCE_CHILD)

		return true;



	return false;

}



struct rb_node *rb_hierarchy_last(struct rb_node *node)

{

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



	while (can_goto_child(he, HMD_NORMAL)) {

		node = rb_last(&he->hroot_out);

		he = rb_entry(node, struct hist_entry, rb_node);

	}

	return node;

}



struct rb_node *__rb_hierarchy_next(struct rb_node *node, enum hierarchy_move_dir hmd)

{

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



	if (can_goto_child(he, hmd))

		node = rb_first(&he->hroot_out);

	else

		node = rb_next(node);



	while (node == NULL) {

		he = he->parent_he;

		if (he == NULL)

			break;



		node = rb_next(&he->rb_node);

	}

	return node;

}



struct rb_node *rb_hierarchy_prev(struct rb_node *node)

{

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



	node = rb_prev(node);

	if (node)

		return rb_hierarchy_last(node);



	he = he->parent_he;

	if (he == NULL)

		return NULL;



	return &he->rb_node;

}



static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h,

				       enum hist_filter filter)

{

tools/perf/util/hist.h

+16 −0
Original line number Diff line number Diff line
@@ -418,4 +418,20 @@ int perf_hist_config(const char *var, const char *value); 


void perf_hpp_list__init(struct perf_hpp_list *list);



enum hierarchy_move_dir {

	HMD_NORMAL,

	HMD_FORCE_SIBLING,

	HMD_FORCE_CHILD,

};



struct rb_node *rb_hierarchy_last(struct rb_node *node);

struct rb_node *__rb_hierarchy_next(struct rb_node *node,

				    enum hierarchy_move_dir hmd);

struct rb_node *rb_hierarchy_prev(struct rb_node *node);



static inline struct rb_node *rb_hierarchy_next(struct rb_node *node)

{

	return __rb_hierarchy_next(node, HMD_NORMAL);

}



#endif	/* __PERF_HIST_H */