Skip to content

Modernize Python 2 code #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modernize Python 2 code #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions experimental/csprofile_decode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
from __future__ import print_function

import sys, os, struct, re
import ConfigParser as CP
Expand Down Expand Up @@ -55,7 +56,7 @@ def read_trace(fn, verbose=0, decode=True, viewer=None, limit=None):
tds = "<no time>"
else:
tds = "+%d" % tdelt
print >>sys.stderr, "%s: %s: record type %u len %u" % (fn, tds, type, len(data))
print("%s: %s: record type %u len %u" % (fn, tds, type, len(data)), file=sys.stderr)
if type == TREC_CSMETA:
# coresight trace metadata
if data[-1] == '\0':
Expand All @@ -74,16 +75,16 @@ def read_trace(fn, verbose=0, decode=True, viewer=None, limit=None):
regs[nk] = int(value, 16)
cfg = cs_decode_etm.etm_config(regs)
if verbose:
print >>sys.stderr, "%s: got trace configuration for trace id %u" % (fn, cfg.traceid)
print("%s: got trace configuration for trace id %u" % (fn, cfg.traceid), file=sys.stderr)
if verbose >= 2:
for k in regs:
print >>sys.stderr, " %-20s 0x%08x" % (k, regs[k])
print(" %-20s 0x%08x" % (k, regs[k]), file=sys.stderr)
decoder_cfg[cfg.traceid] = cfg
elif type == TREC_CSTRACE:
# coresight trace
n_buffers += 1
if verbose:
print >>sys.stderr, "%s: ETM trace buffer, size %u" % (fn, len(data))
print("%s: ETM trace buffer, size %u" % (fn, len(data)), file=sys.stderr)
if verbose >= 2:
# Show the current memory-map for decoding this trace buffer
g_map.show()
Expand All @@ -98,15 +99,15 @@ def read_trace(fn, verbose=0, decode=True, viewer=None, limit=None):
decoders[traceid] = cs_decode_etm.decode_etm(cfg, traceid, viewer=viewer)
cs_decode.buffer_decode(data, decoders, fn=fn, verbose=(verbose >= 2))
if limit is not None and n_buffers >= limit:
print "%s: hit limit of %u buffers" % (fn, limit)
print("%s: hit limit of %u buffers" % (fn, limit))
break
elif type == TREC_MMAP:
# memory mapping from file - usually an ELF executable or shared object, although it could be /etc/ld.so.cache
# this record generally derives from a perf mmap event
(addr, size, offset) = struct.unpack("QII", data[:16])
name = data[16:-1]
if verbose:
print >>sys.stderr, "%s: mapped file \"%s\" at 0x%x-0x%x, offset 0x%x" % (fn, name, addr, addr+size, offset)
print("%s: mapped file \"%s\" at 0x%x-0x%x, offset 0x%x" % (fn, name, addr, addr+size, offset), file=sys.stderr)
if name[0] == '[':
# Possibly "[vdso]" or similar pseudo file. TBD: should these even appear as a TREC_MMAP record?
# we expect to tget a TREC_MEM record with the actual data.
Expand All @@ -118,21 +119,21 @@ def read_trace(fn, verbose=0, decode=True, viewer=None, limit=None):
(addr, size) = struct.unpack("QI", data[:12])
name = data[12:-1]
if verbose:
print >>sys.stderr, "%s: mapped raw binary file \"%s\" at 0x%x" % (fn, name, addr)
print("%s: mapped raw binary file \"%s\" at 0x%x" % (fn, name, addr), file=sys.stderr)
g_map.add_bin(name, addr)
elif type == TREC_MEM:
# memory mapping - inline data
(addr,) = struct.unpack("Q", data[:8])
if verbose:
print >>sys.stderr, "%s: mapped raw data (0x%x bytes) at 0x%x" % (fn, len(data[8:]), addr)
print("%s: mapped raw data (0x%x bytes) at 0x%x" % (fn, len(data[8:]), addr), file=sys.stderr)
g_map.add_segment(data[8:], addr)
elif type < 100:
print >>sys.stderr, "%s: ignoring unknown record type %u" % (fn, type)
print("%s: ignoring unknown record type %u" % (fn, type), file=sys.stderr)
else:
print >>sys.stderr, "%s: trace container looks corrupt" % (fn)
print("%s: trace container looks corrupt" % (fn), file=sys.stderr)
break
if verbose:
print "%s: processing complete." % (fn)
print("%s: processing complete." % (fn))


if __name__ == "__main__":
Expand All @@ -143,11 +144,11 @@ def read_trace(fn, verbose=0, decode=True, viewer=None, limit=None):
for arg in sys.argv[1:]:
if arg.startswith("-"):
if arg == "--help":
print "Usage: %s [options] trace.data" % sys.argv[0]
print " decode profile data created by csprofile"
print " -v increase verbosity level"
print " --decode decode the CoreSight trace data"
print " --kernel=<fn> specify kernel ELF file"
print("Usage: %s [options] trace.data" % sys.argv[0])
print(" decode profile data created by csprofile")
print(" -v increase verbosity level")
print(" --decode decode the CoreSight trace data")
print(" --kernel=<fn> specify kernel ELF file")
sys.exit()
elif arg == "-v" or arg == "--verbose":
o_verbose += 1
Expand All @@ -158,7 +159,7 @@ def read_trace(fn, verbose=0, decode=True, viewer=None, limit=None):
elif arg.startswith("--kernel="):
g_map.add_elf(arg[9:])
else:
print "%s: wrong args: %s" % (sys.argv[0], arg)
print("%s: wrong args: %s" % (sys.argv[0], arg))
sys.exit(1)
else:
read_trace(arg, decode=o_decode, verbose=o_verbose)
Expand Down
13 changes: 7 additions & 6 deletions experimental/csprofile_read.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
from __future__ import print_function

import sys, os, struct, re

Expand Down Expand Up @@ -68,7 +69,7 @@ def show_trace_records(fn):
if base_time is None:
base_time = time
delta = time - base_time
print "%-15d %11d %-12s %7u" % (time, delta, type_name(type), len(data))
print("%-15d %11d %-12s %7u" % (time, delta, type_name(type), len(data)))


if __name__ == "__main__":
Expand All @@ -78,15 +79,15 @@ def show_trace_records(fn):
for arg in sys.argv[1:]:
if arg.startswith("-"):
if arg == "--help":
print "Usage: %s [options] trace.data" % sys.argv[0]
print " show profile data created by csprofile"
print " -v increase verbosity level"
print " --kernel=<fn> specify kernel ELF file"
print("Usage: %s [options] trace.data" % sys.argv[0])
print(" show profile data created by csprofile")
print(" -v increase verbosity level")
print(" --kernel=<fn> specify kernel ELF file")
sys.exit()
elif arg == "-v" or arg == "--verbose":
o_verbose += 1
else:
print "%s: wrong args: %s" % (sys.argv[0], arg)
print("%s: wrong args: %s" % (sys.argv[0], arg))
sys.exit(1)
else:
show_trace_records(arg)
Expand Down
7 changes: 4 additions & 3 deletions python/csreg_tc2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
from __future__ import print_function

from csaccess import *
from csregistration import boards, enum
Expand All @@ -24,7 +25,7 @@ def register_tc2(devices):
"""
cores = enum('A7_0', 'A7_1', 'A7_2', 'A15_0', 'A15_1')

print "CSDEMO: Registering TC2 CoreSight devices..."
print("CSDEMO: Registering TC2 CoreSight devices...")
cs_register_romtable(0x20000000)
# Set the PTM affinities
cs_device_set_affinity(cs_device_register(0x2201C000), cores.A15_0)
Expand All @@ -40,7 +41,7 @@ def register_tc2(devices):
cs_device_set_affinity(cs_device_register(0x22039000), cores.A7_1)
cs_device_set_affinity(cs_device_register(0x2203A000), cores.A7_2)

print "CSDEMO: Registering trace-bus connections..."
print("CSDEMO: Registering trace-bus connections...")
# Connect the devices
funnel = cs_device_get(0x20040000)

Expand Down Expand Up @@ -77,7 +78,7 @@ def register_tc2(devices):
"""
Add corresponding metadata about board to the list
"""
print "Loaded Info for ARM TC2"
print("Loaded Info for ARM TC2")
boards.append({
'registration' : register_tc2,
'n_cpu' : 5,
Expand Down