lkml.org 
[lkml]   [2019]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2] perf scripts python: Add Python 3 support to check-perf-trace.py
Date
Support both Python 2 and Python 3 in check-perf-trace.py.
``print`` is now a function rather than a statement. This should have
no functional change.

Fix indentation issue, replace spaces with tab

Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Reviewed-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
---
tools/perf/scripts/python/check-perf-trace.py | 33 ++++++++++++++-------------
1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py
index 334599c..91fc499 100644
--- a/tools/perf/scripts/python/check-perf-trace.py
+++ b/tools/perf/scripts/python/check-perf-trace.py
@@ -7,6 +7,7 @@
# 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 +20,7 @@ from perf_trace_context import *
unhandled = autodict()

def trace_begin():
- print "trace_begin"
+ print("trace_begin")
pass

def trace_end():
@@ -31,10 +32,10 @@ def irq__softirq_entry(event_name, context, common_cpu,
print_header(event_name, common_cpu, common_secs, common_nsecs,
common_pid, common_comm)

- print_uncommon(context)
+ print_uncommon(context)

- print "vec=%s\n" % \
- (symbol_str("irq__softirq_entry", "vec", vec)),
+ print("vec=%s\n" % \
+ (symbol_str("irq__softirq_entry", "vec", vec))),

def kmem__kmalloc(event_name, context, common_cpu,
common_secs, common_nsecs, common_pid, common_comm,
@@ -43,13 +44,13 @@ def kmem__kmalloc(event_name, context, common_cpu,
print_header(event_name, common_cpu, common_secs, common_nsecs,
common_pid, common_comm)

- print_uncommon(context)
+ print_uncommon(context)

- print "call_site=%u, ptr=%u, bytes_req=%u, " \
+ print("call_site=%u, ptr=%u, bytes_req=%u, " \
"bytes_alloc=%u, gfp_flags=%s\n" % \
(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:
@@ -58,25 +59,25 @@ 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 " % \
- (event_name, cpu, secs, nsecs, pid, comm),
+ print("%-20s %5u %05u.%09u %8u %-20s " % \
+ (event_name, cpu, secs, nsecs, pid, comm)),

# 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\n"),

- print "%-40s %10s\n" % ("event", "count"),
- print "%-40s %10s\n" % ("----------------------------------------", \
- "-----------"),
+ print("%-40s %10s\n" % ("event", "count")),
+ print("%-40s %10s\n" % ("----------------------------------------", \
+ "-----------")),

for event_name in keys:
- print "%-40s %10d\n" % (event_name, unhandled[event_name])
+ print("%-40s %10d\n" % (event_name, unhandled[event_name]))
--
1.8.3.1
\
 
 \ /
  Last update: 2019-01-17 10:46    [W:0.237 / U:1.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site