diff options
author | Dave Lee <davelee.com@gmail.com> | 2022-08-03 22:22:40 -0600 |
---|---|---|
committer | Dave Lee <davelee.com@gmail.com> | 2022-08-11 15:24:57 -0700 |
commit | 28d0c0c2c8e88d2b6599ee34c84eb58eed43a626 (patch) | |
tree | f92d06b55bc378f89906592415f6873591505bf6 /lldb/examples | |
parent | 2c2fb0c7375061147711cd21396d79faad7dfdfb (diff) | |
download | llvm-28d0c0c2c8e88d2b6599ee34c84eb58eed43a626.tar.gz |
[lldb] Tidy some regex in crashlog.py (NFC)
A spiritual follow up to D131032. I noticed some regex could be simplified.
This does some of the following:
1. Removes unused capture groups
2. Uses non-capturing `(?:...)` groups where grouping is needed but capturing isn't
3. Removes trailing `.*`
4. Uses `\d` over `[0-9]`
5. Uses raw strings
6. Uses `{N,}` to indicate N-or-more
Also improves the call site of a `re.findall`.
Differential Revision: https://reviews.llvm.org/D131305
Diffstat (limited to 'lldb/examples')
-rwxr-xr-x | lldb/examples/python/crashlog.py | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py index 33f4c4f3b368..ad0d70a669a8 100755 --- a/lldb/examples/python/crashlog.py +++ b/lldb/examples/python/crashlog.py @@ -603,26 +603,26 @@ class CrashLogParseMode: class TextCrashLogParser(CrashLogParser): - parent_process_regex = re.compile('^Parent Process:\s*(.*)\[(\d+)\]') - thread_state_regex = re.compile('^Thread ([0-9]+) crashed with') - thread_instrs_regex = re.compile('^Thread ([0-9]+) instruction stream') - thread_regex = re.compile('^Thread ([0-9]+)([^:]*):(.*)') - app_backtrace_regex = re.compile('^Application Specific Backtrace ([0-9]+)([^:]*):(.*)') - version = r'(\(.+\)|(arm|x86_)[0-9a-z]+)\s+' - frame_regex = re.compile(r'^([0-9]+)' r'\s+' # id - r'(.+?)' r'\s+' # img_name - r'(' +version+ r')?' # img_version - r'(0x[0-9a-fA-F]{7,})' # addr (7 chars or more) - r' +(.*)' # offs + parent_process_regex = re.compile(r'^Parent Process:\s*(.*)\[(\d+)\]') + thread_state_regex = re.compile(r'^Thread \d+ crashed with') + thread_instrs_regex = re.compile(r'^Thread \d+ instruction stream') + thread_regex = re.compile(r'^Thread (\d+).*:') + app_backtrace_regex = re.compile(r'^Application Specific Backtrace (\d+).*:') + version = r'\(.+\)|(?:arm|x86_)[0-9a-z]+' + frame_regex = re.compile(r'^(\d+)\s+' # id + r'(.+?)\s+' # img_name + r'(?:' +version+ r'\s+)?' # img_version + r'(0x[0-9a-fA-F]{7,})' # addr (7 chars or more) + r' +(.*)' # offs ) - null_frame_regex = re.compile(r'^([0-9]+)\s+\?\?\?\s+(0{7}0+) +(.*)') - image_regex_uuid = re.compile(r'(0x[0-9a-fA-F]+)' # img_lo - r'\s+' '-' r'\s+' # - - r'(0x[0-9a-fA-F]+)' r'\s+' # img_hi - r'[+]?(.+?)' r'\s+' # img_name - r'(' +version+ ')?' # img_version - r'(<([-0-9a-fA-F]+)>\s+)?' # img_uuid - r'(/.*)' # img_path + null_frame_regex = re.compile(r'^\d+\s+\?\?\?\s+0{7,} +') + image_regex_uuid = re.compile(r'(0x[0-9a-fA-F]+)' # img_lo + r'\s+-\s+' # - + r'(0x[0-9a-fA-F]+)\s+' # img_hi + r'[+]?(.+?)\s+' # img_name + r'(?:(' +version+ r')\s+)?' # img_version + r'(?:<([-0-9a-fA-F]+)>\s+)?' # img_uuid + r'(/.*)' # img_path ) def __init__(self, debugger, path, verbose): @@ -768,8 +768,8 @@ class TextCrashLogParser(CrashLogParser): return frame_match = self.frame_regex.search(line) if frame_match: - (frame_id, frame_img_name, _, frame_img_version, _, - frame_addr, frame_ofs) = frame_match.groups() + (frame_id, frame_img_name, frame_addr, + frame_ofs) = frame_match.groups() ident = frame_img_name self.thread.add_ident(ident) if ident not in self.crashlog.idents: @@ -782,8 +782,8 @@ class TextCrashLogParser(CrashLogParser): def parse_images(self, line): image_match = self.image_regex_uuid.search(line) if image_match: - (img_lo, img_hi, img_name, _, img_version, _, - _, img_uuid, img_path) = image_match.groups() + (img_lo, img_hi, img_name, img_version, + img_uuid, img_path) = image_match.groups() image = self.crashlog.DarwinImage(int(img_lo, 0), int(img_hi, 0), img_name.strip(), img_version.strip() @@ -796,13 +796,10 @@ class TextCrashLogParser(CrashLogParser): def parse_thread_registers(self, line): - stripped_line = line.strip() # "r12: 0x00007fff6b5939c8 r13: 0x0000000007000006 r14: 0x0000000000002a03 r15: 0x0000000000000c00" - reg_values = re.findall( - '([a-zA-Z0-9]+: 0[Xx][0-9a-fA-F]+) *', stripped_line) - for reg_value in reg_values: - (reg, value) = reg_value.split(': ') - self.thread.registers[reg.strip()] = int(value, 0) + reg_values = re.findall('([a-z0-9]+): (0x[0-9a-f]+)', line, re.I) + for reg, value in reg_values: + self.thread.registers[reg] = int(value, 16) def parse_system(self, line): self.crashlog.system_profile.append(line) |