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

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

perf hists: Return error from hists__collapse_resort() 



Currently hists__collapse_resort() and hists__collapse_insert_entry()
don't return an error code. Now that callchain_merge() can check for
errors, abort and pass the error to the user.  A later patch can add
more work which also can fail.

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


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

tools/perf/util/hist.c

+19 −10
Original line number Diff line number Diff line
@@ -1046,8 +1046,8 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp, 
 * collapse the histogram

 */



bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,

				  struct rb_root *root, struct hist_entry *he)

int hists__collapse_insert_entry(struct hists *hists, struct rb_root *root,

				 struct hist_entry *he)

{

	struct rb_node **p = &root->rb_node;

	struct rb_node *parent = NULL;
@@ -1061,18 +1061,21 @@ bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, 
		cmp = hist_entry__collapse(iter, he);



		if (!cmp) {

			int ret = 0;



			he_stat__add_stat(&iter->stat, &he->stat);

			if (symbol_conf.cumulate_callchain)

				he_stat__add_stat(iter->stat_acc, he->stat_acc);



			if (symbol_conf.use_callchain) {

				callchain_cursor_reset(&callchain_cursor);

				callchain_merge(&callchain_cursor,

				if (callchain_merge(&callchain_cursor,

						    iter->callchain,

						he->callchain);

						    he->callchain) < 0)

					ret = -1;

			}

			hist_entry__delete(he);

			return false;

			return ret;

		}



		if (cmp < 0)
@@ -1084,7 +1087,7 @@ bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, 


	rb_link_node(&he->rb_node_in, parent, p);

	rb_insert_color(&he->rb_node_in, root);

	return true;

	return 1;

}



struct rb_root *hists__get_rotate_entries_in(struct hists *hists)
@@ -1110,14 +1113,15 @@ static void hists__apply_filters(struct hists *hists, struct hist_entry *he) 
	hists__filter_entry_by_socket(hists, he);

}



void hists__collapse_resort(struct hists *hists, struct ui_progress *prog)

int hists__collapse_resort(struct hists *hists, struct ui_progress *prog)

{

	struct rb_root *root;

	struct rb_node *next;

	struct hist_entry *n;

	int ret;



	if (!sort__need_collapse)

		return;

		return 0;



	hists->nr_entries = 0;
@@ -1132,7 +1136,11 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog) 
		next = rb_next(&n->rb_node_in);



		rb_erase(&n->rb_node_in, root);

		if (hists__collapse_insert_entry(hists, &hists->entries_collapsed, n)) {

		ret = hists__collapse_insert_entry(hists, &hists->entries_collapsed, n);

		if (ret < 0)

			return -1;



		if (ret) {

			/*

			 * If it wasn't combined with one of the entries already

			 * collapsed, we need to apply the filters that may have
@@ -1143,6 +1151,7 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog) 
		if (prog)

			ui_progress__update(prog, 1);

	}

	return 0;

}



static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b)

tools/perf/util/hist.h

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void hist_entry__delete(struct hist_entry *he); 


void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *prog);

void hists__output_resort(struct hists *hists, struct ui_progress *prog);

void hists__collapse_resort(struct hists *hists, struct ui_progress *prog);

int hists__collapse_resort(struct hists *hists, struct ui_progress *prog);



void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel);

void hists__delete_entries(struct hists *hists);
@@ -197,7 +197,7 @@ int hists__init(void); 
int __hists__init(struct hists *hists, struct perf_hpp_list *hpp_list);



struct rb_root *hists__get_rotate_entries_in(struct hists *hists);

bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,

int hists__collapse_insert_entry(struct hists *hists,

				  struct rb_root *root, struct hist_entry *he);



struct perf_hpp {