lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 5 May 2015 19:55:37 -0700 From: tip-bot for He Kuang <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: bigeasy@...utronix.de, wangnan0@...wei.com, tzanussi@...il.com, fweisbec@...il.com, paulus@...ba.org, mingo@...nel.org, a.p.zijlstra@...llo.nl, jolsa@...nel.org, hekuang@...wei.com, jgalar@...icios.com, hpa@...or.com, tglx@...utronix.de, dsahern@...il.com, acme@...hat.com, linux-kernel@...r.kernel.org, namhyung@...nel.org Subject: [tip:perf/core] perf data: Show error message when conversion failed Commit-ID: c21410554ee1a8e12fbc99f578d720b641cd1c74 Gitweb: http://git.kernel.org/tip/c21410554ee1a8e12fbc99f578d720b641cd1c74 Author: He Kuang <hekuang@...wei.com> AuthorDate: Sat, 18 Apr 2015 17:50:14 +0200 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> 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 <hekuang@...wei.com> Cc: David Ahern <dsahern@...il.com> Cc: Frederic Weisbecker <fweisbec@...il.com> Cc: Jeremie Galarneau <jgalar@...icios.com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Paul Mackerras <paulus@...ba.org> Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl> Cc: Sebastian Andrzej Siewior <bigeasy@...utronix.de> Cc: Tom Zanussi <tzanussi@...il.com> Cc: Wang Nan <wangnan0@...wei.com> 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 <jolsa@...nel.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- 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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists