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/SBEvent.cpp b/source/API/SBEvent.cpp
index c082863..c04ee72 100644
--- a/source/API/SBEvent.cpp
+++ b/source/API/SBEvent.cpp
@@ -24,19 +24,19 @@
SBEvent::SBEvent () :
m_event_sp (),
- m_lldb_object (NULL)
+ m_opaque (NULL)
{
}
SBEvent::SBEvent (uint32_t event_type, const char *cstr, uint32_t cstr_len) :
m_event_sp (new Event (event_type, new EventDataBytes (cstr, cstr_len))),
- m_lldb_object (m_event_sp.get())
+ m_opaque (m_event_sp.get())
{
}
SBEvent::SBEvent (EventSP &event_sp) :
m_event_sp (event_sp),
- m_lldb_object (event_sp.get())
+ m_opaque (event_sp.get())
{
}
@@ -47,7 +47,7 @@
void
SBEvent::Dump (FILE *f) const
{
- const Event *lldb_event = GetLLDBObjectPtr();
+ const Event *lldb_event = get();
if (lldb_event)
{
StreamFile str(f);
@@ -58,7 +58,7 @@
const char *
SBEvent::GetDataFlavor ()
{
- Event *lldb_event = SBEvent::GetLLDBObjectPtr();
+ Event *lldb_event = get();
if (lldb_event)
return lldb_event->GetData()->GetFlavor().AsCString();
return NULL;
@@ -67,7 +67,7 @@
uint32_t
SBEvent::GetType () const
{
- const Event *lldb_event = SBEvent::GetLLDBObjectPtr();
+ const Event *lldb_event = get();
if (lldb_event)
return lldb_event->GetType();
return 0;
@@ -77,9 +77,9 @@
SBEvent::GetBroadcaster () const
{
SBBroadcaster broadcaster;
- const Event *lldb_event = SBEvent::GetLLDBObjectPtr();
+ const Event *lldb_event = get();
if (lldb_event)
- broadcaster.SetLLDBObjectPtr (lldb_event->GetBroadcaster(), false);
+ broadcaster.reset (lldb_event->GetBroadcaster(), false);
return broadcaster;
}
@@ -88,9 +88,9 @@
{
if (broadcaster)
{
- Event *lldb_event = SBEvent::GetLLDBObjectPtr();
+ Event *lldb_event = get();
if (lldb_event)
- return lldb_event->BroadcasterIs (broadcaster->GetLLDBObjectPtr ());
+ return lldb_event->BroadcasterIs (broadcaster->get());
}
return false;
}
@@ -98,79 +98,66 @@
bool
SBEvent::BroadcasterMatchesRef (const SBBroadcaster &broadcaster)
{
- Event *lldb_event = SBEvent::GetLLDBObjectPtr();
+ Event *lldb_event = get();
if (lldb_event)
- return lldb_event->BroadcasterIs (broadcaster.GetLLDBObjectPtr ());
+ return lldb_event->BroadcasterIs (broadcaster.get());
return false;
}
void
SBEvent::Clear()
{
- Event *lldb_event = SBEvent::GetLLDBObjectPtr();
+ Event *lldb_event = get();
if (lldb_event)
lldb_event->Clear();
}
EventSP &
-SBEvent::GetSharedPtr () const
+SBEvent::GetSP () const
{
return m_event_sp;
}
Event *
-SBEvent::GetLLDBObjectPtr ()
+SBEvent::get() const
{
// There is a dangerous accessor call GetSharedPtr which can be used, so if
// we have anything valid in m_event_sp, we must use that since if it gets
// used by a function that puts something in there, then it won't update
- // m_lldb_object...
+ // m_opaque...
if (m_event_sp)
- m_lldb_object = m_event_sp.get();
+ m_opaque = m_event_sp.get();
- return m_lldb_object;
-}
-
-const Event *
-SBEvent::GetLLDBObjectPtr () const
-{
- // There is a dangerous accessor call GetSharedPtr which can be used, so if
- // we have anything valid in m_event_sp, we must use that since if it gets
- // used by a function that puts something in there, then it won't update
- // m_lldb_object...
- if (m_event_sp)
- m_lldb_object = m_event_sp.get();
-
- return m_lldb_object;
+ return m_opaque;
}
void
-SBEvent::SetEventSP (EventSP &event_sp)
+SBEvent::reset (EventSP &event_sp)
{
m_event_sp = event_sp;
- m_lldb_object = m_event_sp.get();
+ m_opaque = m_event_sp.get();
}
void
-SBEvent::SetLLDBObjectPtr (Event* event_ptr)
+SBEvent::reset (Event* event_ptr)
{
- m_lldb_object = event_ptr;
+ m_opaque = event_ptr;
m_event_sp.reset();
}
bool
SBEvent::IsValid() const
{
- // Do NOT use m_lldb_object directly!!! Must use the SBEvent::GetLLDBObjectPtr()
- // accessor. See comments in SBEvent::GetLLDBObjectPtr()....
- return SBEvent::GetLLDBObjectPtr() != NULL;
+ // Do NOT use m_opaque directly!!! Must use the SBEvent::get()
+ // accessor. See comments in SBEvent::get()....
+ return SBEvent::get() != NULL;
}
const char *
SBEvent::GetCStringFromEvent (const SBEvent &event)
{
- return reinterpret_cast<const char *>(EventDataBytes::GetBytesFromEvent (event.GetLLDBObjectPtr()));
+ return reinterpret_cast<const char *>(EventDataBytes::GetBytesFromEvent (event.get()));
}