62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
|
From: Tony Jones <tonyj@suse.de>
|
||
|
Date: Fri, 22 Feb 2019 15:06:16 -0800
|
||
|
Subject: perf script python: Add Python3 support to stat-cpi.py
|
||
|
Origin: https://git.kernel.org/linus/e985bf761db7646cebcd236249da08bd264069de
|
||
|
Bug-Debian: https://bugs.debian.org/944641
|
||
|
|
||
|
Support both Python2 and Python3 in the stat-cpi.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: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
|
||
|
Cc: Jiri Olsa <jolsa@kernel.org>
|
||
|
Link: http://lkml.kernel.org/r/20190222230619.17887-13-tonyj@suse.de
|
||
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
||
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||
|
---
|
||
|
tools/perf/scripts/python/stat-cpi.py | 10 ++++++----
|
||
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
||
|
--- a/tools/perf/scripts/python/stat-cpi.py
|
||
|
+++ b/tools/perf/scripts/python/stat-cpi.py
|
||
|
@@ -1,6 +1,8 @@
|
||
|
#!/usr/bin/env python
|
||
|
# SPDX-License-Identifier: GPL-2.0
|
||
|
|
||
|
+from __future__ import print_function
|
||
|
+
|
||
|
data = {}
|
||
|
times = []
|
||
|
threads = []
|
||
|
@@ -20,8 +22,8 @@ def store_key(time, cpu, thread):
|
||
|
threads.append(thread)
|
||
|
|
||
|
def store(time, event, cpu, thread, val, ena, run):
|
||
|
- #print "event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" % \
|
||
|
- # (event, cpu, thread, time, val, ena, run)
|
||
|
+ #print("event %s cpu %d, thread %d, time %d, val %d, ena %d, run %d" %
|
||
|
+ # (event, cpu, thread, time, val, ena, run))
|
||
|
|
||
|
store_key(time, cpu, thread)
|
||
|
key = get_key(time, event, cpu, thread)
|
||
|
@@ -59,7 +61,7 @@ def stat__interval(time):
|
||
|
if ins != 0:
|
||
|
cpi = cyc/float(ins)
|
||
|
|
||
|
- print "%15f: cpu %d, thread %d -> cpi %f (%d/%d)" % (time/(float(1000000000)), cpu, thread, cpi, cyc, ins)
|
||
|
+ print("%15f: cpu %d, thread %d -> cpi %f (%d/%d)" % (time/(float(1000000000)), cpu, thread, cpi, cyc, ins))
|
||
|
|
||
|
def trace_end():
|
||
|
pass
|
||
|
@@ -75,4 +77,4 @@ def trace_end():
|
||
|
# if ins != 0:
|
||
|
# cpi = cyc/float(ins)
|
||
|
#
|
||
|
-# print "time %.9f, cpu %d, thread %d -> cpi %f" % (time/(float(1000000000)), cpu, thread, cpi)
|
||
|
+# print("time %.9f, cpu %d, thread %d -> cpi %f" % (time/(float(1000000000)), cpu, thread, cpi))
|