From: tip-bot for Tony Jones <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tonyj@suse.de, tglx@linutronix.de, linux-kernel@vger.kernel.org,
acme@redhat.com, s1seetee@linux.vnet.ibm.com,
ravi.bangoria@linux.ibm.com, mingo@kernel.org, hpa@zytor.com
Subject: [tip:perf/core] perf script python: Add Python3 support to powerpc-hcalls.py
Date: Thu, 28 Feb 2019 00:08:39 -0800 [thread overview]
Message-ID: <tip-118af5bf799bd1876c3999766d1d2f845d45f019@git.kernel.org> (raw)
In-Reply-To: <20190222230619.17887-10-tonyj@suse.de>
Commit-ID: 118af5bf799bd1876c3999766d1d2f845d45f019
Gitweb: https://git.kernel.org/tip/118af5bf799bd1876c3999766d1d2f845d45f019
Author: Tony Jones <tonyj@suse.de>
AuthorDate: Fri, 22 Feb 2019 15:06:13 -0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 25 Feb 2019 17:16:57 -0300
perf script python: Add Python3 support to powerpc-hcalls.py
Support both Python2 and Python3 in the powerpc-hcalls.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 Python2 version
is now v2.6
Signed-off-by: Tony Jones <tonyj@suse.de>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Link: http://lkml.kernel.org/r/20190222230619.17887-10-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/powerpc-hcalls.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/tools/perf/scripts/python/powerpc-hcalls.py b/tools/perf/scripts/python/powerpc-hcalls.py
index 00e0e7476e55..8b78dc790adb 100644
--- a/tools/perf/scripts/python/powerpc-hcalls.py
+++ b/tools/perf/scripts/python/powerpc-hcalls.py
@@ -4,6 +4,8 @@
#
# Hypervisor call statisics
+from __future__ import print_function
+
import os
import sys
@@ -149,7 +151,7 @@ hcall_table = {
}
def hcall_table_lookup(opcode):
- if (hcall_table.has_key(opcode)):
+ if (opcode in hcall_table):
return hcall_table[opcode]
else:
return opcode
@@ -157,8 +159,8 @@ def hcall_table_lookup(opcode):
print_ptrn = '%-28s%10s%10s%10s%10s'
def trace_end():
- print print_ptrn % ('hcall', 'count', 'min(ns)', 'max(ns)', 'avg(ns)')
- print '-' * 68
+ print(print_ptrn % ('hcall', 'count', 'min(ns)', 'max(ns)', 'avg(ns)'))
+ print('-' * 68)
for opcode in output:
h_name = hcall_table_lookup(opcode)
time = output[opcode]['time']
@@ -166,14 +168,14 @@ def trace_end():
min_t = output[opcode]['min']
max_t = output[opcode]['max']
- print print_ptrn % (h_name, cnt, min_t, max_t, time/cnt)
+ print(print_ptrn % (h_name, cnt, min_t, max_t, time//cnt))
def powerpc__hcall_exit(name, context, cpu, sec, nsec, pid, comm, callchain,
opcode, retval):
- if (d_enter.has_key(cpu) and d_enter[cpu].has_key(opcode)):
+ if (cpu in d_enter and opcode in d_enter[cpu]):
diff = nsecs(sec, nsec) - d_enter[cpu][opcode]
- if (output.has_key(opcode)):
+ if (opcode in output):
output[opcode]['time'] += diff
output[opcode]['cnt'] += 1
if (output[opcode]['min'] > diff):
@@ -190,11 +192,11 @@ def powerpc__hcall_exit(name, context, cpu, sec, nsec, pid, comm, callchain,
del d_enter[cpu][opcode]
# else:
-# print "Can't find matching hcall_enter event. Ignoring sample"
+# print("Can't find matching hcall_enter event. Ignoring sample")
def powerpc__hcall_entry(event_name, context, cpu, sec, nsec, pid, comm,
callchain, opcode):
- if (d_enter.has_key(cpu)):
+ if (cpu in d_enter):
d_enter[cpu][opcode] = nsecs(sec, nsec)
else:
d_enter[cpu] = {opcode: nsecs(sec, nsec)}
next prev parent reply other threads:[~2019-02-28 8:09 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 23:06 [PATCH 00/15] perf script python: add Python3 support Tony Jones
2019-02-22 23:06 ` [PATCH 01/15] perf script python: add Python3 support to netdev-times.py Tony Jones
2019-02-28 8:06 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 02/15] perf script python: add Python3 support to check-perf-trace.py Tony Jones
2019-02-25 14:05 ` Arnaldo Carvalho de Melo
2019-02-25 18:05 ` Tony Jones
2019-02-22 23:06 ` [PATCH 03/15] perf script python: add Python3 support to event_analyzing_sample.py Tony Jones
2019-02-25 14:08 ` Arnaldo Carvalho de Melo
2019-02-22 23:06 ` [PATCH 04/15] perf script python: add Python3 support to failed-syscalls-by-pid.py Tony Jones
2019-02-25 14:09 ` Arnaldo Carvalho de Melo
2019-02-28 8:06 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 05/15] perf script python: add Python3 support to futex-contention.py Tony Jones
2019-02-22 23:06 ` [PATCH 06/15] perf script python: add Python3 support to intel-pt-events.py Tony Jones
2019-02-25 7:07 ` Adrian Hunter
2019-02-25 14:03 ` Arnaldo Carvalho de Melo
2019-02-25 17:18 ` Tony Jones
2019-02-22 23:06 ` [PATCH 07/15] perf script python: add Python3 support to mem-phys-addr.py Tony Jones
2019-02-28 8:07 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 08/15] perf script python: add Python3 support to net_dropmonitor.py Tony Jones
2019-02-25 12:37 ` Neil Horman
2019-02-25 14:43 ` Arnaldo Carvalho de Melo
2019-02-28 8:08 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 09/15] perf script python: add Python3 support to powerpc-hcalls.py Tony Jones
2019-02-25 14:44 ` Arnaldo Carvalho de Melo
2019-02-28 8:08 ` tip-bot for Tony Jones [this message]
2019-02-22 23:06 ` [PATCH 10/15] perf script python: add Python3 support to sctop.py Tony Jones
2019-02-25 14:44 ` Arnaldo Carvalho de Melo
2019-02-28 8:09 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 11/15] perf script python: add Python3 support to stackcollapse.py Tony Jones
2019-02-25 14:46 ` Arnaldo Carvalho de Melo
2019-02-28 8:09 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 12/15] perf script python: add Python3 support to stat-cpi.py Tony Jones
2019-02-25 14:46 ` Arnaldo Carvalho de Melo
2019-02-28 8:10 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 13/15] perf script python: add Python3 support to syscall-counts.py Tony Jones
2019-02-25 14:47 ` Arnaldo Carvalho de Melo
2019-02-28 8:11 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 14/15] perf script python: add Python3 support to syscall-counts-by-pid.py Tony Jones
2019-02-25 14:48 ` Arnaldo Carvalho de Melo
2019-02-28 8:11 ` [tip:perf/core] perf script python: Add " tip-bot for Tony Jones
2019-02-22 23:06 ` [PATCH 15/15] perf script python: add Python3 support to sql scripts Tony Jones
2019-02-25 14:51 ` Arnaldo Carvalho de Melo
2019-02-25 14:54 ` Arnaldo Carvalho de Melo
2019-02-25 17:20 ` Tony Jones
2019-02-23 21:06 ` [PATCH 00/15] perf script python: add Python3 support 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-118af5bf799bd1876c3999766d1d2f845d45f019@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=ravi.bangoria@linux.ibm.com \
--cc=s1seetee@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=tonyj@suse.de \
/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).