Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756171AbbEFC4I (ORCPT ); Tue, 5 May 2015 22:56:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35451 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756033AbbEFC4B (ORCPT ); Tue, 5 May 2015 22:56:01 -0400 Date: Tue, 5 May 2015 19:55:37 -0700 From: tip-bot for He Kuang Message-ID: Cc: bigeasy@linutronix.de, wangnan0@huawei.com, tzanussi@gmail.com, fweisbec@gmail.com, paulus@samba.org, mingo@kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, hekuang@huawei.com, jgalar@efficios.com, hpa@zytor.com, tglx@linutronix.de, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org Reply-To: bigeasy@linutronix.de, wangnan0@huawei.com, tzanussi@gmail.com, fweisbec@gmail.com, paulus@samba.org, a.p.zijlstra@chello.nl, mingo@kernel.org, jolsa@kernel.org, hekuang@huawei.com, jgalar@efficios.com, tglx@linutronix.de, hpa@zytor.com, dsahern@gmail.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com In-Reply-To: <1429372220-6406-2-git-send-email-jolsa@kernel.org> References: <1429372220-6406-2-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf data: Show error message when conversion failed Git-Commit-ID: c21410554ee1a8e12fbc99f578d720b641cd1c74 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 Content-Length: 2594 Lines: 75 Commit-ID: c21410554ee1a8e12fbc99f578d720b641cd1c74 Gitweb: http://git.kernel.org/tip/c21410554ee1a8e12fbc99f578d720b641cd1c74 Author: He Kuang AuthorDate: Sat, 18 Apr 2015 17:50:14 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Apr 2015 10:37:45 -0300 perf data: Show error message when conversion failed Show message when errors occurred during conversion setup and conversion process. Before this patch: $ ./perf data convert --to-ctf=ctf $ echo $? 255 After this patch: $ ./perf data convert --to-ctf=ctf Error during conversion setup. Signed-off-by: He Kuang Cc: David Ahern Cc: Frederic Weisbecker Cc: Jeremie Galarneau Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Sebastian Andrzej Siewior Cc: Tom Zanussi Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-xvhr1vf7zav9kkeo9w1hv4uk@git.kernel.org Link: http://lkml.kernel.org/r/1429372220-6406-2-git-send-email-jolsa@kernel.org Signed-off-by: Jiri Olsa Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/data-convert-bt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c index dd17c9a..db4f709 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -837,6 +837,8 @@ int bt_convert__perf2ctf(const char *input, const char *path, bool force) err = perf_session__process_events(session); if (!err) err = bt_ctf_stream_flush(cw->stream); + else + pr_err("Error during conversion.\n"); fprintf(stderr, "[ perf data convert: Converted '%s' into CTF data '%s' ]\n", @@ -847,11 +849,15 @@ int bt_convert__perf2ctf(const char *input, const char *path, bool force) (double) c.events_size / 1024.0 / 1024.0, c.events_count); - /* its all good */ -free_session: perf_session__delete(session); + ctf_writer__cleanup(cw); + return err; + +free_session: + perf_session__delete(session); free_writer: ctf_writer__cleanup(cw); + pr_err("Error during conversion setup.\n"); return err; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/