p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2016-02-16 23:08:25 +09:00 committed by Arnaldo Carvalho de Melo
parent dca0d122e4
commit bba58cdfaa
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/perf/util/hist.c
View File

@ -1046,8 +1046,8 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp,
* collapse the histogram * collapse the histogram
*/ */
bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, int hists__collapse_insert_entry(struct hists *hists, struct rb_root *root,
struct rb_root *root, struct hist_entry *he) struct hist_entry *he)
{ {
struct rb_node **p = &root->rb_node; struct rb_node **p = &root->rb_node;
struct rb_node *parent = NULL; 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); cmp = hist_entry__collapse(iter, he);
if (!cmp) { if (!cmp) {
int ret = 0;
he_stat__add_stat(&iter->stat, &he->stat); he_stat__add_stat(&iter->stat, &he->stat);
if (symbol_conf.cumulate_callchain) if (symbol_conf.cumulate_callchain)
he_stat__add_stat(iter->stat_acc, he->stat_acc); he_stat__add_stat(iter->stat_acc, he->stat_acc);
if (symbol_conf.use_callchain) { if (symbol_conf.use_callchain) {
callchain_cursor_reset(&callchain_cursor); callchain_cursor_reset(&callchain_cursor);
callchain_merge(&callchain_cursor, if (callchain_merge(&callchain_cursor,
iter->callchain, iter->callchain,
he->callchain); he->callchain) < 0)
ret = -1;
} }
hist_entry__delete(he); hist_entry__delete(he);
return false; return ret;
} }
if (cmp < 0) 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_link_node(&he->rb_node_in, parent, p);
rb_insert_color(&he->rb_node_in, root); rb_insert_color(&he->rb_node_in, root);
return true; return 1;
} }
struct rb_root *hists__get_rotate_entries_in(struct hists *hists) 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); 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_root *root;
struct rb_node *next; struct rb_node *next;
struct hist_entry *n; struct hist_entry *n;
int ret;
if (!sort__need_collapse) if (!sort__need_collapse)
return; return 0;
hists->nr_entries = 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); next = rb_next(&n->rb_node_in);
rb_erase(&n->rb_node_in, root); 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 * If it wasn't combined with one of the entries already
* collapsed, we need to apply the filters that may have * 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) if (prog)
ui_progress__update(prog, 1); ui_progress__update(prog, 1);
} }
return 0;
} }
static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b) static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b)

4
tools/perf/util/hist.h
View File

@ -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 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__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__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel);
void hists__delete_entries(struct hists *hists); 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); int __hists__init(struct hists *hists, struct perf_hpp_list *hpp_list);
struct rb_root *hists__get_rotate_entries_in(struct hists *hists); 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 rb_root *root, struct hist_entry *he);
struct perf_hpp { struct perf_hpp {