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/API/SBError.cpp b/source/API/SBError.cpp
index 0e00d58..e91c94d 100644
--- a/source/API/SBError.cpp
+++ b/source/API/SBError.cpp
@@ -16,15 +16,15 @@
SBError::SBError () :
- m_lldb_object_ap ()
+ m_opaque_ap ()
{
}
SBError::SBError (const SBError &rhs) :
- m_lldb_object_ap ()
+ m_opaque_ap ()
{
if (rhs.IsValid())
- m_lldb_object_ap.reset (new Error(*rhs));
+ m_opaque_ap.reset (new Error(*rhs));
}
@@ -37,14 +37,14 @@
{
if (rhs.IsValid())
{
- if (m_lldb_object_ap.get())
- *m_lldb_object_ap = *rhs;
+ if (m_opaque_ap.get())
+ *m_opaque_ap = *rhs;
else
- m_lldb_object_ap.reset (new Error(*rhs));
+ m_opaque_ap.reset (new Error(*rhs));
}
else
{
- m_lldb_object_ap.reset();
+ m_opaque_ap.reset();
}
return *this;
}
@@ -53,47 +53,47 @@
const char *
SBError::GetCString () const
{
- if (m_lldb_object_ap.get())
- return m_lldb_object_ap->AsCString();
+ if (m_opaque_ap.get())
+ return m_opaque_ap->AsCString();
return NULL;
}
void
SBError::Clear ()
{
- if (m_lldb_object_ap.get())
- m_lldb_object_ap->Clear();
+ if (m_opaque_ap.get())
+ m_opaque_ap->Clear();
}
bool
SBError::Fail () const
{
- if (m_lldb_object_ap.get())
- return m_lldb_object_ap->Fail();
+ if (m_opaque_ap.get())
+ return m_opaque_ap->Fail();
return false;
}
bool
SBError::Success () const
{
- if (m_lldb_object_ap.get())
- return m_lldb_object_ap->Success();
+ if (m_opaque_ap.get())
+ return m_opaque_ap->Success();
return false;
}
uint32_t
SBError::GetError () const
{
- if (m_lldb_object_ap.get())
- return m_lldb_object_ap->GetError();
+ if (m_opaque_ap.get())
+ return m_opaque_ap->GetError();
return true;
}
ErrorType
SBError::GetType () const
{
- if (m_lldb_object_ap.get())
- return m_lldb_object_ap->GetType();
+ if (m_opaque_ap.get())
+ return m_opaque_ap->GetType();
return eErrorTypeInvalid;
}
@@ -101,14 +101,14 @@
SBError::SetError (uint32_t err, ErrorType type)
{
CreateIfNeeded ();
- m_lldb_object_ap->SetError (err, type);
+ m_opaque_ap->SetError (err, type);
}
void
SBError::SetError (const Error &lldb_error)
{
CreateIfNeeded ();
- *m_lldb_object_ap = lldb_error;
+ *m_opaque_ap = lldb_error;
}
@@ -116,21 +116,21 @@
SBError::SetErrorToErrno ()
{
CreateIfNeeded ();
- m_lldb_object_ap->SetErrorToErrno ();
+ m_opaque_ap->SetErrorToErrno ();
}
void
SBError::SetErrorToGenericError ()
{
CreateIfNeeded ();
- m_lldb_object_ap->SetErrorToErrno ();
+ m_opaque_ap->SetErrorToErrno ();
}
void
SBError::SetErrorString (const char *err_str)
{
CreateIfNeeded ();
- m_lldb_object_ap->SetErrorString (err_str);
+ m_opaque_ap->SetErrorString (err_str);
}
int
@@ -139,7 +139,7 @@
CreateIfNeeded ();
va_list args;
va_start (args, format);
- int num_chars = m_lldb_object_ap->SetErrorStringWithVarArg (format, args);
+ int num_chars = m_opaque_ap->SetErrorStringWithVarArg (format, args);
va_end (args);
return num_chars;
}
@@ -147,27 +147,27 @@
bool
SBError::IsValid () const
{
- return m_lldb_object_ap.get() != NULL;
+ return m_opaque_ap.get() != NULL;
}
void
SBError::CreateIfNeeded ()
{
- if (m_lldb_object_ap.get() == NULL)
- m_lldb_object_ap.reset(new Error ());
+ if (m_opaque_ap.get() == NULL)
+ m_opaque_ap.reset(new Error ());
}
lldb_private::Error *
SBError::operator->()
{
- return m_lldb_object_ap.get();
+ return m_opaque_ap.get();
}
lldb_private::Error *
SBError::get()
{
- return m_lldb_object_ap.get();
+ return m_opaque_ap.get();
}
@@ -175,6 +175,6 @@
SBError::operator*() const
{
// Be sure to call "IsValid()" before calling this function or it will crash
- return *m_lldb_object_ap;
+ return *m_opaque_ap;
}