Commit d7a5ff09 authored by Rafael F's avatar Rafael F Committed by Sasha Goldshtein

range Python 2 -> 3 compatibility (#983)

parent 1a1f441f
...@@ -169,10 +169,10 @@ if args.csv: ...@@ -169,10 +169,10 @@ if args.csv:
if args.timestamp: if args.timestamp:
print("TIME", end=",") print("TIME", end=",")
print("TIMESTAMP_ns", 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: if args.fullcsv:
print(",", end="") 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() print()
else: else:
print(("Sampling run queues... Output every %s seconds. " + print(("Sampling run queues... Output every %s seconds. " +
...@@ -255,10 +255,10 @@ while 1: ...@@ -255,10 +255,10 @@ while 1:
if args.timestamp: if args.timestamp:
print("%-8s" % strftime("%H:%M:%S"), end=",") print("%-8s" % strftime("%H:%M:%S"), end=",")
print("%d" % g_time, 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: if args.fullcsv:
print(",", end="") print(",", end="")
print(",".join(str(offs[c]) for c in xrange(ncpu))) print(",".join(str(offs[c]) for c in range(ncpu)))
else: else:
print() print()
else: else:
......
...@@ -64,7 +64,7 @@ def print_tracepoints(): ...@@ -64,7 +64,7 @@ def print_tracepoints():
print_tpoint(category, event) print_tpoint(category, event)
def print_usdt_argument_details(location): 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) arg = location.get_argument(idx)
print(" argument #%d %s" % (idx+1, arg)) print(" argument #%d %s" % (idx+1, arg))
...@@ -72,7 +72,7 @@ def print_usdt_details(probe): ...@@ -72,7 +72,7 @@ def print_usdt_details(probe):
if args.verbosity > 0: if args.verbosity > 0:
print(probe) print(probe)
if args.verbosity > 1: 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) loc = probe.get_location(idx)
print(" location #%d %s" % (idx+1, loc)) print(" location #%d %s" % (idx+1, loc))
print_usdt_argument_details(loc) print_usdt_argument_details(loc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment