Support both Python 2 and Python 3 in intel-pt-events.py.``print``
is now a function rather than a statement. This should have no
functional change.
Fixes indentation issue, replace spaces with tab.
Signed-off-by: Seeteena Thoufeek
Reviewed-by: Ravi Bangoria
---
tools/perf/scripts/python/intel-pt-events.py | 57 ++--
1 file changed, 29 insertions(+), 28 deletions(-)
diff --git a/tools/perf/scripts/python/intel-pt-events.py
b/tools/perf/scripts/python/intel-pt-events.py
index b19172d..de153f7 100644
--- a/tools/perf/scripts/python/intel-pt-events.py
+++ b/tools/perf/scripts/python/intel-pt-events.py
@@ -9,6 +9,7 @@
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
+from __future__ import print_function
import os
import sys
@@ -22,34 +23,34 @@ sys.path.append(os.environ['PERF_EXEC_PATH'] + \
#from Core import *
def trace_begin():
- print "Intel PT Power Events and PTWRITE"
+ print("Intel PT Power Events and PTWRITE")
def trace_end():
- print "End"
+ print("End")
def trace_unhandled(event_name, context, event_fields_dict):
- print ' '.join(['%s=%s'%(k,str(v))for k,v in
sorted(event_fields_dict.items())])
+ print(' '.join(['%s=%s'%(k,str(v))for k,v in
sorted(event_fields_dict.items())]))
def print_ptwrite(raw_buf):
data = struct.unpack_from("> 32) & 0x3
- print "hints: %#x extensions: %#x" % (hints, extensions),
+ print("hints: %#x extensions: %#x" % (hints, extensions)),
def print_pwre(raw_buf):
data = struct.unpack_from("> 7) & 1
cstate = (payload >> 12) & 0xf
subcstate = (payload >> 8) & 0xf
- print "hw: %u cstate: %u sub-cstate: %u" % (hw, cstate, subcstate),
+ print("hw: %u cstate: %u sub-cstate: %u" % (hw, cstate, subcstate)),
def print_exstop(raw_buf):
data = struct.unpack_from("> 4) & 0xf
wake_reason = (payload >> 8) & 0xf
- print "deepest cstate: %u last cstate: %u wake reason: %#x" %
(deepest_cstate, last_cstate, wake_reason),
+ print("deepest cstate: %u last cstate: %u wake reason: %#x" %
(deepest_cstate, last_cstate, wake_reason)),
def print_common_start(comm, sample, name):
ts = sample["time"]
cpu = sample["cpu"]
pid = sample["pid"]
tid = sample["tid"]
- print "%16s %5u/%-5u [%03u] %9u.%09u %7s:" % (comm, pid, tid, cpu, ts /
10, ts %10, name),
+ print("%16s %5u/%-5u [%03u] %9u.%09u %7s:" % (comm, pid, tid, cpu, ts /
10, ts %10, name)),
def print_common_ip(sample, symbol, dso):
ip = sample["ip"]
- print "%16x %s (%s)" % (ip, symbol, dso)
+ print("%16x %s (%s)" % (ip, symbol, dso))
def process_event(param_dict):
-event_attr = param_dict["attr"]
-sample = param_dict["sample"]
-raw_buf= param_dict["raw_buf"]
-comm = param_dict["comm"]
-name = param_dict["ev_name"]
-
-# Symbol and dso info are not always resolved
-if (param_dict.has_key("dso")):
-dso = param_dict["dso"]
-else:
-dso = "[unknown]"
-
-if (param_dict.has_key("symbol")):
-symbol = param_dict["symbol"]
-else:
-symbol = "[unknown]"
-
+ event_attr = param_dict["attr"]
+ sample = param_dict["sample"]
+ raw_buf= param_dict["raw_buf"]
+ comm = param_dict["comm"]
+ name = param_dict["ev_name"]
+
+ # Symbol and dso info are not always resolved
+ if ('dso' in param_dict):
+ dso = param_dict["dso"]
+ else:
+ dso = "[unknown]"
+
+ if ('symbol' in param_dict):
+ symbol = param_dict["symbol"]
+ else:
+ symbol = "[unknown]"
+
if name == "ptwrite":
print_common_start(comm, sample, name)
print_ptwrite(raw_buf)
--
1.8.3.1
