Skip to contentSkip to conversation

perf scripting python: Use Py_FatalError instead of die()

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 12, 2016 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  62665dff754a80e2fdd214ef2ed21abb2a7d03a2
Gitweb:     http://git.kernel.org/tip/62665dff754a80e2fdd214ef2ed21abb2a7d03a2
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 10 May 2016 12:33:52 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Cc Chris Phlipot <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/scripting-engines/trace-event-python.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/scripting-engines/trace-event-python.c +5 -2
index 1546b74..73ee12d 100644
@@ -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);