Skip to content

Commit ff9d732

Browse files
adrian-prantladrian-prantl
committed
crashlog.py: Improve regular expressions
This is yet another change to the regular expressions in crashlog.py that fix a few edge cases, and attempt to improve the readability quite a bit in the process. My last change to support spaces in filenames introduced a bug that caused the version/archspec field to be parsed as part of the image name. For example, in "0x1111111 - 0x22222 +MyApp Pro arm64 <01234>", the name of the image was recognized as "MyApp Pro arm64" instead of "MyApp Pro" with a "version" of arm64. The bugfix makes the space following an optional field mandatory *inside* the optional group. rdar://problem/56883435 Differential Revision: https://reviews.llvm.org/D69871
1 parent 90ecfa2 commit ff9d732

File tree

2 files changed

+63
-13
lines changed

2 files changed

+63
-13
lines changed

‎lldb/examples/python/crashlog.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,22 @@ class CrashLog(symbolication.Symbolicator):
101101
thread_regex = re.compile('^Thread ([0-9]+)([^:]*):(.*)')
102102
app_backtrace_regex = re.compile(
103103
'^Application Specific Backtrace ([0-9]+)([^:]*):(.*)')
104-
frame_regex = re.compile('^([0-9]+)\s+(.+?)\s+(0x[0-9a-fA-F]{7}[0-9a-fA-F]+) +(.*)')
105-
null_frame_regex = re.compile('^([0-9]+)\s+\?\?\?\s+(0{7}0+) +(.*)')
106-
image_regex_uuid = re.compile(
107-
'(0x[0-9a-fA-F]+)[-\s]+(0x[0-9a-fA-F]+)\s+[+]?(.+?)\s+(\(.+\))?\s?(<([-0-9a-fA-F]+)>)? (.*)')
104+
version = r'(\(.+\)|(arm|x86_)[0-9a-z]+)\s+'
105+
frame_regex = re.compile(r'^([0-9]+)' r'\s' # id
106+
r'+(.+?)' r'\s+' # img_name
107+
r'(' +version+ r')?' # img_version
108+
r'(0x[0-9a-fA-F]{7}[0-9a-fA-F]+)' # addr
109+
r' +(.*)' # offs
110+
)
111+
null_frame_regex = re.compile(r'^([0-9]+)\s+\?\?\?\s+(0{7}0+) +(.*)')
112+
image_regex_uuid = re.compile(r'(0x[0-9a-fA-F]+)' # img_lo
113+
r'\s+' '-' r'\s+' # -
114+
r'(0x[0-9a-fA-F]+)' r'\s+' # img_hi
115+
r'[+]?(.+?)' r'\s+' # img_name
116+
r'(' +version+ ')?' # img_version
117+
r'(<([-0-9a-fA-F]+)>\s+)?' # img_uuid
118+
r'(/.*)' # img_path
119+
)
108120
empty_line_regex = re.compile('^$')
109121

110122
class Thread:
@@ -489,18 +501,20 @@ def __init__(self, path, verbose):
489501
continue
490502
frame_match = self.frame_regex.search(line)
491503
if frame_match:
492-
ident = frame_match.group(2)
504+
(frame_id, frame_img_name, _, frame_img_version, _,
505+
frame_addr, frame_ofs) = frame_match.groups()
506+
ident = frame_img_name
493507
thread.add_ident(ident)
494508
if ident not in self.idents:
495509
self.idents.append(ident)
496-
thread.frames.append(CrashLog.Frame(int(frame_match.group(1)), int(
497-
frame_match.group(3), 0), frame_match.group(4)))
510+
thread.frames.append(CrashLog.Frame(int(frame_id), int(
511+
frame_addr, 0), frame_ofs))
498512
else:
499513
print('error: frame regex failed for line: "%s"' % line)
500514
elif parse_mode == PARSE_MODE_IMAGES:
501515
image_match = self.image_regex_uuid.search(line)
502516
if image_match:
503-
(img_lo, img_hi, img_name, img_version,
517+
(img_lo, img_hi, img_name, _, img_version, _,
504518
_, img_uuid, img_path) = image_match.groups()
505519
image = CrashLog.DarwinImage(int(img_lo, 0), int(img_hi, 0),
506520
img_name.strip(),

‎lldb/test/Shell/Python/crashlog.test

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- python -*-
22
# REQUIRES: system-darwin
3+
# DEBUG: cd %S/../../../examples/python && cat %s | %lldb && false
34
# RUN: cd %S/../../../examples/python && cat %s | %lldb | FileCheck %s
45
# CHECK-LABEL: {{S}}KIP BEYOND CHECKS
56
script
@@ -32,8 +33,8 @@ images = [
3233
"0x1111111 - 0x22222 +MyApp Pro arm64 <01234> /tmp/MyApp Pro.app/MyApp Pro",
3334
# CHECK: 0x1111111
3435
# CHECK: 0x22222
35-
# CHECK: MyApp Pro arm64
36-
# CHECK: None
36+
# CHECK: MyApp Pro
37+
# CHECK: arm64
3738
# CHECK: 01234
3839
# CHECK: /tmp/MyApp Pro.app/MyApp Pro
3940

@@ -45,13 +46,45 @@ images = [
4546
# CHECK: 01234
4647
# CHECK: /tmp/MyApp Pro.app/MyApp Pro
4748

48-
"0x7fff63f20000 - 0x7fff63f77ff7 libc++.1.dylib (400.9.4) /usr/lib/libc++.1.dylib"
49+
"0x1111111 - 0x2222222 MyFramework Plus.dylib (1.11 - MyFramework 1.11) <01234> /tmp/MyFramework Plus.dylib",
50+
# CHECK: 0x1111111
51+
# CHECK: 0x2222222
52+
# CHECK: MyFramework Plus.dylib
53+
# CHECK: ({{.*}}
54+
# CHECK: 1.11 - MyFramework 1.11
55+
# CHECK: <{{.*}}
56+
# CHECK: 01234
57+
# CHECK: /tmp/MyFramework Plus.dylib
58+
59+
"0x1111111 - 0x2222222 MyFramework-dev.dylib (1.0.0svn - 1.0.0svn) <01234> /MyFramework-dev.dylib",
60+
# CHECK: 0x1111111
61+
# CHECK: 0x2222222
62+
# CHECK: MyFramework-dev.dylib
63+
# CHECK: ({{.*}}
64+
# CHECK: 1.0.0svn - 1.0.0svn
65+
# CHECK: <{{.*}}
66+
# CHECK: 01234
67+
# CHECK: /MyFramework-dev.dylib
68+
69+
"0x7fff63f20000 - 0x7fff63f77ff7 libc++.1.dylib (400.9.4) /usr/lib/libc++.1.dylib",
4970
# CHECK: 0x7fff63f20000
5071
# CHECK: 0x7fff63f77ff7
5172
# CHECK: libc++.1.dylib
52-
# CHECK: (400.9.4)
73+
# CHECK: ({{.*}}
74+
# CHECK: 400.9.4
75+
# CHECK: None
5376
# CHECK: None
5477
# CHECK: /usr/lib/libc++.1.dylib
78+
79+
"0x1047b8000 - 0x10481ffff dyld arm64e <cfa789d10da63f9a8996daf84ed9d04f> /usr/lib/dyld"
80+
# CHECK: 0x1047b8000
81+
# CHECK: 0x10481ffff
82+
# CHECK: dyld
83+
# CHECK: {{.*}}
84+
# CHECK: arm64e
85+
# CHECK: <{{.*}}
86+
# CHECK: cfa789d10da63f9a8996daf84ed9d04f
87+
# CHECK: /usr/lib/dyld
5588
]
5689
# CHECK-LABEL: FRAMES
5790
frames = [
@@ -67,7 +100,10 @@ frames = [
67100
# CHECK: lldb_private{{.*}} + 105
68101
"2 MyApp Pro arm64 0x000000019b0db3a8 foo + 72",
69102
# CHECK: 2
70-
# CHECK: MyApp Pro arm64
103+
# CHECK: MyApp Pro
104+
# CHECK: a
105+
# CHECK: arm64
106+
# CHECK: a
71107
# CHECK: 0x000000019b0db3a8
72108
# CHECK: foo + 72
73109
"3 He 0x1 0x000000019b0db3a8 foo + 72"

0 commit comments

Comments
 (0)