Support both Python2 and Python3 in the failed-syscalls-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
Showing the changes to tools/perf/scripts/python (1 of 1 file). Show all
Unified · Split
| @@ -5,6 +5,8 @@ · 4 unmodified lines | |||
| 5 | # Displays system-wide failed system call totals, broken down by pid. | 5 | # Displays system-wide failed system call totals, broken down by pid. |
| 6 | # If a [comm] arg is specified, only syscalls called by [comm] are displayed. | 6 | # If a [comm] arg is specified, only syscalls called by [comm] are displayed. |
| 7 | 7 | ||
| 8 | from __future__ import print_function | ||
| 9 | |||
| 8 | import os | 10 | import os |
| 9 | import sys | 11 | import sys |
| 10 | 12 | ||
| @@ -32,7 +34,7 @@ if len(sys.argv) > 1: · 21 unmodified lines | |||
| 32 | syscalls = autodict() | 34 | syscalls = autodict() |
| 33 | 35 | ||
| 34 | def trace_begin(): | 36 | def trace_begin(): |
| 35 | print "Press control+C to stop and show the summary" | 37 | print("Press control+C to stop and show the summary") |
| 36 | 38 | ||
| 37 | def trace_end(): | 39 | def trace_end(): |
| 38 | print_error_totals() | 40 | print_error_totals() |
| @@ -57,22 +59,21 @@ def syscalls__sys_exit(event_name, context, common_cpu, · 18 unmodified lines | |||
| 57 | 59 | ||
| 58 | def print_error_totals(): | 60 | def print_error_totals(): |
| 59 | if for_comm is not None: | 61 | if for_comm is not None: |
| 60 | print "\nsyscall errors for %s:\n\n" % (for_comm), | 62 | print("\nsyscall errors for %s:\n" % (for_comm)) |
| 61 | else: | 63 | else: |
| 62 | print "\nsyscall errors:\n\n", | 64 | print("\nsyscall errors:\n") |
| 63 | 65 | ||
| 64 | print "%-30s %10s\n" % ("comm [pid]", "count"), | 66 | print("%-30s %10s" % ("comm [pid]", "count")) |
| 65 | print "%-30s %10s\n" % ("------------------------------", \ | 67 | print("%-30s %10s" % ("------------------------------", "----------")) |
| 66 | "----------"), | ||
| 67 | 68 | ||
| 68 | comm_keys = syscalls.keys() | 69 | comm_keys = syscalls.keys() |
| 69 | for comm in comm_keys: | 70 | for comm in comm_keys: |
| 70 | pid_keys = syscalls[comm].keys() | 71 | pid_keys = syscalls[comm].keys() |
| 71 | for pid in pid_keys: | 72 | for pid in pid_keys: |
| 72 | print "\n%s [%d]\n" % (comm, pid), | 73 | print("\n%s [%d]" % (comm, pid)) |
| 73 | id_keys = syscalls[comm][pid].keys() | 74 | id_keys = syscalls[comm][pid].keys() |
| 74 | for id in id_keys: | 75 | for id in id_keys: |
| 75 | print " syscall: %-16s\n" % syscall_name(id), | 76 | print(" syscall: %-16s" % syscall_name(id)) |
| 76 | ret_keys = syscalls[comm][pid][id].keys() | 77 | ret_keys = syscalls[comm][pid][id].keys() |
| 77 | for ret, val in sorted(syscalls[comm][pid][id].iteritems(), key = lambda(k, v): (v, k), reverse = True): | 78 | for ret, val in sorted(syscalls[comm][pid][id].items(), key = lambda kv: (kv[1], kv[0]), reverse = True): |
| 78 | print " err = %-20s %10d\n" % (strerror(ret), val), | 79 | print(" err = %-20s %10d" % (strerror(ret), val)) |