mib created this revision.
mib added reviewers: JDevlieghere, bulbazord.
mib added a project: LLDB.
Herald added a project: All.
mib requested review of this revision.
Herald added a subscriber: lldb-commits.
This patch changes the parsing logic for the legacy crash report format
to avoid interrupting the parsing if there are new lines in the middle
of a section.
To do, the parser starts to skip all consecutive empty lines. If the
number of lines skipped is greater than 1, the parser considers that it
reached a new setion of the report and should reset the parsing mode to
back to normal.
Otherwise, it tries to parse the next line in the current parsing mode.
If it succeeds, the parser will also skip that line since it has already
been parsed and continue the parsing.
rdar://107022595
Signed-off-by: Med Ismail Bennani <ism...@bennani.ma>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D157043
Files:
lldb/examples/python/crashlog.py
Index: lldb/examples/python/crashlog.py
===================================================================
--- lldb/examples/python/crashlog.py
+++ lldb/examples/python/crashlog.py
@@ -899,8 +899,15 @@
with open(self.path, "r", encoding="utf-8") as f:
lines = f.read().splitlines()
- for line in lines:
+ idx = 0
+ lines_count = len(lines)
+ while True:
+ if idx >= lines_count:
+ break
+
+ line = lines[idx]
line_len = len(line)
+
if line_len == 0:
if self.thread:
if self.parse_mode == CrashLogParseMode.THREAD:
@@ -924,15 +931,36 @@
self.crashlog.info_lines[-1]
):
self.crashlog.info_lines.append(line)
+
+ empty_lines = 0
+ while (
+ idx + empty_lines < lines_count
+ and len(lines[idx + empty_lines]) == 0
+ ):
+ empty_lines = empty_lines + 1
+
+ if (
+ empty_lines == 1
+ and idx + empty_lines < lines_count - 1
+ and self.parse_mode != CrashLogParseMode.NORMAL
+ ):
+ # check if next line can be parsed with the current parse mode
+ next_line_idx = idx + empty_lines
+ if self.parsers[self.parse_mode](lines[next_line_idx]):
+ # If that suceeded, skip the empty line and the next line.
+ idx = next_line_idx + 1
+ continue
self.parse_mode = CrashLogParseMode.NORMAL
else:
self.parsers[self.parse_mode](line)
+ idx = idx + 1
+
return self.crashlog
def parse_exception(self, line):
if not line.startswith("Exception"):
- return
+ return False
if line.startswith("Exception Type:"):
self.crashlog.thread_exception = line[15:].strip()
exception_type_match = self.exception_type_regex.search(line)
@@ -950,7 +978,7 @@
elif line.startswith("Exception Codes:"):
self.crashlog.thread_exception_data = line[16:].strip()
if "type" not in self.crashlog.exception:
- return
+ return False
exception_codes_match = self.exception_codes_regex.search(line)
if exception_codes_match:
self.crashlog.exception["codes"] = self.crashlog.thread_exception_data
@@ -961,10 +989,11 @@
]
else:
if "type" not in self.crashlog.exception:
- return
+ return False
exception_extra_match = self.exception_extra_regex.search(line)
if exception_extra_match:
self.crashlog.exception["message"] = exception_extra_match.group(1)
+ return True
def parse_normal(self, line):
if line.startswith("Process:"):
@@ -1063,14 +1092,14 @@
def parse_thread(self, line):
if line.startswith("Thread"):
- return
+ return False
if self.null_frame_regex.search(line):
print('warning: thread parser ignored null-frame: "%s"' % line)
- return
+ return False
frame_match = self.frame_regex.search(line)
if not frame_match:
print('error: frame regex failed for line: "%s"' % line)
- return
+ return False
frame_id = (
frame_img_name
@@ -1137,6 +1166,8 @@
self.crashlog.Frame(int(frame_id), int(frame_addr, 0), description)
)
+ return True
+
def parse_images(self, line):
image_match = self.image_regex_uuid.search(line)
if image_match:
@@ -1170,17 +1201,21 @@
self.images.append(image)
self.crashlog.images.append(image)
+ return True
else:
print("error: image regex failed for: %s" % line)
+ return False
def parse_thread_registers(self, line):
# "r12: 0x00007fff6b5939c8 r13: 0x0000000007000006 r14: 0x0000000000002a03 r15: 0x0000000000000c00"
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)
+ return True
def parse_system(self, line):
self.crashlog.system_profile.append(line)
+ return True
def parse_instructions(self, line):
pass
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
