Skip to content

Commit

Permalink
perf script python: Add Python3 support to stackcollapse.py
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Jones authored and Arnaldo Carvalho de Melo committed Feb 25, 2019
1 parent ee75a89 commit 6d22d99
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions tools/perf/scripts/python/stackcollapse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -120,7 +122,6 @@ def tidy_function_name(sym, dso):
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]))

0 comments on commit 6d22d99

Please sign in to comment.