|
@@ -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')
|
|
@@ -300,7 +304,7 @@ class TimeSliceList(UserList):
|
|
|
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
|
|
@@ -336,8 +340,8 @@ class SchedEventProxy:
|
|
|
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
|