From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932152AbcELKWI (ORCPT ); Thu, 12 May 2016 06:22:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37602 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932109AbcELKWE (ORCPT ); Thu, 12 May 2016 06:22:04 -0400 Date: Thu, 12 May 2016 03:21:41 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, adrian.hunter@intel.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de, cphlipot0@gmail.com, hpa@zytor.com, namhyung@kernel.org Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, wangnan0@huawei.com, namhyung@kernel.org, hpa@zytor.com, cphlipot0@gmail.com, tglx@linutronix.de, acme@redhat.com, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf scripting python: Use Py_FatalError instead of die() Git-Commit-ID: 62665dff754a80e2fdd214ef2ed21abb2a7d03a2 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: 62665dff754a80e2fdd214ef2ed21abb2a7d03a2 Gitweb: http://git.kernel.org/tip/62665dff754a80e2fdd214ef2ed21abb2a7d03a2 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 10 May 2016 12:33:52 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 11 May 2016 12:24:57 -0300 perf scripting python: Use Py_FatalError instead of die() It probably is equivalent, but that seems to be the "pythonic" way of dieing? Anyway, one less die() in the tools/perf codebase. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Cc: Chris Phlipot Link: http://lkml.kernel.org/n/tip-nlzgepdv2818zs4e7faif9tu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/scripting-engines/trace-event-python.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 1546b74..73ee12d 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -408,8 +408,11 @@ static void python_process_tracepoint(struct perf_sample *sample, if (!t) Py_FatalError("couldn't create Python tuple"); - if (!event) - die("ug! no event found for type %d", (int)evsel->attr.config); + if (!event) { + snprintf(handler_name, sizeof(handler_name), + "ug! no event found for type %" PRIu64, (u64)evsel->attr.config); + Py_FatalError(handler_name); + } pid = raw_field_value(event, "common_pid", data);