mib created this revision.
mib added a reviewer: JDevlieghere.
mib added a project: LLDB.
mib requested review of this revision.
Herald added a subscriber: lldb-commits.
The crashlog command has an interactive mode that only provide a very
limited experience. This is why this patch removes all the logic for
this interactive mode and replaces it with CrashLogScriptedProcesses.
Signed-off-by: Med Ismail Bennani <[email protected]>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D119501
Files:
lldb/examples/python/crashlog.py
Index: lldb/examples/python/crashlog.py
===================================================================
--- lldb/examples/python/crashlog.py
+++ lldb/examples/python/crashlog.py
@@ -769,138 +769,6 @@
sys.exit(0)
-class Interactive(cmd.Cmd):
- '''Interactive prompt for analyzing one or more Darwin crash logs, type "help" to see a list of supported commands.'''
- image_option_parser = None
-
- def __init__(self, crash_logs):
- cmd.Cmd.__init__(self)
- self.use_rawinput = False
- self.intro = 'Interactive crashlogs prompt, type "help" to see a list of supported commands.'
- self.crash_logs = crash_logs
- self.prompt = '% '
-
- def default(self, line):
- '''Catch all for unknown command, which will exit the interpreter.'''
- print("uknown command: %s" % line)
- return True
-
- def do_q(self, line):
- '''Quit command'''
- return True
-
- def do_quit(self, line):
- '''Quit command'''
- return True
-
- def do_symbolicate(self, line):
- description = '''Symbolicate one or more darwin crash log files by index to provide source file and line information,
- inlined stack frames back to the concrete functions, and disassemble the location of the crash
- for the first frame of the crashed thread.'''
- option_parser = CreateSymbolicateCrashLogOptions(
- 'symbolicate', description, False)
- command_args = shlex.split(line)
- try:
- (options, args) = option_parser.parse_args(command_args)
- except:
- return
-
- if args:
- # We have arguments, they must valid be crash log file indexes
- for idx_str in args:
- idx = int(idx_str)
- if idx < len(self.crash_logs):
- SymbolicateCrashLog(self.crash_logs[idx], options)
- else:
- print('error: crash log index %u is out of range' % (idx))
- else:
- # No arguments, symbolicate all crash logs using the options
- # provided
- for idx in range(len(self.crash_logs)):
- SymbolicateCrashLog(self.crash_logs[idx], options)
-
- def do_list(self, line=None):
- '''Dump a list of all crash logs that are currently loaded.
-
- USAGE: list'''
- print('%u crash logs are loaded:' % len(self.crash_logs))
- for (crash_log_idx, crash_log) in enumerate(self.crash_logs):
- print('[%u] = %s' % (crash_log_idx, crash_log.path))
-
- def do_image(self, line):
- '''Dump information about one or more binary images in the crash log given an image basename, or all images if no arguments are provided.'''
- usage = "usage: %prog [options] <PATH> [PATH ...]"
- description = '''Dump information about one or more images in all crash logs. The <PATH> can be a full path, image basename, or partial path. Searches are done in this order.'''
- command_args = shlex.split(line)
- if not self.image_option_parser:
- self.image_option_parser = optparse.OptionParser(
- description=description, prog='image', usage=usage)
- self.image_option_parser.add_option(
- '-a',
- '--all',
- action='store_true',
- help='show all images',
- default=False)
- try:
- (options, args) = self.image_option_parser.parse_args(command_args)
- except:
- return
-
- if args:
- for image_path in args:
- fullpath_search = image_path[0] == '/'
- for (crash_log_idx, crash_log) in enumerate(self.crash_logs):
- matches_found = 0
- for (image_idx, image) in enumerate(crash_log.images):
- if fullpath_search:
- if image.get_resolved_path() == image_path:
- matches_found += 1
- print('[%u] ' % (crash_log_idx), image)
- else:
- image_basename = image.get_resolved_path_basename()
- if image_basename == image_path:
- matches_found += 1
- print('[%u] ' % (crash_log_idx), image)
- if matches_found == 0:
- for (image_idx, image) in enumerate(crash_log.images):
- resolved_image_path = image.get_resolved_path()
- if resolved_image_path and string.find(
- image.get_resolved_path(), image_path) >= 0:
- print('[%u] ' % (crash_log_idx), image)
- else:
- for crash_log in self.crash_logs:
- for (image_idx, image) in enumerate(crash_log.images):
- print('[%u] %s' % (image_idx, image))
- return False
-
-
-def interactive_crashlogs(debugger, options, args):
- crash_log_files = list()
- for arg in args:
- for resolved_path in glob.glob(arg):
- crash_log_files.append(resolved_path)
-
- crash_logs = list()
- for crash_log_file in crash_log_files:
- try:
- crash_log = CrashLogParser().parse(debugger, crash_log_file, options.verbose)
- except Exception as e:
- print(e)
- continue
- if options.debug:
- crash_log.dump()
- if not crash_log.images:
- print('error: no images in crash log "%s"' % (crash_log))
- continue
- else:
- crash_logs.append(crash_log)
-
- interpreter = Interactive(crash_logs)
- # List all crash logs that were imported
- interpreter.do_list()
- interpreter.cmdloop()
-
-
def save_crashlog(debugger, command, exe_ctx, result, dict):
usage = "usage: %prog [options] <output-path>"
description = '''Export the state of current target into a crashlog file'''
@@ -1095,48 +963,35 @@
for error in crash_log.errors:
print(error)
-class ResurrectCrashProcess:
- def __init__(self, debugger, internal_dict):
- pass
+def load_crashlog_in_scripted_process(debugger, crash_log_file):
+ result = lldb.SBCommandReturnObject()
- def __call__(self, debugger, command, exe_ctx, result):
- crashlog_path = os.path.expanduser(command)
- if not os.path.exists(crashlog_path):
- result.PutCString("error: crashlog file %s does not exist" % crashlog_path)
+ crashlog_path = os.path.expanduser(crash_log_file)
+ if not os.path.exists(crashlog_path):
+ result.PutCString("error: crashlog file %s does not exist" % crashlog_path)
- try:
- crashlog = CrashLogParser().parse(debugger, crashlog_path, False)
- except Exception as e:
- result.PutCString("error: python exception: %s" % e)
- return
-
- target = crashlog.create_target()
- if not target:
- result.PutCString("error: couldn't create target")
- return
-
- ci = debugger.GetCommandInterpreter()
- if not ci:
- result.PutCString("error: couldn't get command interpreter")
- return
-
- res = lldb.SBCommandReturnObject()
- ci.HandleCommand('script from lldb.macosx import crashlog_scripted_process', res)
- if not res.Succeeded():
- result.PutCString("error: couldn't import crashlog scripted process module")
- return
+ try:
+ crashlog = CrashLogParser().parse(debugger, crashlog_path, False)
+ except Exception as e:
+ result.PutCString("error: python exception: %s" % e)
+ return
- LoadCrashLogInScriptedProcess(debugger, target, crashlog_path)
+ target = crashlog.create_target()
+ if not target:
+ result.PutCString("error: couldn't create target")
+ return
- def get_short_help(self):
- return "Load crash log into an interactive scripted process."
+ ci = debugger.GetCommandInterpreter()
+ if not ci:
+ result.PutCString("error: couldn't get command interpreter")
+ return
- def get_long_help(self):
- # FIXME: Update long help
- option_parser = CrashLogOptionParser()
- return option_parser.format_help()
+ res = lldb.SBCommandReturnObject()
+ ci.HandleCommand('script from lldb.macosx import crashlog_scripted_process', res)
+ if not res.Succeeded():
+ result.PutCString("error: couldn't import crashlog scripted process module")
+ return
-def LoadCrashLogInScriptedProcess(debugger, target, crashlog_path):
structured_data = lldb.SBStructuredData()
structured_data.SetFromJSON(json.dumps({ "crashlog_path" : crashlog_path }))
launch_info = lldb.SBLaunchInfo(None)
@@ -1282,10 +1137,11 @@
error = lldb.SBError()
if args:
- if options.interactive:
- interactive_crashlogs(debugger, options, args)
- else:
- for crash_log_file in args:
+ for crash_log_file in args:
+ ci = debugger.GetCommandInterpreter()
+ if options.interactive and ci and ci.IsInteractive():
+ load_crashlog_in_scripted_process(debugger, crash_log_file)
+ else:
crash_log = CrashLogParser().parse(debugger, crash_log_file, options.verbose)
SymbolicateCrashLog(crash_log, options)
@@ -1298,8 +1154,6 @@
def __lldb_init_module(debugger, internal_dict):
debugger.HandleCommand(
'command script add -c lldb.macosx.crashlog.Symbolicate crashlog')
- debugger.HandleCommand(
- 'command script add -c lldb.macosx.crashlog.ResurrectCrashProcess resurrect_crashlog')
debugger.HandleCommand(
'command script add -f lldb.macosx.crashlog.save_crashlog save_crashlog')
print('"crashlog" and "save_crashlog" commands have been installed, use '
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
