Skip to content

Commit 8c1c1ab

Browse files
jeremyclineacmel
authored andcommitted
perf scripts python: Add Python 3 support to sched-migration.py
Support both Python 2 and Python 3 in the sched-migration.py script. This should have no functional change. Signed-off-by: Jeremy Cline <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Herton Krzesinski <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/0100016341a737a5-44ec436f-3440-4cac-a03f-ddfa589bf308-000000@email.amazonses.com Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent c45b168 commit 8c1c1ab

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

tools/perf/scripts/python/sched-migration.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
# This software is distributed under the terms of the GNU General
1010
# Public License ("GPL") version 2 as published by the Free Software
1111
# Foundation.
12-
12+
from __future__ import print_function
1313

1414
import os
1515
import sys
1616

1717
from collections import defaultdict
18-
from UserList import UserList
18+
try:
19+
from UserList import UserList
20+
except ImportError:
21+
# Python 3: UserList moved to the collections package
22+
from collections import UserList
1923

2024
sys.path.append(os.environ['PERF_EXEC_PATH'] + \
2125
'/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
@@ -300,7 +304,7 @@ def fill_zone(self, start, end):
300304
if i == -1:
301305
return
302306

303-
for i in xrange(i, len(self.data)):
307+
for i in range(i, len(self.data)):
304308
timeslice = self.data[i]
305309
if timeslice.start > end:
306310
return
@@ -336,8 +340,8 @@ def sched_switch(self, headers, prev_comm, prev_pid, prev_prio, prev_state,
336340
on_cpu_task = self.current_tsk[headers.cpu]
337341

338342
if on_cpu_task != -1 and on_cpu_task != prev_pid:
339-
print "Sched switch event rejected ts: %s cpu: %d prev: %s(%d) next: %s(%d)" % \
340-
(headers.ts_format(), headers.cpu, prev_comm, prev_pid, next_comm, next_pid)
343+
print("Sched switch event rejected ts: %s cpu: %d prev: %s(%d) next: %s(%d)" % \
344+
headers.ts_format(), headers.cpu, prev_comm, prev_pid, next_comm, next_pid)
341345

342346
threads[prev_pid] = prev_comm
343347
threads[next_pid] = next_comm

0 commit comments

Comments
 (0)