From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1950004AbcBTLmS (ORCPT ); Sat, 20 Feb 2016 06:42:18 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38339 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1949516AbcBTLmP (ORCPT ); Sat, 20 Feb 2016 06:42:15 -0500 Date: Sat, 20 Feb 2016 03:41:38 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: dsahern@gmail.com, namhyung@kernel.org, hpa@zytor.com, wangnan0@huawei.com, jolsa@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, andi@firstfloor.org, acme@redhat.com, peterz@infradead.org, mingo@kernel.org Reply-To: dsahern@gmail.com, namhyung@kernel.org, hpa@zytor.com, wangnan0@huawei.com, jolsa@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, andi@firstfloor.org, peterz@infradead.org, mingo@kernel.org, acme@redhat.com In-Reply-To: <1455631723-17345-9-git-send-email-namhyung@kernel.org> References: <1455631723-17345-9-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Check error during report__collapse_hists() Git-Commit-ID: 5b2ea6f2f6ac81a230e6cc68e1473e796a583f00 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5b2ea6f2f6ac81a230e6cc68e1473e796a583f00 Gitweb: http://git.kernel.org/tip/5b2ea6f2f6ac81a230e6cc68e1473e796a583f00 Author: Namhyung Kim AuthorDate: Tue, 16 Feb 2016 23:08:26 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 19 Feb 2016 19:17:50 -0300 perf report: Check error during report__collapse_hists() If it returns an error, warn user and bail out instead of silently ignoring it. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1455631723-17345-9-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 1eab50a..760e886 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;