perf script python: Add Python3 support to syscall-counts-by-pid.py

Support both Python2 and Python3 in the syscall-counts-by-pid.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>
Link: http://lkml.kernel.org/r/20190222230619.17887-15-tonyj@suse.de
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/scripts/python/syscall-counts-by-pid.py b/tools/perf/scripts/python/syscall-counts-by-pid.py
index daf314cc5dd313e9fca436eafb82282ea4f40324..42782487b0e9ba4018d84ccbc4fe3f4623a44d16 100644 (file)
--- a/tools/perf/scripts/python/syscall-counts-by-pid.py
+++ b/tools/perf/scripts/python/syscall-counts-by-pid.py
@@ -5,6 +5,8 @@
 # Displays system-wide system call totals, broken down by syscall.
 # If a [comm] arg is specified, only syscalls called by [comm] are displayed.
 
+from __future__ import print_function
+
 import os, sys
 
 sys.path.append(os.environ['PERF_EXEC_PATH'] + \
@@ -31,7 +33,7 @@ if len(sys.argv) > 1:
 syscalls = autodict()
 
 def trace_begin():
-       print "Press control+C to stop and show the summary"
+       print("Press control+C to stop and show the summary")
 
 def trace_end():
        print_syscall_totals()
@@ -55,20 +57,20 @@ def syscalls__sys_enter(event_name, context, common_cpu,
 
 def print_syscall_totals():
     if for_comm is not None:
-           print "\nsyscall events for %s:\n\n" % (for_comm),
+           print("\nsyscall events for %s:\n" % (for_comm))
     else:
-           print "\nsyscall events by comm/pid:\n\n",
+           print("\nsyscall events by comm/pid:\n")
 
-    print "%-40s  %10s\n" % ("comm [pid]/syscalls", "count"),
-    print "%-40s  %10s\n" % ("----------------------------------------", \
-                                 "----------"),
+    print("%-40s  %10s" % ("comm [pid]/syscalls", "count"))
+    print("%-40s  %10s" % ("----------------------------------------",
+                            "----------"))
 
     comm_keys = syscalls.keys()
     for comm in comm_keys:
            pid_keys = syscalls[comm].keys()
            for pid in pid_keys:
-                   print "\n%s [%d]\n" % (comm, pid),
+                   print("\n%s [%d]" % (comm, pid))
                    id_keys = syscalls[comm][pid].keys()
-                   for id, val in sorted(syscalls[comm][pid].iteritems(), \
-                                 key = lambda(k, v): (v, k),  reverse = True):
-                           print "  %-38s  %10d\n" % (syscall_name(id), val),
+                   for id, val in sorted(syscalls[comm][pid].items(), \
+                                 key = lambda kv: (kv[1], kv[0]),  reverse = True):
+                           print("  %-38s  %10d" % (syscall_name(id), val))