[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] simpletrace: define exception and add handling
From: |
Mads Ynddal |
Subject: |
[PATCH 8/9] simpletrace: define exception and add handling |
Date: |
Tue, 21 Feb 2023 10:01:03 +0100 |
From: Mads Ynddal <m.ynddal@samsung.com>
Define `SimpleException` to differentiate our exceptions from generic
exceptions (IOError, etc.). Adapted simpletrace to support this and
output to stderr.
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
---
scripts/simpletrace.py | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 61af68618f..35d2a757c4 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:
@@ -201,8 +204,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)
@@ -225,4 +227,9 @@ 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
- [PATCH 0/9] simpletrace: refactor and general improvements, Mads Ynddal, 2023/02/21
- [PATCH 1/9] simpletrace: Improve parsing of sys.argv; fix files never closed., Mads Ynddal, 2023/02/21
- [PATCH 2/9] simpletrace: Annotate magic constants from QEMU code, Mads Ynddal, 2023/02/21
- [PATCH 3/9] simpletrace: changed naming of edict and idtoname to improve readability, Mads Ynddal, 2023/02/21
- [PATCH 4/9] simpletrace: update code for Python 3.11, Mads Ynddal, 2023/02/21
- [PATCH 5/9] simpletrace: Changed Analyzer class to become context-manager, Mads Ynddal, 2023/02/21
- [PATCH 6/9] simpletrace: Simplify construction of tracing methods, Mads Ynddal, 2023/02/21
- [PATCH 7/9] simpletrace: Improved error handling on struct unpack, Mads Ynddal, 2023/02/21
- [PATCH 8/9] simpletrace: define exception and add handling,
Mads Ynddal <=
- [PATCH 9/9] simpletrace: Refactor to separate responsibilities, Mads Ynddal, 2023/02/21