From: Mads Ynddal <m.ynd...@samsung.com>
Define `SimpleException` to differentiate our exceptions from generic
exceptions (IOError, etc.). Adapted simpletrace to support this and
output to stderr.
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Signed-off-by: Mads Ynddal <m.ynd...@samsung.com>
---
scripts/simpletrace.py | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index e77cb2469c..3cf34103e4 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -25,12 +25,15 @@
log_header_fmt = '=QQQ' # trace/simple.c::TraceLogHeader
rec_header_fmt = '=QQII' # trace/simple.c::TraceRecord
+class SimpleException(Exception):
+ pass
+
def read_header(fobj, hfmt):
'''Read a trace record header'''
hlen = struct.calcsize(hfmt)
hdr = fobj.read(hlen)
if len(hdr) != hlen:
- raise ValueError('Error reading header. Wrong filetype provided?')
+ raise SimpleException('Error reading header. Wrong filetype provided?')
return struct.unpack(hfmt, hdr)
def get_record(event_mapping, event_id_to_name, rechdr, fobj):
@@ -42,10 +45,10 @@ def get_record(event_mapping, event_id_to_name, rechdr,
fobj):
try:
event = event_mapping[name]
except KeyError as e:
- sys.stderr.write(f'{e} event is logged but is not declared ' \
- 'in the trace events file, try using ' \
- 'trace-events-all instead.\n')
- sys.exit(1)
+ raise SimpleException(
+ f'{e} event is logged but is not declared in the trace events'
+ 'file, try using trace-events-all instead.'
+ )
rec = (name, timestamp_ns, pid)
for type, name in event.args:
@@ -207,8 +210,7 @@ def run(analyzer):
*no_header, trace_event_path, trace_file_path = sys.argv[1:]
assert no_header == [] or no_header == ['--no-header'], 'Invalid
no-header argument'
except (AssertionError, ValueError):
- sys.stderr.write(f'usage: {sys.argv[0]} [--no-header] <trace-events>
<trace-file>\n')
- sys.exit(1)
+ raise SimpleException(f'usage: {sys.argv[0]} [--no-header]
<trace-events> <trace-file>\n')
with open(trace_event_path, 'r') as events_fobj, open(trace_file_path,
'rb') as log_fobj:
events = read_events(events_fobj, trace_event_path)
@@ -231,4 +233,8 @@ def catchall(self, *rec_args, event, timestamp_ns, pid,
event_id):
]
print(f'{event.name} {delta_ns / 1000:0.3f} {pid=} ' + '
'.join(fields))
- run(Formatter())
+ try:
+ run(Formatter())
+ except SimpleException as e:
+ sys.stderr.write(e + "\n")
+ sys.exit(1)
--
2.38.1
