46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From: Tony Jones <tonyj@suse.de>
|
|
Date: Fri, 22 Feb 2019 15:06:15 -0800
|
|
Subject: perf script python: Add Python3 support to stackcollapse.py
|
|
Origin: https://git.kernel.org/linus/6d22d9991cf37edfe861569e2433342ad56206a7
|
|
Bug-Debian: https://bugs.debian.org/944641
|
|
|
|
Support both Python2 and Python3 in the stackcollapse.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>
|
|
Cc: Paolo Bonzini <pbonzini@redhat.com> <pbonzini@redhat.com>
|
|
Link: http://lkml.kernel.org/r/20190222230619.17887-12-tonyj@suse.de
|
|
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
---
|
|
tools/perf/scripts/python/stackcollapse.py | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/tools/perf/scripts/python/stackcollapse.py
|
|
+++ b/tools/perf/scripts/python/stackcollapse.py
|
|
@@ -19,6 +19,8 @@
|
|
# Written by Paolo Bonzini <pbonzini@redhat.com>
|
|
# Based on Brendan Gregg's stackcollapse-perf.pl script.
|
|
|
|
+from __future__ import print_function
|
|
+
|
|
import os
|
|
import sys
|
|
from collections import defaultdict
|
|
@@ -120,7 +122,6 @@ def process_event(param_dict):
|
|
lines[stack_string] = lines[stack_string] + 1
|
|
|
|
def trace_end():
|
|
- list = lines.keys()
|
|
- list.sort()
|
|
+ list = sorted(lines)
|
|
for stack in list:
|
|
- print "%s %d" % (stack, lines[stack])
|
|
+ print("%s %d" % (stack, lines[stack]))
|