Very large changes that were needed in order to allow multiple connections
to the debugger from GUI windows. Previously there was one global debugger
instance that could be accessed that had its own command interpreter and
current state (current target/process/thread/frame). When a GUI debugger
was attached, if it opened more than one window that each had a console
window, there were issues where the last one to setup the global debugger
object won and got control of the debugger.
To avoid this we now create instances of the lldb_private::Debugger that each
has its own state:
- target list for targets the debugger instance owns
- current process/thread/frame
- its own command interpreter
- its own input, output and error file handles to avoid conflicts
- its own input reader stack
So now clients should call:
SBDebugger::Initialize(); // (static function)
SBDebugger debugger (SBDebugger::Create());
// Use which ever file handles you wish
debugger.SetErrorFileHandle (stderr, false);
debugger.SetOutputFileHandle (stdout, false);
debugger.SetInputFileHandle (stdin, true);
// main loop
SBDebugger::Terminate(); // (static function)
SBDebugger::Initialize() and SBDebugger::Terminate() are ref counted to
ensure nothing gets destroyed too early when multiple clients might be
attached.
Cleaned up the command interpreter and the CommandObject and all subclasses
to take more appropriate arguments.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@106615 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Commands/CommandObjectHelp.cpp b/source/Commands/CommandObjectHelp.cpp
index ac1046e..8a037e9 100644
--- a/source/Commands/CommandObjectHelp.cpp
+++ b/source/Commands/CommandObjectHelp.cpp
@@ -38,133 +38,29 @@
bool
-CommandObjectHelp::OldExecute
-(
- Args& command,
- CommandContext *context,
- CommandInterpreter *interpreter,
- CommandReturnObject &result
-)
-{
- CommandObject::CommandMap::iterator pos;
- CommandObject *cmd_obj;
-
- const int argc = command.GetArgumentCount();
- if (argc > 0)
- {
- cmd_obj = interpreter->GetCommandObject (command.GetArgumentAtIndex(0), false, false);
- if (cmd_obj == NULL)
- {
- cmd_obj = interpreter->GetCommandObject (command.GetArgumentAtIndex(0), true, false);
- if (cmd_obj != NULL)
- {
- StreamString alias_help_str;
- interpreter->GetAliasHelp (command.GetArgumentAtIndex(0), cmd_obj->GetCommandName(), alias_help_str);
- result.AppendMessageWithFormat ("'%s' is an alias for %s.\n", command.GetArgumentAtIndex (0),
- alias_help_str.GetData());
- }
- }
-
- if (cmd_obj)
- {
- Stream &output_strm = result.GetOutputStream();
- if (cmd_obj->GetOptions() != NULL)
- {
- const char * long_help = cmd_obj->GetHelpLong();
- if ((long_help!= NULL)
- && strlen (long_help) > 0)
- output_strm.Printf ("\n%s", cmd_obj->GetHelpLong());
- else
- output_strm.Printf ("\n%s\n", cmd_obj->GetHelp());
- output_strm.Printf ("\nSyntax: %s\n", cmd_obj->GetSyntax());
- cmd_obj->GetOptions()->GenerateOptionUsage (output_strm, cmd_obj);
- }
- else if (cmd_obj->IsMultiwordObject())
- {
- bool done = false;
- if (argc > 1)
- {
- CommandObject::CommandMap::iterator pos;
- std::string sub_command = command.GetArgumentAtIndex(1);
- pos = ((CommandObjectMultiword *) cmd_obj)->m_subcommand_dict.find(sub_command);
- if (pos != ((CommandObjectMultiword *) cmd_obj)->m_subcommand_dict.end())
- {
- CommandObject *sub_cmd_obj = pos->second.get();
- if (sub_cmd_obj->GetOptions() != NULL)
- {
- output_strm.Printf ("\n%s\n", sub_cmd_obj->GetHelp());
- output_strm.Printf ("\nSyntax: %s\n", sub_cmd_obj->GetSyntax());
- sub_cmd_obj->GetOptions()->GenerateOptionUsage (output_strm, sub_cmd_obj);
- done = true;
- }
- else
- {
- output_strm.Printf ("\n%s\n", sub_cmd_obj->GetHelp());
- output_strm.Printf ("\nSyntax: %s\n", sub_cmd_obj->GetSyntax());
- done = true;
- }
- }
- }
- if (!done)
- {
- output_strm.Printf ("%s\n", cmd_obj->GetHelp());
- ((CommandObjectMultiword *) cmd_obj)->GenerateHelpText (result, interpreter);
- }
- }
- else
- {
- const char *long_help = cmd_obj->GetHelpLong();
- if ((long_help != NULL)
- && (strlen (long_help) > 0))
- output_strm.Printf ("\n%s", cmd_obj->GetHelpLong());
- else
- output_strm.Printf ("\n%s\n", cmd_obj->GetHelp());
- output_strm.Printf ("\nSyntax: %s\n", cmd_obj->GetSyntax());
- }
- result.SetStatus (eReturnStatusSuccessFinishNoResult);
- }
- else
- {
- result.AppendErrorWithFormat
- ("'%s' is not a known command.\nTry 'help' to see a current list of commands.\n",
- command.GetArgumentAtIndex(0));
- result.SetStatus (eReturnStatusFailed);
- }
- }
- else
- {
- result.SetStatus (eReturnStatusSuccessFinishNoResult);
- interpreter->GetHelp(result);
- }
- return result.Succeeded();
-}
-
-bool
-CommandObjectHelp::Execute (Args &command, CommandContext *context, CommandInterpreter *interpreter,
- CommandReturnObject &result)
+CommandObjectHelp::Execute (CommandInterpreter &interpreter, Args& command, CommandReturnObject &result)
{
CommandObject::CommandMap::iterator pos;
CommandObject *cmd_obj;
const int argc = command.GetArgumentCount ();
-
+
// 'help' doesn't take any options or arguments, other than command names. If argc is 0, we show the user
// all commands and aliases. Otherwise every argument must be the name of a command or a sub-command.
-
if (argc == 0)
{
result.SetStatus (eReturnStatusSuccessFinishNoResult);
- interpreter->GetHelp (result); // General help, for ALL commands.
+ interpreter.GetHelp (result); // General help, for ALL commands.
}
else
{
// Get command object for the first command argument. Only search built-in command dictionary.
- cmd_obj = interpreter->GetCommandObject (command.GetArgumentAtIndex (0), false, false);
+ cmd_obj = interpreter.GetCommandObject (command.GetArgumentAtIndex (0), false, false);
if (cmd_obj == NULL)
- {
+ {
// That failed, so now search in the aliases dictionary, too.
- cmd_obj = interpreter->GetCommandObject (command.GetArgumentAtIndex (0), true, false);
- }
-
+ cmd_obj = interpreter.GetCommandObject (command.GetArgumentAtIndex (0), true, false);
+ }
+
if (cmd_obj != NULL)
{
bool all_okay = true;
@@ -182,19 +78,19 @@
{
pos = ((CommandObjectMultiword *) sub_cmd_obj)->m_subcommand_dict.find (sub_command);
if (pos != ((CommandObjectMultiword *) sub_cmd_obj)->m_subcommand_dict.end())
- sub_cmd_obj = pos->second.get();
+ sub_cmd_obj = pos->second.get();
else
- all_okay = false;
+ all_okay = false;
}
}
-
+
if (!all_okay || (sub_cmd_obj == NULL))
{
std::string cmd_string;
command.GetCommandString (cmd_string);
result.AppendErrorWithFormat
- ("'%s' is not a known command.\nTry 'help' to see a current list of commands.\n",
- cmd_string.c_str());
+ ("'%s' is not a known command.\nTry 'help' to see a current list of commands.\n",
+ cmd_string.c_str());
result.SetStatus (eReturnStatusFailed);
}
else
@@ -208,59 +104,59 @@
const char *long_help = sub_cmd_obj->GetHelpLong();
if ((long_help != NULL)
&& (strlen (long_help) > 0))
- output_strm.Printf ("\n%s", long_help);
+ output_strm.Printf ("\n%s", long_help);
}
else if (sub_cmd_obj->IsMultiwordObject())
{
output_strm.Printf ("%s\n", sub_cmd_obj->GetHelp());
- ((CommandObjectMultiword *) sub_cmd_obj)->GenerateHelpText (result, interpreter);
+ ((CommandObjectMultiword *) sub_cmd_obj)->GenerateHelpText (interpreter, result);
}
else
{
- const char *long_help = sub_cmd_obj->GetHelpLong();
- if ((long_help != NULL)
- && (strlen (long_help) > 0))
- output_strm.Printf ("%s", long_help);
- else
- output_strm.Printf ("%s\n", sub_cmd_obj->GetHelp());
- output_strm.Printf ("\nSyntax: %s\n", sub_cmd_obj->GetSyntax());
+ const char *long_help = sub_cmd_obj->GetHelpLong();
+ if ((long_help != NULL)
+ && (strlen (long_help) > 0))
+ output_strm.Printf ("%s", long_help);
+ else
+ output_strm.Printf ("%s\n", sub_cmd_obj->GetHelp());
+ output_strm.Printf ("\nSyntax: %s\n", sub_cmd_obj->GetSyntax());
}
}
}
else
{
result.AppendErrorWithFormat
- ("'%s' is not a known command.\nTry 'help' to see a current list of commands.\n",
- command.GetArgumentAtIndex(0));
+ ("'%s' is not a known command.\nTry 'help' to see a current list of commands.\n",
+ command.GetArgumentAtIndex(0));
result.SetStatus (eReturnStatusFailed);
}
}
-
+
return result.Succeeded();
}
int
CommandObjectHelp::HandleCompletion
(
+ CommandInterpreter &interpreter,
Args &input,
int &cursor_index,
int &cursor_char_position,
int match_start_point,
int max_return_elements,
- CommandInterpreter *interpreter,
StringList &matches
)
{
// Return the completions of the commands in the help system:
if (cursor_index == 0)
{
- return interpreter->HandleCompletionMatches(input, cursor_index, cursor_char_position, match_start_point, max_return_elements, matches);
+ return interpreter.HandleCompletionMatches(input, cursor_index, cursor_char_position, match_start_point, max_return_elements, matches);
}
else
{
- CommandObject *cmd_obj = interpreter->GetCommandObject (input.GetArgumentAtIndex(0), true, false);
+ CommandObject *cmd_obj = interpreter.GetCommandObject (input.GetArgumentAtIndex(0), true, false);
input.Shift();
cursor_index--;
- return cmd_obj->HandleCompletion (input, cursor_index, cursor_char_position, match_start_point, max_return_elements, interpreter, matches);
+ return cmd_obj->HandleCompletion (interpreter, input, cursor_index, cursor_char_position, match_start_point, max_return_elements, matches);
}
}