Improved API logging.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@117772 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/API/SBThread.cpp b/source/API/SBThread.cpp
index b28a379..782569e 100644
--- a/source/API/SBThread.cpp
+++ b/source/API/SBThread.cpp
@@ -49,27 +49,10 @@
SBThread::SBThread (const ThreadSP& lldb_object_sp) :
m_opaque_sp (lldb_object_sp)
{
- Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
- if (log)
- {
- SBStream sstr;
- GetDescription (sstr);
- log->Printf ("SBThread::SBThread (lldb_object_sp=%p) => SBThread(%p) :%s",
- lldb_object_sp.get(), m_opaque_sp.get(), sstr.GetData());
- }
}
SBThread::SBThread (const SBThread &rhs)
{
- Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
- m_opaque_sp = rhs.m_opaque_sp;
-
- if (log)
- log->Printf ("SBThread::SBThread (rhs.sp=%p) => SBThread(%p)",
- rhs.m_opaque_sp.get(), m_opaque_sp.get());
-
}
//----------------------------------------------------------------------
@@ -106,7 +89,7 @@
}
if (log)
- log->Printf ("SBThread(%p)::GetStopReason () => '%s'", m_opaque_sp.get(),
+ log->Printf ("SBThread(%p)::GetStopReason () => %s", m_opaque_sp.get(),
Thread::StopReasonAsCString (reason));
return reason;
@@ -126,7 +109,7 @@
if (stop_desc)
{
if (log)
- log->Printf ("SBThread(%p)::GetStopDescription (dst, dst_len) => '%s'",
+ log->Printf ("SBThread(%p)::GetStopDescription (dst, dst_len) => \"%s\"",
m_opaque_sp.get(), stop_desc);
if (dst)
return ::snprintf (dst, dst_len, "%s", stop_desc);
@@ -224,15 +207,12 @@
{
Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
- //if (log)
- // log->Printf ("SBThread::GetThreadID()");
-
lldb::tid_t id = LLDB_INVALID_THREAD_ID;
if (m_opaque_sp)
id = m_opaque_sp->GetID();
if (log)
- log->Printf ("SBThread::GetThreadID (this.sp=%p) => %d", m_opaque_sp.get(), (uint32_t) id);
+ log->Printf ("SBThread(%p)::GetThreadID () => 0x%4.4x", m_opaque_sp.get(), id);
return id;
}
@@ -247,44 +227,29 @@
const char *
SBThread::GetName () const
{
- Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
- //if (log)
- // log->Printf ("SBThread::GetName ()");
-
+ const char *name = NULL;
if (m_opaque_sp)
- {
- if (log)
- log->Printf ("SBThread::GetName (this.sp=%p) => '%s'", m_opaque_sp.get(), m_opaque_sp->GetName());
- return m_opaque_sp->GetName();
- }
-
+ name = m_opaque_sp->GetName();
+
+ Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
if (log)
- log->Printf ("SBThread::GetName (this.sp=%p) => NULL", m_opaque_sp.get());
+ log->Printf ("SBThread(%p)::GetName () => %s", m_opaque_sp.get(), name ? name : "NULL");
- return NULL;
+ return name;
}
const char *
SBThread::GetQueueName () const
{
- Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
- //if (log)
- // log->Printf ("SBThread::GetQueueName ()");
-
+ const char *name = NULL;
if (m_opaque_sp)
- {
- if (log)
- log->Printf ("SBThread::GetQueueName (this.sp=%p) => '%s'", m_opaque_sp.get(),
- m_opaque_sp->GetQueueName());
- return m_opaque_sp->GetQueueName();
- }
-
+ name = m_opaque_sp->GetQueueName();
+
+ Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
if (log)
- log->Printf ("SBThread::GetQueueName (this.sp=%p) => NULL", m_opaque_sp.get());
+ log->Printf ("SBThread(%p)::GetQueueName () => %s", m_opaque_sp.get(), name ? name : "NULL");
- return NULL;
+ return name;
}
@@ -390,7 +355,7 @@
Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
if (log)
- log->Printf ("SBThread::StepOut (this.sp=%p)", m_opaque_sp.get());
+ log->Printf ("SBThread(%p)::StepOut ()", m_opaque_sp.get());
if (m_opaque_sp)
{
@@ -482,7 +447,7 @@
{
SBStream sstr;
process.GetDescription (sstr);
- log->Printf ("SBThread::GetProcess (this.sp=%p) => SBProcess : this.sp = %p, '%s'", m_opaque_sp.get(),
+ log->Printf ("SBThread(%p)::GetProcess () => SBProcess(%p): %s", m_opaque_sp.get(),
process.get(), sstr.GetData());
}
@@ -499,7 +464,7 @@
num_frames = m_opaque_sp->GetStackFrameCount();
if (log)
- log->Printf ("SBThread::GetNumFrames (this.sp=%p) => %d", m_opaque_sp.get(), num_frames);
+ log->Printf ("SBThread(%p)::GetNumFrames () => %u", m_opaque_sp.get(), num_frames);
return num_frames;
}
@@ -517,7 +482,7 @@
{
SBStream sstr;
sb_frame.GetDescription (sstr);
- log->Printf ("SBThread(%p)::GetFrameAtIndex (idx=%d) => SBFrame.sp : this = %p, '%s'",
+ log->Printf ("SBThread(%p)::GetFrameAtIndex (idx=%d) => SBFrame(%p): %s",
m_opaque_sp.get(), idx, sb_frame.get(), sstr.GetData());
}
@@ -527,12 +492,8 @@
const lldb::SBThread &
SBThread::operator = (const lldb::SBThread &rhs)
{
- Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API);
-
- if (log)
- log->Printf ("SBThread(%p)::operator= (rhs.sp=%p)", m_opaque_sp.get(), rhs.m_opaque_sp.get());
-
- m_opaque_sp = rhs.m_opaque_sp;
+ if (this != &rhs)
+ m_opaque_sp = rhs.m_opaque_sp;
return *this;
}
@@ -549,7 +510,7 @@
}
lldb_private::Thread *
-SBThread::GetLLDBObjectPtr ()
+SBThread::get ()
{
return m_opaque_sp.get();
}
@@ -579,20 +540,6 @@
}
bool
-SBThread::GetDescription (SBStream &description)
-{
- if (m_opaque_sp)
- {
- StreamString strm;
- description.Printf("SBThread: tid = 0x%4.4x", m_opaque_sp->GetID());
- }
- else
- description.Printf ("No value");
-
- return true;
-}
-
-bool
SBThread::GetDescription (SBStream &description) const
{
if (m_opaque_sp)