[PATCH v6 08/25] perf report: Check error during report__collapse_hists()

From: Namhyung Kim
Date: Tue Feb 16 2016 - 09:10:37 EST


If it returns an error, warn user and bail out instead of silently
ignoring.

Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
---
tools/perf/builtin-report.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 1eab50ac1ef6..760e886ca9d9 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -469,10 +469,11 @@ static int report__browse_hists(struct report *rep)
return ret;
}

-static void report__collapse_hists(struct report *rep)
+static int report__collapse_hists(struct report *rep)
{
struct ui_progress prog;
struct perf_evsel *pos;
+ int ret = 0;

ui_progress__init(&prog, rep->nr_entries, "Merging related events...");

@@ -484,7 +485,9 @@ static void report__collapse_hists(struct report *rep)

hists->socket_filter = rep->socket_filter;

- hists__collapse_resort(hists, &prog);
+ ret = hists__collapse_resort(hists, &prog);
+ if (ret < 0)
+ break;

/* Non-group events are considered as leader */
if (symbol_conf.event_group &&
@@ -497,6 +500,7 @@ static void report__collapse_hists(struct report *rep)
}

ui_progress__finish();
+ return ret;
}

static void report__output_resort(struct report *rep)
@@ -564,7 +568,11 @@ static int __cmd_report(struct report *rep)
}
}

- report__collapse_hists(rep);
+ ret = report__collapse_hists(rep);
+ if (ret) {
+ ui__error("failed to process hist entry\n");
+ return ret;
+ }

if (session_done())
return 0;
--
2.7.1