From: tip-bot for Tony Jones <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, s1seetee@linux.vnet.ibm.com,
acme@redhat.com, tonyj@suse.de, hpa@zytor.com,
tglx@linutronix.de, mingo@kernel.org, tzanussi@gmail.com
Subject: [tip:perf/urgent] perf script python: add Python3 support to check-perf-trace.py
Date: Sat, 9 Mar 2019 12:03:33 -0800 [thread overview]
Message-ID: <tip-57e604b16362273af6a517abaa6cd1133a7fc732@git.kernel.org> (raw)
In-Reply-To: <20190302011903.2416-4-tonyj@suse.de>
Commit-ID: 57e604b16362273af6a517abaa6cd1133a7fc732
Gitweb: https://git.kernel.org/tip/57e604b16362273af6a517abaa6cd1133a7fc732
Author: Tony Jones <tonyj@suse.de>
AuthorDate: Fri, 1 Mar 2019 17:18:59 -0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 6 Mar 2019 18:10:46 -0300
perf script python: add Python3 support to check-perf-trace.py
Support both Python 2 and Python 3 in the check-perf-trace.py script.
There may be differences in the ordering of output lines due to
differences in dictionary ordering etc. However the format within lines
should be unchanged.
The use of from __future__ implies the minimum supported version of
Python2 is now v2.6
Signed-off-by: Tony Jones <tonyj@suse.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
Link: http://lkml.kernel.org/r/20190302011903.2416-4-tonyj@suse.de
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/scripts/python/check-perf-trace.py | 31 +++++++++++++++------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py
index f4838db3e518..d2c22954800d 100644
--- a/tools/perf/scripts/python/check-perf-trace.py
+++ b/tools/perf/scripts/python/check-perf-trace.py
@@ -7,6 +7,8 @@
# events, etc. Basically, if this script runs successfully and
# displays expected results, Python scripting support should be ok.
+from __future__ import print_function
+
import os
import sys
@@ -19,7 +21,7 @@ from perf_trace_context import *
unhandled = autodict()
def trace_begin():
- print "trace_begin"
+ print("trace_begin")
pass
def trace_end():
@@ -33,7 +35,7 @@ def irq__softirq_entry(event_name, context, common_cpu,
print_uncommon(context)
- print "vec=%s\n" % (symbol_str("irq__softirq_entry", "vec", vec)),
+ print("vec=%s" % (symbol_str("irq__softirq_entry", "vec", vec)))
def kmem__kmalloc(event_name, context, common_cpu,
common_secs, common_nsecs, common_pid, common_comm,
@@ -44,10 +46,10 @@ def kmem__kmalloc(event_name, context, common_cpu,
print_uncommon(context)
- print "call_site=%u, ptr=%u, bytes_req=%u, " \
- "bytes_alloc=%u, gfp_flags=%s\n" % \
+ print("call_site=%u, ptr=%u, bytes_req=%u, "
+ "bytes_alloc=%u, gfp_flags=%s" %
(call_site, ptr, bytes_req, bytes_alloc,
- flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)),
+ flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)))
def trace_unhandled(event_name, context, event_fields_dict):
try:
@@ -56,26 +58,27 @@ def trace_unhandled(event_name, context, event_fields_dict):
unhandled[event_name] = 1
def print_header(event_name, cpu, secs, nsecs, pid, comm):
- print "%-20s %5u %05u.%09u %8u %-20s " % \
+ print("%-20s %5u %05u.%09u %8u %-20s " %
(event_name, cpu, secs, nsecs, pid, comm),
+ end=' ')
# print trace fields not included in handler args
def print_uncommon(context):
- print "common_preempt_count=%d, common_flags=%s, " \
- "common_lock_depth=%d, " % \
+ print("common_preempt_count=%d, common_flags=%s, "
+ "common_lock_depth=%d, " %
(common_pc(context), trace_flag_str(common_flags(context)),
- common_lock_depth(context))
+ common_lock_depth(context)))
def print_unhandled():
keys = unhandled.keys()
if not keys:
return
- print "\nunhandled events:\n\n",
+ print("\nunhandled events:\n")
- print "%-40s %10s\n" % ("event", "count"),
- print "%-40s %10s\n" % ("----------------------------------------", \
- "-----------"),
+ print("%-40s %10s" % ("event", "count"))
+ print("%-40s %10s" % ("----------------------------------------",
+ "-----------"))
for event_name in keys:
- print "%-40s %10d\n" % (event_name, unhandled[event_name])
+ print("%-40s %10d\n" % (event_name, unhandled[event_name]))
next prev parent reply other threads:[~2019-03-09 20:03 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-02 1:18 [PATCH v2 0/7] perf script python: add Python3 support Tony Jones
2019-03-02 1:18 ` [PATCH v2 1/7] perf script python: remove mixed indentation Tony Jones
2019-03-05 10:39 ` Adrian Hunter
2019-03-06 21:09 ` Arnaldo Carvalho de Melo
2019-03-09 20:02 ` [tip:perf/urgent] perf script python: Remove " tip-bot for Tony Jones
2019-03-02 1:18 ` [PATCH v2 2/7] perf script python: add Python3 support to futex-contention.py Tony Jones
2019-03-06 21:11 ` Arnaldo Carvalho de Melo
2019-03-09 20:02 ` [tip:perf/urgent] perf script python: Add " tip-bot for Tony Jones
2019-03-02 1:18 ` [PATCH v2 3/7] perf script python: add Python3 support to check-perf-trace.py Tony Jones
2019-03-06 21:11 ` Arnaldo Carvalho de Melo
2019-03-09 20:03 ` tip-bot for Tony Jones [this message]
2019-03-02 1:19 ` [PATCH v2 4/7] perf script python: add Python3 support to event_analyzing_sample.py Tony Jones
2019-03-06 21:11 ` Arnaldo Carvalho de Melo
2019-03-09 20:04 ` [tip:perf/urgent] perf script python: Add " tip-bot for Tony Jones
2019-03-02 1:19 ` [PATCH v2 5/7] perf script python: add Python3 support to intel-pt-events.py Tony Jones
2019-03-05 10:16 ` Adrian Hunter
2019-03-05 15:02 ` Tony Jones
2019-03-05 16:10 ` Tony Jones
2019-03-05 16:19 ` Tony Jones
2019-03-06 9:28 ` Adrian Hunter
2019-03-06 21:12 ` Arnaldo Carvalho de Melo
2019-03-09 20:04 ` [tip:perf/urgent] perf script python: Add " tip-bot for Tony Jones
2019-03-02 1:19 ` [PATCH v2 6/7] perf script python: add Python3 support to sql scripts Tony Jones
2019-03-06 9:26 ` Adrian Hunter
2019-03-06 16:32 ` Tony Jones
2019-03-07 18:51 ` Arnaldo Carvalho de Melo
2019-03-08 9:47 ` Adrian Hunter
2019-03-08 14:36 ` Arnaldo Carvalho de Melo
2019-03-02 1:19 ` [PATCH v2 7/7] perf script python: add printdate function to SQL exporters Tony Jones
2019-03-06 21:13 ` Arnaldo Carvalho de Melo
2019-03-08 12:50 ` Adrian Hunter
2019-03-05 9:55 ` [PATCH v2 0/7] perf script python: add Python3 support Adrian Hunter
2019-03-05 14:53 ` Tony Jones
2019-03-05 15:18 ` Tony Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-57e604b16362273af6a517abaa6cd1133a7fc732@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=s1seetee@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=tonyj@suse.de \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).