Skip to content

Commit

Permalink
perf scripts python: Add Python 3 support to sched-migration.py
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
jeremycline authored and acmel committed Jul 11, 2018
1 parent c45b168 commit 8c1c1ab
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions tools/perf/scripts/python/sched-migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@
# This software is distributed under the terms of the GNU General
# Public License ("GPL") version 2 as published by the Free Software
# Foundation.

from __future__ import print_function

import os
import sys

from collections import defaultdict
from UserList import UserList
try:
from UserList import UserList
except ImportError:
# Python 3: UserList moved to the collections package
from collections import UserList

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

for i in xrange(i, len(self.data)):
for i in range(i, len(self.data)):
timeslice = self.data[i]
if timeslice.start > end:
return
Expand Down Expand Up @@ -336,8 +340,8 @@ def sched_switch(self, headers, prev_comm, prev_pid, prev_prio, prev_state,
on_cpu_task = self.current_tsk[headers.cpu]

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

threads[prev_pid] = prev_comm
threads[next_pid] = next_comm
Expand Down

0 comments on commit 8c1c1ab

Please sign in to comment.