range Python 2 -> 3 compatibility (iovisor#983)

tools/cpuunclaimed.py

@@ -169,10 +169,10 @@
  if args.timestamp:
  print("TIME", end=",")
  print("TIMESTAMP_ns", end=",")
- print(",".join("CPU" + str(c) for c in xrange(ncpu)), end="")
+ print(",".join("CPU" + str(c) for c in range(ncpu)), end="")
  if args.fullcsv:
  print(",", end="")
- print(",".join("OFFSET_ns_CPU" + str(c) for c in xrange(ncpu)), end="")
+ print(",".join("OFFSET_ns_CPU" + str(c) for c in range(ncpu)), end="")
  print()
 else:
  print(("Sampling run queues... Output every %s seconds. " +
@@ -255,10 +255,10 @@ def print_event(cpu, data, size):
  if args.timestamp:
  print("%-8s" % strftime("%H:%M:%S"), end=",")
  print("%d" % g_time, end=",")
- print(",".join(str(lens[c]) for c in xrange(ncpu)), end="")
+ print(",".join(str(lens[c]) for c in range(ncpu)), end="")
  if args.fullcsv:
  print(",", end="")
- print(",".join(str(offs[c]) for c in xrange(ncpu)))
+ print(",".join(str(offs[c]) for c in range(ncpu)))
  else:
  print()
  else:

tools/tplist.py

@@ -64,15 +64,15 @@ def print_tracepoints():
  print_tpoint(category, event)
 
 def print_usdt_argument_details(location):
- for idx in xrange(0, location.num_arguments):
+ for idx in range(0, location.num_arguments):
  arg = location.get_argument(idx)
  print(" argument #%d %s" % (idx+1, arg))
 
 def print_usdt_details(probe):
  if args.verbosity > 0:
  print(probe)
  if args.verbosity > 1:
- for idx in xrange(0, probe.num_locations):
+ for idx in range(0, probe.num_locations):
  loc = probe.get_location(idx)
  print(" location #%d %s" % (idx+1, loc))
  print_usdt_argument_details(loc)