diff options
Diffstat (limited to 'lldb/source/API')
31 files changed, 309 insertions, 309 deletions
diff --git a/lldb/source/API/SBAddress.cpp b/lldb/source/API/SBAddress.cpp index 8c4f5f1b66c..799c9090763 100644 --- a/lldb/source/API/SBAddress.cpp +++ b/lldb/source/API/SBAddress.cpp @@ -115,7 +115,7 @@ SBAddress::GetFileAddress () const lldb::addr_t SBAddress::GetLoadAddress (const SBTarget &target) const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::addr_t addr = LLDB_INVALID_ADDRESS; TargetSP target_sp (target.GetSP()); diff --git a/lldb/source/API/SBBreakpoint.cpp b/lldb/source/API/SBBreakpoint.cpp index f0e29176a9e..c6db4d19ee4 100644 --- a/lldb/source/API/SBBreakpoint.cpp +++ b/lldb/source/API/SBBreakpoint.cpp @@ -103,7 +103,7 @@ SBBreakpoint::operator == (const lldb::SBBreakpoint& rhs) break_id_t SBBreakpoint::GetID () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); break_id_t break_id = LLDB_INVALID_BREAK_ID; if (m_opaque_sp) @@ -210,7 +210,7 @@ SBBreakpoint::GetLocationAtIndex (uint32_t index) void SBBreakpoint::SetEnabled (bool enable) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetEnabled (enabled=%i)", m_opaque_sp.get(), enable); @@ -237,7 +237,7 @@ SBBreakpoint::IsEnabled () void SBBreakpoint::SetOneShot (bool one_shot) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetOneShot (one_shot=%i)", m_opaque_sp.get(), one_shot); @@ -276,7 +276,7 @@ SBBreakpoint::IsInternal () void SBBreakpoint::SetIgnoreCount (uint32_t count) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetIgnoreCount (count=%u)", m_opaque_sp.get(), count); @@ -319,7 +319,7 @@ SBBreakpoint::GetHitCount () const count = m_opaque_sp->GetHitCount(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetHitCount () => %u", m_opaque_sp.get(), count); @@ -336,7 +336,7 @@ SBBreakpoint::GetIgnoreCount () const count = m_opaque_sp->GetIgnoreCount(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetIgnoreCount () => %u", m_opaque_sp.get(), count); @@ -351,7 +351,7 @@ SBBreakpoint::SetThreadID (tid_t tid) Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex()); m_opaque_sp->SetThreadID (tid); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetThreadID (tid=0x%4.4" PRIx64 ")", m_opaque_sp.get(), tid); @@ -367,7 +367,7 @@ SBBreakpoint::GetThreadID () tid = m_opaque_sp->GetThreadID(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetThreadID () => 0x%4.4" PRIx64, m_opaque_sp.get(), tid); return tid; @@ -376,7 +376,7 @@ SBBreakpoint::GetThreadID () void SBBreakpoint::SetThreadIndex (uint32_t index) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetThreadIndex (%u)", m_opaque_sp.get(), index); if (m_opaque_sp) @@ -397,7 +397,7 @@ SBBreakpoint::GetThreadIndex() const if (thread_spec != NULL) thread_idx = thread_spec->GetIndex(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetThreadIndex () => %u", m_opaque_sp.get(), thread_idx); @@ -408,7 +408,7 @@ SBBreakpoint::GetThreadIndex() const void SBBreakpoint::SetThreadName (const char *thread_name) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetThreadName (%s)", m_opaque_sp.get(), thread_name); @@ -430,7 +430,7 @@ SBBreakpoint::GetThreadName () const if (thread_spec != NULL) name = thread_spec->GetName(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetThreadName () => %s", m_opaque_sp.get(), name); @@ -440,7 +440,7 @@ SBBreakpoint::GetThreadName () const void SBBreakpoint::SetQueueName (const char *queue_name) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetQueueName (%s)", m_opaque_sp.get(), queue_name); if (m_opaque_sp) @@ -461,7 +461,7 @@ SBBreakpoint::GetQueueName () const if (thread_spec) name = thread_spec->GetQueueName(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetQueueName () => %s", m_opaque_sp.get(), name); @@ -477,7 +477,7 @@ SBBreakpoint::GetNumResolvedLocations() const Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex()); num_resolved = m_opaque_sp->GetNumResolvedLocations(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetNumResolvedLocations () => %" PRIu64, m_opaque_sp.get(), (uint64_t)num_resolved); return num_resolved; @@ -492,7 +492,7 @@ SBBreakpoint::GetNumLocations() const Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex()); num_locs = m_opaque_sp->GetNumLocations(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::GetNumLocations () => %" PRIu64, m_opaque_sp.get(), (uint64_t)num_locs); return num_locs; @@ -557,7 +557,7 @@ SBBreakpoint::PrivateBreakpointHitCallback void SBBreakpoint::SetCallback (BreakpointHitCallback callback, void *baton) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBreakpoint(%p)::SetCallback (callback=%p, baton=%p)", m_opaque_sp.get(), callback, baton); diff --git a/lldb/source/API/SBBreakpointLocation.cpp b/lldb/source/API/SBBreakpointLocation.cpp index a966df99644..6fdf59f38b4 100644 --- a/lldb/source/API/SBBreakpointLocation.cpp +++ b/lldb/source/API/SBBreakpointLocation.cpp @@ -36,7 +36,7 @@ SBBreakpointLocation::SBBreakpointLocation () : SBBreakpointLocation::SBBreakpointLocation (const lldb::BreakpointLocationSP &break_loc_sp) : m_opaque_sp (break_loc_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { @@ -296,7 +296,7 @@ SBBreakpointLocation::GetID () SBBreakpoint SBBreakpointLocation::GetBreakpoint () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); //if (log) // log->Printf ("SBBreakpointLocation::GetBreakpoint ()"); diff --git a/lldb/source/API/SBBroadcaster.cpp b/lldb/source/API/SBBroadcaster.cpp index 9ede891868b..7168305ac80 100644 --- a/lldb/source/API/SBBroadcaster.cpp +++ b/lldb/source/API/SBBroadcaster.cpp @@ -29,7 +29,7 @@ SBBroadcaster::SBBroadcaster (const char *name) : m_opaque_ptr (NULL) { m_opaque_ptr = m_opaque_sp.get(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE)); if (log) log->Printf ("SBBroadcaster::SBBroadcaster (name=\"%s\") => SBBroadcaster(%p)", @@ -40,7 +40,7 @@ SBBroadcaster::SBBroadcaster (lldb_private::Broadcaster *broadcaster, bool owns) m_opaque_sp (owns ? broadcaster : NULL), m_opaque_ptr (broadcaster) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE)); if (log) log->Printf ("SBBroadcaster::SBBroadcaster (broadcaster=%p, bool owns=%i) => SBBroadcaster(%p)", @@ -72,7 +72,7 @@ SBBroadcaster::~SBBroadcaster() void SBBroadcaster::BroadcastEventByType (uint32_t event_type, bool unique) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBroadcaster(%p)::BroadcastEventByType (event_type=0x%8.8x, unique=%i)", m_opaque_ptr, event_type, unique); @@ -89,7 +89,7 @@ SBBroadcaster::BroadcastEventByType (uint32_t event_type, bool unique) void SBBroadcaster::BroadcastEvent (const SBEvent &event, bool unique) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBroadcaster(%p)::BroadcastEventByType (SBEvent(%p), unique=%i)", m_opaque_ptr, event.get(), unique); @@ -107,7 +107,7 @@ SBBroadcaster::BroadcastEvent (const SBEvent &event, bool unique) void SBBroadcaster::AddInitialEventsToListener (const SBListener &listener, uint32_t requested_events) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBBroadcaster(%p)::AddInitialEventsToListener (SBListener(%p), event_mask=0x%8.8x)", m_opaque_ptr, listener.get(), requested_events); if (m_opaque_ptr) diff --git a/lldb/source/API/SBCommandInterpreter.cpp b/lldb/source/API/SBCommandInterpreter.cpp index 61a9739aa53..0c839004601 100644 --- a/lldb/source/API/SBCommandInterpreter.cpp +++ b/lldb/source/API/SBCommandInterpreter.cpp @@ -61,7 +61,7 @@ protected: SBCommandInterpreter::SBCommandInterpreter (CommandInterpreter *interpreter) : m_opaque_ptr (interpreter) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommandInterpreter::SBCommandInterpreter (interpreter=%p)" @@ -110,7 +110,7 @@ SBCommandInterpreter::AliasExists (const char *cmd) lldb::ReturnStatus SBCommandInterpreter::HandleCommand (const char *command_line, SBCommandReturnObject &result, bool add_to_history) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommandInterpreter(%p)::HandleCommand (command=\"%s\", SBCommandReturnObject(%p), add_to_history=%i)", @@ -148,7 +148,7 @@ SBCommandInterpreter::HandleCompletion (const char *current_line, int max_return_elements, SBStringList &matches) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); int num_completions = 0; // Sanity check the arguments that are passed in: @@ -233,7 +233,7 @@ SBCommandInterpreter::GetProcess () sb_process.SetSP(process_sp); } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommandInterpreter(%p)::GetProcess () => SBProcess(%p)", @@ -249,7 +249,7 @@ SBCommandInterpreter::GetDebugger () SBDebugger sb_debugger; if (m_opaque_ptr) sb_debugger.reset(m_opaque_ptr->GetDebugger().shared_from_this()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommandInterpreter(%p)::GetDebugger () => SBDebugger(%p)", @@ -295,7 +295,7 @@ SBCommandInterpreter::SourceInitFileInHomeDirectory (SBCommandReturnObject &resu result->AppendError ("SBCommandInterpreter is not valid"); result->SetStatus (eReturnStatusFailed); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommandInterpreter(%p)::SourceInitFileInHomeDirectory (&SBCommandReturnObject(%p))", @@ -320,7 +320,7 @@ SBCommandInterpreter::SourceInitFileInCurrentWorkingDirectory (SBCommandReturnOb result->AppendError ("SBCommandInterpreter is not valid"); result->SetStatus (eReturnStatusFailed); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommandInterpreter(%p)::SourceInitFileInCurrentWorkingDirectory (&SBCommandReturnObject(%p))", @@ -330,7 +330,7 @@ SBCommandInterpreter::SourceInitFileInCurrentWorkingDirectory (SBCommandReturnOb SBBroadcaster SBCommandInterpreter::GetBroadcaster () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBroadcaster broadcaster (m_opaque_ptr, false); diff --git a/lldb/source/API/SBCommandReturnObject.cpp b/lldb/source/API/SBCommandReturnObject.cpp index 4714829c592..ee7008af3c7 100644 --- a/lldb/source/API/SBCommandReturnObject.cpp +++ b/lldb/source/API/SBCommandReturnObject.cpp @@ -68,7 +68,7 @@ SBCommandReturnObject::IsValid() const const char * SBCommandReturnObject::GetOutput () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (m_opaque_ap.get()) { @@ -88,7 +88,7 @@ SBCommandReturnObject::GetOutput () const char * SBCommandReturnObject::GetError () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (m_opaque_ap.get()) { diff --git a/lldb/source/API/SBCommunication.cpp b/lldb/source/API/SBCommunication.cpp index f96a064c6e2..de349403f97 100644 --- a/lldb/source/API/SBCommunication.cpp +++ b/lldb/source/API/SBCommunication.cpp @@ -28,7 +28,7 @@ SBCommunication::SBCommunication(const char * broadcaster_name) : m_opaque (new Communication (broadcaster_name)), m_opaque_owned (true) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommunication::SBCommunication (broadcaster_name=\"%s\") => " @@ -79,7 +79,7 @@ SBCommunication::Connect (const char *url) ConnectionStatus SBCommunication::AdoptFileDesriptor (int fd, bool owns_fd) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ConnectionStatus status = eConnectionStatusNoConnection; if (m_opaque) @@ -107,7 +107,7 @@ SBCommunication::AdoptFileDesriptor (int fd, bool owns_fd) ConnectionStatus SBCommunication::Disconnect () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ConnectionStatus status= eConnectionStatusNoConnection; if (m_opaque) @@ -123,7 +123,7 @@ SBCommunication::Disconnect () bool SBCommunication::IsConnected () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool result = false; if (m_opaque) result = m_opaque->IsConnected (); @@ -137,7 +137,7 @@ SBCommunication::IsConnected () const size_t SBCommunication::Read (void *dst, size_t dst_len, uint32_t timeout_usec, ConnectionStatus &status) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64 ", timeout_usec=%u, &status)...", m_opaque, @@ -171,7 +171,7 @@ SBCommunication::Write (const void *src, size_t src_len, ConnectionStatus &statu else status = eConnectionStatusNoConnection; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommunication(%p)::Write (src=%p, src_len=%" PRIu64 ", &status=%s) => %" PRIu64, m_opaque, src, (uint64_t)src_len, Communication::ConnectionStatusAsCString (status), (uint64_t)bytes_written); @@ -182,7 +182,7 @@ SBCommunication::Write (const void *src, size_t src_len, ConnectionStatus &statu bool SBCommunication::ReadThreadStart () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool success = false; if (m_opaque) @@ -199,7 +199,7 @@ SBCommunication::ReadThreadStart () bool SBCommunication::ReadThreadStop () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommunication(%p)::ReadThreadStop ()...", m_opaque); @@ -219,7 +219,7 @@ SBCommunication::ReadThreadIsRunning () bool result = false; if (m_opaque) result = m_opaque->ReadThreadIsRunning (); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommunication(%p)::ReadThreadIsRunning () => %i", m_opaque, result); return result; @@ -232,7 +232,7 @@ SBCommunication::SetReadThreadBytesReceivedCallback void *callback_baton ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool result = false; if (m_opaque) @@ -253,7 +253,7 @@ SBCommunication::GetBroadcaster () { SBBroadcaster broadcaster (m_opaque, false); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBCommunication(%p)::GetBroadcaster () => SBBroadcaster (%p)", diff --git a/lldb/source/API/SBCompileUnit.cpp b/lldb/source/API/SBCompileUnit.cpp index 7852fc8a0d7..f3a8417d720 100644 --- a/lldb/source/API/SBCompileUnit.cpp +++ b/lldb/source/API/SBCompileUnit.cpp @@ -71,7 +71,7 @@ SBCompileUnit::GetNumLineEntries () const SBLineEntry SBCompileUnit::GetLineEntryAtIndex (uint32_t idx) const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBLineEntry sb_line_entry; if (m_opaque_ptr) @@ -106,7 +106,7 @@ SBCompileUnit::FindLineEntryIndex (uint32_t start_idx, uint32_t line, SBFileSpec uint32_t SBCompileUnit::FindLineEntryIndex (uint32_t start_idx, uint32_t line, SBFileSpec *inline_file_spec, bool exact) const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t index = UINT32_MAX; if (m_opaque_ptr) @@ -157,7 +157,7 @@ SBCompileUnit::GetNumSupportFiles () const SBFileSpec SBCompileUnit::GetSupportFileAtIndex (uint32_t idx) const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec sb_file_spec; if (m_opaque_ptr) diff --git a/lldb/source/API/SBData.cpp b/lldb/source/API/SBData.cpp index 2a6c59d8384..5b2f075158b 100644 --- a/lldb/source/API/SBData.cpp +++ b/lldb/source/API/SBData.cpp @@ -86,7 +86,7 @@ SBData::IsValid() uint8_t SBData::GetAddressByteSize () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint8_t value = 0; if (m_opaque_sp.get()) value = m_opaque_sp->GetAddressByteSize(); @@ -99,7 +99,7 @@ SBData::GetAddressByteSize () void SBData::SetAddressByteSize (uint8_t addr_byte_size) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (m_opaque_sp.get()) m_opaque_sp->SetAddressByteSize(addr_byte_size); if (log) @@ -116,7 +116,7 @@ SBData::Clear () size_t SBData::GetByteSize () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); size_t value = 0; if (m_opaque_sp.get()) value = m_opaque_sp->GetByteSize(); @@ -129,7 +129,7 @@ SBData::GetByteSize () lldb::ByteOrder SBData::GetByteOrder () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::ByteOrder value = eByteOrderInvalid; if (m_opaque_sp.get()) value = m_opaque_sp->GetByteOrder(); @@ -142,7 +142,7 @@ SBData::GetByteOrder () void SBData::SetByteOrder (lldb::ByteOrder endian) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (m_opaque_sp.get()) m_opaque_sp->SetByteOrder(endian); if (log) @@ -153,7 +153,7 @@ SBData::SetByteOrder (lldb::ByteOrder endian) float SBData::GetFloat (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); float value = 0; if (!m_opaque_sp.get()) { @@ -175,7 +175,7 @@ SBData::GetFloat (lldb::SBError& error, lldb::offset_t offset) double SBData::GetDouble (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); double value = 0; if (!m_opaque_sp.get()) { @@ -197,7 +197,7 @@ SBData::GetDouble (lldb::SBError& error, lldb::offset_t offset) long double SBData::GetLongDouble (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); long double value = 0; if (!m_opaque_sp.get()) { @@ -219,7 +219,7 @@ SBData::GetLongDouble (lldb::SBError& error, lldb::offset_t offset) lldb::addr_t SBData::GetAddress (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::addr_t value = 0; if (!m_opaque_sp.get()) { @@ -241,7 +241,7 @@ SBData::GetAddress (lldb::SBError& error, lldb::offset_t offset) uint8_t SBData::GetUnsignedInt8 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint8_t value = 0; if (!m_opaque_sp.get()) { @@ -263,7 +263,7 @@ SBData::GetUnsignedInt8 (lldb::SBError& error, lldb::offset_t offset) uint16_t SBData::GetUnsignedInt16 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint16_t value = 0; if (!m_opaque_sp.get()) { @@ -285,7 +285,7 @@ SBData::GetUnsignedInt16 (lldb::SBError& error, lldb::offset_t offset) uint32_t SBData::GetUnsignedInt32 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t value = 0; if (!m_opaque_sp.get()) { @@ -307,7 +307,7 @@ SBData::GetUnsignedInt32 (lldb::SBError& error, lldb::offset_t offset) uint64_t SBData::GetUnsignedInt64 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint64_t value = 0; if (!m_opaque_sp.get()) { @@ -329,7 +329,7 @@ SBData::GetUnsignedInt64 (lldb::SBError& error, lldb::offset_t offset) int8_t SBData::GetSignedInt8 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); int8_t value = 0; if (!m_opaque_sp.get()) { @@ -351,7 +351,7 @@ SBData::GetSignedInt8 (lldb::SBError& error, lldb::offset_t offset) int16_t SBData::GetSignedInt16 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); int16_t value = 0; if (!m_opaque_sp.get()) { @@ -373,7 +373,7 @@ SBData::GetSignedInt16 (lldb::SBError& error, lldb::offset_t offset) int32_t SBData::GetSignedInt32 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); int32_t value = 0; if (!m_opaque_sp.get()) { @@ -395,7 +395,7 @@ SBData::GetSignedInt32 (lldb::SBError& error, lldb::offset_t offset) int64_t SBData::GetSignedInt64 (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); int64_t value = 0; if (!m_opaque_sp.get()) { @@ -417,7 +417,7 @@ SBData::GetSignedInt64 (lldb::SBError& error, lldb::offset_t offset) const char* SBData::GetString (lldb::SBError& error, lldb::offset_t offset) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char* value = 0; if (!m_opaque_sp.get()) { @@ -465,7 +465,7 @@ SBData::ReadRawData (lldb::SBError& error, void *buf, size_t size) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); void* ok = NULL; if (!m_opaque_sp.get()) { @@ -491,7 +491,7 @@ SBData::SetData (lldb::SBError& error, lldb::ByteOrder endian, uint8_t addr_size) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!m_opaque_sp.get()) m_opaque_sp.reset(new DataExtractor(buf, size, endian, addr_size)); else @@ -504,7 +504,7 @@ SBData::SetData (lldb::SBError& error, bool SBData::Append (const SBData& rhs) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool value = false; if (m_opaque_sp.get() && rhs.m_opaque_sp.get()) value = m_opaque_sp.get()->Append(*rhs.m_opaque_sp); @@ -613,7 +613,7 @@ SBData::CreateDataFromDoubleArray (lldb::ByteOrder endian, uint32_t addr_byte_si bool SBData::SetDataFromCString (const char* data) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!data) { @@ -642,7 +642,7 @@ SBData::SetDataFromCString (const char* data) bool SBData::SetDataFromUInt64Array (uint64_t* array, size_t array_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!array || array_len == 0) { @@ -671,7 +671,7 @@ SBData::SetDataFromUInt64Array (uint64_t* array, size_t array_len) bool SBData::SetDataFromUInt32Array (uint32_t* array, size_t array_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!array || array_len == 0) { @@ -700,7 +700,7 @@ SBData::SetDataFromUInt32Array (uint32_t* array, size_t array_len) bool SBData::SetDataFromSInt64Array (int64_t* array, size_t array_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!array || array_len == 0) { @@ -729,7 +729,7 @@ SBData::SetDataFromSInt64Array (int64_t* array, size_t array_len) bool SBData::SetDataFromSInt32Array (int32_t* array, size_t array_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!array || array_len == 0) { @@ -758,7 +758,7 @@ SBData::SetDataFromSInt32Array (int32_t* array, size_t array_len) bool SBData::SetDataFromDoubleArray (double* array, size_t array_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (!array || array_len == 0) { diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 4cee580e31b..bcd9e8fa343 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -50,7 +50,7 @@ using namespace lldb_private; void SBDebugger::Initialize () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger::Initialize ()"); @@ -69,7 +69,7 @@ SBDebugger::Terminate () void SBDebugger::Clear () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::Clear ()", m_opaque_sp.get()); @@ -96,7 +96,7 @@ SBDebugger SBDebugger::Create(bool source_init_files, lldb::LogOutputCallback callback, void *baton) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBDebugger debugger; debugger.reset(Debugger::CreateInstance(callback, baton)); @@ -127,7 +127,7 @@ SBDebugger::Create(bool source_init_files, lldb::LogOutputCallback callback, voi void SBDebugger::Destroy (SBDebugger &debugger) { - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { @@ -149,7 +149,7 @@ SBDebugger::MemoryPressureDetected () // non-mandatory. We have seen deadlocks with this function when called // so we need to safeguard against this until we can determine what is // causing the deadlocks. - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const bool mandatory = false; if (log) @@ -231,7 +231,7 @@ SBDebugger::SkipAppInitFiles (bool b) void SBDebugger::SetInputFileHandle (FILE *fh, bool transfer_ownership) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::SetInputFileHandle (fh=%p, transfer_ownership=%i)", m_opaque_sp.get(), @@ -244,7 +244,7 @@ SBDebugger::SetInputFileHandle (FILE *fh, bool transfer_ownership) void SBDebugger::SetOutputFileHandle (FILE *fh, bool transfer_ownership) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) @@ -258,7 +258,7 @@ SBDebugger::SetOutputFileHandle (FILE *fh, bool transfer_ownership) void SBDebugger::SetErrorFileHandle (FILE *fh, bool transfer_ownership) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) @@ -310,7 +310,7 @@ SBDebugger::RestoreInputTerminalState() SBCommandInterpreter SBDebugger::GetCommandInterpreter () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBCommandInterpreter sb_interpreter; if (m_opaque_sp) @@ -364,7 +364,7 @@ SBDebugger::HandleCommand (const char *command) SBListener SBDebugger::GetListener () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBListener sb_listener; if (m_opaque_sp) @@ -492,7 +492,7 @@ SBDebugger::StateAsCString (StateType state) bool SBDebugger::StateIsRunningState (StateType state) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const bool result = lldb_private::StateIsRunningState (state); if (log) @@ -505,7 +505,7 @@ SBDebugger::StateIsRunningState (StateType state) bool SBDebugger::StateIsStoppedState (StateType state) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const bool result = lldb_private::StateIsStoppedState (state, false); if (log) @@ -545,7 +545,7 @@ SBDebugger::CreateTarget (const char *filename, sb_error.SetErrorString("invalid target"); } - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBDebugger(%p)::CreateTarget (filename=\"%s\", triple=%s, platform_name=%s, add_dependent_modules=%u, error=%s) => SBTarget(%p)", @@ -579,7 +579,7 @@ SBDebugger::CreateTargetWithFileAndTargetTriple (const char *filename, sb_target.SetSP (target_sp); } - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBDebugger(%p)::CreateTargetWithFileAndTargetTriple (filename=\"%s\", triple=%s) => SBTarget(%p)", @@ -592,7 +592,7 @@ SBDebugger::CreateTargetWithFileAndTargetTriple (const char *filename, SBTarget SBDebugger::CreateTargetWithFileAndArch (const char *filename, const char *arch_cstr) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBTarget sb_target; TargetSP target_sp; @@ -649,7 +649,7 @@ SBDebugger::CreateTarget (const char *filename) sb_target.SetSP (target_sp); } } - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBDebugger(%p)::CreateTarget (filename=\"%s\") => SBTarget(%p)", @@ -676,7 +676,7 @@ SBDebugger::DeleteTarget (lldb::SBTarget &target) } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBDebugger(%p)::DeleteTarget (SBTarget(%p)) => %i", m_opaque_sp.get(), target.m_opaque_sp.get(), result); @@ -763,7 +763,7 @@ SBDebugger::GetNumTargets () SBTarget SBDebugger::GetSelectedTarget () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBTarget sb_target; TargetSP target_sp; @@ -788,7 +788,7 @@ SBDebugger::GetSelectedTarget () void SBDebugger::SetSelectedTarget (SBTarget &sb_target) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); TargetSP target_sp (sb_target.GetSP()); if (m_opaque_sp) @@ -813,7 +813,7 @@ SBDebugger::DispatchInput (void* baton, const void *data, size_t data_len) void SBDebugger::DispatchInput (const void *data, size_t data_len) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::DispatchInput (data=\"%.*s\", size_t=%" PRIu64 ")", @@ -843,7 +843,7 @@ SBDebugger::DispatchInputEndOfFile () bool SBDebugger::InputReaderIsTopReader (const lldb::SBInputReader &reader) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::InputReaderIsTopReader (SBInputReader(%p))", m_opaque_sp.get(), &reader); @@ -861,7 +861,7 @@ SBDebugger::InputReaderIsTopReader (const lldb::SBInputReader &reader) void SBDebugger::PushInputReader (SBInputReader &reader) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::PushInputReader (SBInputReader(%p))", m_opaque_sp.get(), &reader); @@ -880,7 +880,7 @@ SBDebugger::PushInputReader (SBInputReader &reader) void SBDebugger::NotifyTopInputReader (InputReaderAction notification) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::NotifyTopInputReader (%d)", m_opaque_sp.get(), notification); @@ -1004,7 +1004,7 @@ SBDebugger::SetTerminalWidth (uint32_t term_width) const char * SBDebugger::GetPrompt() const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBDebugger(%p)::GetPrompt () => \"%s\"", m_opaque_sp.get(), diff --git a/lldb/source/API/SBDeclaration.cpp b/lldb/source/API/SBDeclaration.cpp index 2bba12d65d5..fc90156e75a 100644 --- a/lldb/source/API/SBDeclaration.cpp +++ b/lldb/source/API/SBDeclaration.cpp @@ -73,7 +73,7 @@ SBDeclaration::IsValid () const SBFileSpec SBDeclaration::GetFileSpec () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec sb_file_spec; if (m_opaque_ap.get() && m_opaque_ap->GetFile()) @@ -93,7 +93,7 @@ SBDeclaration::GetFileSpec () const uint32_t SBDeclaration::GetLine () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t line = 0; if (m_opaque_ap.get()) diff --git a/lldb/source/API/SBError.cpp b/lldb/source/API/SBError.cpp index d4827175761..bd6b54300f6 100644 --- a/lldb/source/API/SBError.cpp +++ b/lldb/source/API/SBError.cpp @@ -70,7 +70,7 @@ SBError::Clear () bool SBError::Fail () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_value = false; if (m_opaque_ap.get()) @@ -85,7 +85,7 @@ SBError::Fail () const bool SBError::Success () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_value = true; if (m_opaque_ap.get()) ret_value = m_opaque_ap->Success(); @@ -99,7 +99,7 @@ SBError::Success () const uint32_t SBError::GetError () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t err = 0; if (m_opaque_ap.get()) @@ -115,7 +115,7 @@ SBError::GetError () const ErrorType SBError::GetType () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ErrorType err_type = eErrorTypeInvalid; if (m_opaque_ap.get()) err_type = m_opaque_ap->GetType(); diff --git a/lldb/source/API/SBEvent.cpp b/lldb/source/API/SBEvent.cpp index 9a2857dbfe9..d5d4a84bc1f 100644 --- a/lldb/source/API/SBEvent.cpp +++ b/lldb/source/API/SBEvent.cpp @@ -81,7 +81,7 @@ SBEvent::GetDataFlavor () uint32_t SBEvent::GetType () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const Event *lldb_event = get(); uint32_t event_type = 0; @@ -139,7 +139,7 @@ SBEvent::BroadcasterMatchesRef (const SBBroadcaster &broadcaster) success = lldb_event->BroadcasterIs (broadcaster.get()); // For logging, this gets a little chatty so only enable this when verbose logging is on - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API | LIBLLDB_LOG_VERBOSE)); if (log) log->Printf ("SBEvent(%p)::BroadcasterMatchesRef (SBBroadcaster(%p): %s) => %i", get(), @@ -203,7 +203,7 @@ SBEvent::IsValid() const const char * SBEvent::GetCStringFromEvent (const SBEvent &event) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBEvent(%p)::GetCStringFromEvent () => \"%s\"", diff --git a/lldb/source/API/SBFileSpec.cpp b/lldb/source/API/SBFileSpec.cpp index cabf0905481..cedff0386e8 100644 --- a/lldb/source/API/SBFileSpec.cpp +++ b/lldb/source/API/SBFileSpec.cpp @@ -28,7 +28,7 @@ SBFileSpec::SBFileSpec () : SBFileSpec::SBFileSpec (const SBFileSpec &rhs) : m_opaque_ap() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (rhs.m_opaque_ap.get()) m_opaque_ap.reset (new FileSpec (rhs.get())); @@ -51,7 +51,7 @@ SBFileSpec::SBFileSpec (const char *path) : SBFileSpec::SBFileSpec (const char *path, bool resolve) : m_opaque_ap(new FileSpec (path, resolve)) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBFileSpec::SBFileSpec (path=\"%s\", resolve=%i) => SBFileSpec(%p)", path, @@ -82,7 +82,7 @@ SBFileSpec::IsValid() const bool SBFileSpec::Exists () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool result = false; if (m_opaque_ap.get()) @@ -115,7 +115,7 @@ SBFileSpec::GetFilename() const if (m_opaque_ap.get()) s = m_opaque_ap->GetFilename().AsCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (s) @@ -133,7 +133,7 @@ SBFileSpec::GetDirectory() const const char *s = NULL; if (m_opaque_ap.get()) s = m_opaque_ap->GetDirectory().AsCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (s) @@ -147,7 +147,7 @@ SBFileSpec::GetDirectory() const uint32_t SBFileSpec::GetPath (char *dst_path, size_t dst_len) const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t result = 0; if (m_opaque_ap.get()) diff --git a/lldb/source/API/SBFileSpecList.cpp b/lldb/source/API/SBFileSpecList.cpp index 5f65bf51ef1..3ebf3cc80a2 100644 --- a/lldb/source/API/SBFileSpecList.cpp +++ b/lldb/source/API/SBFileSpecList.cpp @@ -30,7 +30,7 @@ SBFileSpecList::SBFileSpecList () : SBFileSpecList::SBFileSpecList (const SBFileSpecList &rhs) : m_opaque_ap() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (rhs.m_opaque_ap.get()) m_opaque_ap.reset (new FileSpecList (*(rhs.get()))); diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp index 880bab88c23..4895ab8f22f 100644 --- a/lldb/source/API/SBFrame.cpp +++ b/lldb/source/API/SBFrame.cpp @@ -57,7 +57,7 @@ SBFrame::SBFrame () : SBFrame::SBFrame (const StackFrameSP &lldb_object_sp) : m_opaque_sp (new ExecutionContextRef (lldb_object_sp)) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { @@ -109,7 +109,7 @@ SBFrame::IsValid() const SBSymbolContext SBFrame::GetSymbolContext (uint32_t resolve_scope) const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBSymbolContext sb_sym_ctx; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -150,7 +150,7 @@ SBFrame::GetSymbolContext (uint32_t resolve_scope) const SBModule SBFrame::GetModule () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBModule sb_module; ModuleSP module_sp; Mutex::Locker api_locker; @@ -193,7 +193,7 @@ SBFrame::GetModule () const SBCompileUnit SBFrame::GetCompileUnit () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBCompileUnit sb_comp_unit; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -233,7 +233,7 @@ SBFrame::GetCompileUnit () const SBFunction SBFrame::GetFunction () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFunction sb_function; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -273,7 +273,7 @@ SBFrame::GetFunction () const SBSymbol SBFrame::GetSymbol () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBSymbol sb_symbol; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -312,7 +312,7 @@ SBFrame::GetSymbol () const SBBlock SBFrame::GetBlock () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBlock sb_block; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -357,7 +357,7 @@ SBFrame::GetFrameBlock () const StackFrame *frame = NULL; Target *target = exe_ctx.GetTargetPtr(); - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Process *process = exe_ctx.GetProcessPtr(); if (target && process) { @@ -390,7 +390,7 @@ SBFrame::GetFrameBlock () const SBLineEntry SBFrame::GetLineEntry () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBLineEntry sb_line_entry; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -436,7 +436,7 @@ SBFrame::GetFrameID () const if (frame) frame_idx = frame->GetFrameIndex (); - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBFrame(%p)::GetFrameID () => %u", frame, frame_idx); @@ -446,7 +446,7 @@ SBFrame::GetFrameID () const addr_t SBFrame::GetPC () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); addr_t addr = LLDB_INVALID_ADDRESS; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -486,7 +486,7 @@ SBFrame::GetPC () const bool SBFrame::SetPC (addr_t new_pc) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_val = false; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -527,7 +527,7 @@ SBFrame::SetPC (addr_t new_pc) addr_t SBFrame::GetSP () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); addr_t addr = LLDB_INVALID_ADDRESS; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -567,7 +567,7 @@ SBFrame::GetSP () const addr_t SBFrame::GetFP () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); addr_t addr = LLDB_INVALID_ADDRESS; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -607,7 +607,7 @@ SBFrame::GetFP () const SBAddress SBFrame::GetPCAddress () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBAddress sb_addr; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -668,7 +668,7 @@ SBFrame::GetValueForVariablePath (const char *var_path, DynamicValueType use_dyn { SBValue sb_value; Mutex::Locker api_locker; - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (var_path == NULL || var_path[0] == '\0') { if (log) @@ -732,7 +732,7 @@ SBFrame::FindVariable (const char *name) SBValue SBFrame::FindVariable (const char *name, lldb::DynamicValueType use_dynamic) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); VariableSP var_sp; SBValue sb_value; @@ -820,7 +820,7 @@ SBFrame::FindValue (const char *name, ValueType value_type) SBValue SBFrame::FindValue (const char *name, ValueType value_type, lldb::DynamicValueType use_dynamic) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBValue sb_value; if (name == NULL || name[0] == '\0') @@ -987,7 +987,7 @@ SBFrame::operator != (const SBFrame &rhs) const SBThread SBFrame::GetThread () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ExecutionContext exe_ctx(m_opaque_sp.get()); ThreadSP thread_sp (exe_ctx.GetThreadSP()); @@ -1009,7 +1009,7 @@ SBFrame::GetThread () const const char * SBFrame::Disassemble () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *disassembly = NULL; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -1072,7 +1072,7 @@ SBFrame::GetVariables (bool arguments, bool in_scope_only, lldb::DynamicValueType use_dynamic) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBValueList value_list; Mutex::Locker api_locker; @@ -1168,7 +1168,7 @@ SBFrame::GetVariables (bool arguments, SBValueList SBFrame::GetRegisters () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBValueList value_list; Mutex::Locker api_locker; @@ -1217,7 +1217,7 @@ SBFrame::GetRegisters () bool SBFrame::GetDescription (SBStream &description) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Stream &strm = description.ref(); Mutex::Locker api_locker; @@ -1294,9 +1294,9 @@ SBFrame::EvaluateExpression (const char *expr, lldb::DynamicValueType fetch_dyna lldb::SBValue SBFrame::EvaluateExpression (const char *expr, const SBExpressionOptions &options) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - LogSP expr_log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *expr_log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionResults exe_results = eExecutionSetupError; SBValue expr_result; @@ -1376,7 +1376,7 @@ SBFrame::EvaluateExpression (const char *expr, const SBExpressionOptions &option bool SBFrame::IsInlined() { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ExecutionContext exe_ctx(m_opaque_sp.get()); StackFrame *frame = NULL; Target *target = exe_ctx.GetTargetPtr(); @@ -1413,7 +1413,7 @@ SBFrame::IsInlined() const char * SBFrame::GetFunctionName() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *name = NULL; ExecutionContext exe_ctx(m_opaque_sp.get()); StackFrame *frame = NULL; diff --git a/lldb/source/API/SBFunction.cpp b/lldb/source/API/SBFunction.cpp index 3617c0e5a4c..914d2d77f3e 100644 --- a/lldb/source/API/SBFunction.cpp +++ b/lldb/source/API/SBFunction.cpp @@ -62,7 +62,7 @@ SBFunction::GetName() const if (m_opaque_ptr) cstr = m_opaque_ptr->GetMangled().GetName().AsCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (cstr) @@ -79,7 +79,7 @@ SBFunction::GetMangledName () const const char *cstr = NULL; if (m_opaque_ptr) cstr = m_opaque_ptr->GetMangled().GetMangledName().AsCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (cstr) diff --git a/lldb/source/API/SBHostOS.cpp b/lldb/source/API/SBHostOS.cpp index e088c29d4aa..a8f7db90a15 100644 --- a/lldb/source/API/SBHostOS.cpp +++ b/lldb/source/API/SBHostOS.cpp @@ -47,7 +47,7 @@ SBHostOS::ThreadCreate SBError *error_ptr ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBHostOS::ThreadCreate (name=\"%s\", thread_function=%p, thread_arg=%p, error_ptr=%p)", name, diff --git a/lldb/source/API/SBInputReader.cpp b/lldb/source/API/SBInputReader.cpp index 2fe375023f1..82b75c869f0 100644 --- a/lldb/source/API/SBInputReader.cpp +++ b/lldb/source/API/SBInputReader.cpp @@ -33,7 +33,7 @@ SBInputReader::SBInputReader () : SBInputReader::SBInputReader (const lldb::InputReaderSP &reader_sp) : m_opaque_sp (reader_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBInputReader::SBInputReader (reader_sp=%p) => SBInputReader(%p)", reader_sp.get(), @@ -43,7 +43,7 @@ SBInputReader::SBInputReader (const lldb::InputReaderSP &reader_sp) : SBInputReader::SBInputReader (const SBInputReader &rhs) : m_opaque_sp (rhs.m_opaque_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf("SBInputReader::SBInputReader (rhs.sp=%p) => SBInputReader(%p)", @@ -84,7 +84,7 @@ SBInputReader::Initialize bool echo ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf("SBInputReader(%p)::Initialize (SBDebugger(%p), callback_function=%p, callback_baton=%p, " @@ -194,7 +194,7 @@ SBInputReader::SetIsDone (bool value) bool SBInputReader::IsActive () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_value = false; if (m_opaque_sp) diff --git a/lldb/source/API/SBLineEntry.cpp b/lldb/source/API/SBLineEntry.cpp index 2d4e599c098..0864a2e006c 100644 --- a/lldb/source/API/SBLineEntry.cpp +++ b/lldb/source/API/SBLineEntry.cpp @@ -71,7 +71,7 @@ SBLineEntry::GetStartAddress () const if (m_opaque_ap.get()) sb_address.SetAddress(&m_opaque_ap->range.GetBaseAddress()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { StreamString sstr; @@ -94,7 +94,7 @@ SBLineEntry::GetEndAddress () const sb_address.SetAddress(&m_opaque_ap->range.GetBaseAddress()); sb_address.OffsetAddress(m_opaque_ap->range.GetByteSize()); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { StreamString sstr; @@ -117,7 +117,7 @@ SBLineEntry::IsValid () const SBFileSpec SBLineEntry::GetFileSpec () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec sb_file_spec; if (m_opaque_ap.get() && m_opaque_ap->file) @@ -137,7 +137,7 @@ SBLineEntry::GetFileSpec () const uint32_t SBLineEntry::GetLine () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t line = 0; if (m_opaque_ap.get()) diff --git a/lldb/source/API/SBListener.cpp b/lldb/source/API/SBListener.cpp index 5bbc0480b28..cc36955cf8b 100644 --- a/lldb/source/API/SBListener.cpp +++ b/lldb/source/API/SBListener.cpp @@ -38,7 +38,7 @@ SBListener::SBListener (const char *name) : { m_opaque_ptr = m_opaque_sp.get(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBListener::SBListener (name=\"%s\") => SBListener(%p)", @@ -131,7 +131,7 @@ SBListener::StopListeningForEventClass (SBDebugger &debugger, uint32_t SBListener::StartListeningForEvents (const SBBroadcaster& broadcaster, uint32_t event_mask) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t acquired_event_mask = 0; if (m_opaque_ptr && broadcaster.IsValid()) @@ -190,7 +190,7 @@ SBListener::StopListeningForEvents (const SBBroadcaster& broadcaster, uint32_t e bool SBListener::WaitForEvent (uint32_t timeout_secs, SBEvent &event) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (timeout_secs == UINT32_MAX) diff --git a/lldb/source/API/SBModule.cpp b/lldb/source/API/SBModule.cpp index 461950f29e9..e673a0aa4ed 100644 --- a/lldb/source/API/SBModule.cpp +++ b/lldb/source/API/SBModule.cpp @@ -88,7 +88,7 @@ SBModule::Clear() SBFileSpec SBModule::GetFileSpec () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec file_spec; ModuleSP module_sp (GetSP ()); @@ -107,7 +107,7 @@ SBModule::GetFileSpec () const lldb::SBFileSpec SBModule::GetPlatformFileSpec () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFileSpec file_spec; ModuleSP module_sp (GetSP ()); @@ -128,7 +128,7 @@ bool SBModule::SetPlatformFileSpec (const lldb::SBFileSpec &platform_file) { bool result = false; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ModuleSP module_sp (GetSP ()); if (module_sp) @@ -155,7 +155,7 @@ SBModule::SetPlatformFileSpec (const lldb::SBFileSpec &platform_file) const uint8_t * SBModule::GetUUIDBytes () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const uint8_t *uuid_bytes = NULL; ModuleSP module_sp (GetSP ()); @@ -180,7 +180,7 @@ SBModule::GetUUIDBytes () const const char * SBModule::GetUUIDString () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); static char uuid_string[80]; const char * uuid_c_string = NULL; diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp index dde41aafef6..ba45ce567d1 100644 --- a/lldb/source/API/SBProcess.cpp +++ b/lldb/source/API/SBProcess.cpp @@ -143,7 +143,7 @@ SBProcess::RemoteLaunch (char const **argv, bool stop_at_entry, lldb::SBError& error) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBProcess(%p)::RemoteLaunch (argv=%p, envp=%p, stdin=%s, stdout=%s, stderr=%s, working-dir=%s, launch_flags=0x%x, stop_at_entry=%i, &error (%p))...", m_opaque_wp.lock().get(), @@ -222,7 +222,7 @@ SBProcess::RemoteAttachToProcessWithID (lldb::pid_t pid, lldb::SBError& error) error.SetErrorString ("unable to attach pid"); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { SBStream sstr; error.GetDescription (sstr); @@ -236,7 +236,7 @@ SBProcess::RemoteAttachToProcessWithID (lldb::pid_t pid, lldb::SBError& error) uint32_t SBProcess::GetNumThreads () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t num_threads = 0; ProcessSP process_sp(GetSP()); @@ -258,7 +258,7 @@ SBProcess::GetNumThreads () SBThread SBProcess::GetSelectedThread () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBThread sb_thread; ThreadSP thread_sp; @@ -281,7 +281,7 @@ SBProcess::GetSelectedThread () const SBThread SBProcess::CreateOSPluginThread (lldb::tid_t tid, lldb::addr_t context) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBThread sb_thread; ThreadSP thread_sp; @@ -302,7 +302,7 @@ SBProcess::CreateOSPluginThread (lldb::tid_t tid, lldb::addr_t context) SBTarget SBProcess::GetTarget() const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBTarget sb_target; TargetSP target_sp; @@ -323,7 +323,7 @@ SBProcess::GetTarget() const size_t SBProcess::PutSTDIN (const char *src, size_t src_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); size_t ret_val = 0; ProcessSP process_sp(GetSP()); @@ -354,7 +354,7 @@ SBProcess::GetSTDOUT (char *dst, size_t dst_len) const bytes_read = process_sp->GetSTDOUT (dst, dst_len, error); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetSTDOUT (dst=\"%.*s\", dst_len=%" PRIu64 ") => %" PRIu64, process_sp.get(), @@ -377,7 +377,7 @@ SBProcess::GetSTDERR (char *dst, size_t dst_len) const bytes_read = process_sp->GetSTDERR (dst, dst_len, error); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetSTDERR (dst=\"%.*s\", dst_len=%" PRIu64 ") => %" PRIu64, process_sp.get(), @@ -400,7 +400,7 @@ SBProcess::GetAsyncProfileData(char *dst, size_t dst_len) const bytes_read = process_sp->GetAsyncProfileData (dst, dst_len, error); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetProfileData (dst=\"%.*s\", dst_len=%" PRIu64 ") => %" PRIu64, process_sp.get(), @@ -467,7 +467,7 @@ SBProcess::SetSelectedThread (const SBThread &thread) bool SBProcess::SetSelectedThreadByID (lldb::tid_t tid) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_val = false; ProcessSP process_sp(GetSP()); @@ -487,7 +487,7 @@ SBProcess::SetSelectedThreadByID (lldb::tid_t tid) bool SBProcess::SetSelectedThreadByIndexID (uint32_t index_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_val = false; ProcessSP process_sp(GetSP()); @@ -507,7 +507,7 @@ SBProcess::SetSelectedThreadByIndexID (uint32_t index_id) SBThread SBProcess::GetThreadAtIndex (size_t index) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBThread sb_thread; ThreadSP thread_sp; @@ -557,7 +557,7 @@ SBProcess::GetState () ret_val = process_sp->GetState(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetState () => %s", process_sp.get(), @@ -577,7 +577,7 @@ SBProcess::GetExitStatus () Mutex::Locker api_locker (process_sp->GetTarget().GetAPIMutex()); exit_status = process_sp->GetExitStatus (); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetExitStatus () => %i (0x%8.8x)", process_sp.get(), exit_status, exit_status); @@ -595,7 +595,7 @@ SBProcess::GetExitDescription () Mutex::Locker api_locker (process_sp->GetTarget().GetAPIMutex()); exit_desc = process_sp->GetExitDescription (); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetExitDescription () => %s", process_sp.get(), exit_desc); @@ -610,7 +610,7 @@ SBProcess::GetProcessID () if (process_sp) ret_val = process_sp->GetID(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetProcessID () => %" PRIu64, process_sp.get(), ret_val); @@ -624,7 +624,7 @@ SBProcess::GetUniqueID() ProcessSP process_sp(GetSP()); if (process_sp) ret_val = process_sp->GetUniqueID(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetUniqueID () => %" PRIu32, process_sp.get(), ret_val); return ret_val; @@ -638,7 +638,7 @@ SBProcess::GetByteOrder () const if (process_sp) byteOrder = process_sp->GetTarget().GetArchitecture().GetByteOrder(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetByteOrder () => %d", process_sp.get(), byteOrder); @@ -653,7 +653,7 @@ SBProcess::GetAddressByteSize () const if (process_sp) size = process_sp->GetTarget().GetArchitecture().GetAddressByteSize(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::GetAddressByteSize () => %d", process_sp.get(), size); @@ -663,7 +663,7 @@ SBProcess::GetAddressByteSize () const SBError SBProcess::Continue () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBError sb_error; ProcessSP process_sp(GetSP()); @@ -714,7 +714,7 @@ SBProcess::Destroy () else sb_error.SetErrorString ("SBProcess is invalid"); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { SBStream sstr; @@ -742,7 +742,7 @@ SBProcess::Stop () else sb_error.SetErrorString ("SBProcess is invalid"); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { SBStream sstr; @@ -769,7 +769,7 @@ SBProcess::Kill () else sb_error.SetErrorString ("SBProcess is invalid"); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { SBStream sstr; @@ -811,7 +811,7 @@ SBProcess::Signal (int signo) } else sb_error.SetErrorString ("SBProcess is invalid"); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { SBStream sstr; @@ -850,7 +850,7 @@ SBProcess::GetThreadByID (tid_t tid) sb_thread.SetThread (thread_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBProcess(%p)::GetThreadByID (tid=0x%4.4" PRIx64 ") => SBThread (%p)", @@ -877,7 +877,7 @@ SBProcess::GetThreadByIndexID (uint32_t index_id) sb_thread.SetThread (thread_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBProcess(%p)::GetThreadByID (tid=0x%x) => SBThread (%p)", @@ -892,7 +892,7 @@ SBProcess::GetThreadByIndexID (uint32_t index_id) StateType SBProcess::GetStateFromEvent (const SBEvent &event) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); StateType ret_val = Process::ProcessEventData::GetStateFromEvent (event.get()); @@ -937,7 +937,7 @@ SBProcess::EventIsProcessEvent (const SBEvent &event) SBBroadcaster SBProcess::GetBroadcaster () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ProcessSP process_sp(GetSP()); @@ -959,7 +959,7 @@ SBProcess::GetBroadcasterClass () size_t SBProcess::ReadMemory (addr_t addr, void *dst, size_t dst_len, SBError &sb_error) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); size_t bytes_read = 0; @@ -1027,7 +1027,7 @@ SBProcess::ReadCStringFromMemory (addr_t addr, void *buf, size_t size, lldb::SBE } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::ReadCStringFromMemory() => error: process is running", process_sp.get()); sb_error.SetErrorString("process is running"); @@ -1055,7 +1055,7 @@ SBProcess::ReadUnsignedFromMemory (addr_t addr, uint32_t byte_size, lldb::SBErro } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::ReadUnsignedFromMemory() => error: process is running", process_sp.get()); sb_error.SetErrorString("process is running"); @@ -1083,7 +1083,7 @@ SBProcess::ReadPointerFromMemory (addr_t addr, lldb::SBError &sb_error) } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::ReadPointerFromMemory() => error: process is running", process_sp.get()); sb_error.SetErrorString("process is running"); @@ -1101,7 +1101,7 @@ SBProcess::WriteMemory (addr_t addr, const void *src, size_t src_len, SBError &s { size_t bytes_written = 0; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ProcessSP process_sp(GetSP()); @@ -1179,7 +1179,7 @@ SBProcess::GetDescription (SBStream &description) uint32_t SBProcess::GetNumSupportedHardwareWatchpoints (lldb::SBError &sb_error) const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t num = 0; ProcessSP process_sp(GetSP()); @@ -1212,7 +1212,7 @@ SBProcess::LoadImage (lldb::SBFileSpec &sb_image_spec, lldb::SBError &sb_error) } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::LoadImage() => error: process is running", process_sp.get()); sb_error.SetErrorString("process is running"); @@ -1236,7 +1236,7 @@ SBProcess::UnloadImage (uint32_t image_token) } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBProcess(%p)::UnloadImage() => error: process is running", process_sp.get()); sb_error.SetErrorString("process is running"); diff --git a/lldb/source/API/SBSymbol.cpp b/lldb/source/API/SBSymbol.cpp index 580ef93c4be..dd057e81a55 100644 --- a/lldb/source/API/SBSymbol.cpp +++ b/lldb/source/API/SBSymbol.cpp @@ -65,7 +65,7 @@ SBSymbol::GetName() const if (m_opaque_ptr) name = m_opaque_ptr->GetMangled().GetName().AsCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBSymbol(%p)::GetName () => \"%s\"", m_opaque_ptr, name ? name : ""); return name; @@ -77,7 +77,7 @@ SBSymbol::GetMangledName () const const char *name = NULL; if (m_opaque_ptr) name = m_opaque_ptr->GetMangled().GetMangledName().AsCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBSymbol(%p)::GetMangledName () => \"%s\"", m_opaque_ptr, name ? name : ""); diff --git a/lldb/source/API/SBSymbolContext.cpp b/lldb/source/API/SBSymbolContext.cpp index 780364cc787..479b0f75bfe 100644 --- a/lldb/source/API/SBSymbolContext.cpp +++ b/lldb/source/API/SBSymbolContext.cpp @@ -87,7 +87,7 @@ SBSymbolContext::IsValid () const SBModule SBSymbolContext::GetModule () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBModule sb_module; ModuleSP module_sp; @@ -117,7 +117,7 @@ SBSymbolContext::GetCompileUnit () SBFunction SBSymbolContext::GetFunction () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Function *function = NULL; @@ -142,7 +142,7 @@ SBSymbolContext::GetBlock () SBLineEntry SBSymbolContext::GetLineEntry () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBLineEntry sb_line_entry; if (m_opaque_ap.get()) @@ -160,7 +160,7 @@ SBSymbolContext::GetLineEntry () SBSymbol SBSymbolContext::GetSymbol () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Symbol *symbol = NULL; diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp index 383f7012bca..0af402d33ab 100644 --- a/lldb/source/API/SBTarget.cpp +++ b/lldb/source/API/SBTarget.cpp @@ -536,7 +536,7 @@ SBTarget::GetProcess () sb_process.SetSP (process_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBTarget(%p)::GetProcess () => SBProcess(%p)", @@ -618,7 +618,7 @@ SBTarget::Launch lldb::SBError& error ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBProcess sb_process; ProcessSP process_sp; @@ -743,7 +743,7 @@ SBTarget::Launch SBProcess SBTarget::Launch (SBLaunchInfo &sb_launch_info, SBError& error) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBProcess sb_process; ProcessSP process_sp; @@ -843,7 +843,7 @@ SBTarget::Launch (SBLaunchInfo &sb_launch_info, SBError& error) lldb::SBProcess SBTarget::Attach (SBAttachInfo &sb_attach_info, SBError& error) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBProcess sb_process; ProcessSP process_sp; @@ -959,7 +959,7 @@ SBTarget::AttachToProcessWithID SBError& error // An error explaining what went wrong if attach fails ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBProcess sb_process; ProcessSP process_sp; @@ -1057,7 +1057,7 @@ SBTarget::AttachToProcessWithName SBError& error // An error explaining what went wrong if attach fails ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBProcess sb_process; ProcessSP process_sp; @@ -1146,7 +1146,7 @@ SBTarget::ConnectRemote SBError& error ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBProcess sb_process; ProcessSP process_sp; @@ -1202,7 +1202,7 @@ SBTarget::GetExecutable () exe_file_spec.SetFileSpec (exe_module->GetFileSpec()); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { log->Printf ("SBTarget(%p)::GetExecutable () => SBFileSpec(%p)", @@ -1278,7 +1278,7 @@ SBTarget::BreakpointCreateByLocation (const char *file, uint32_t line) SBBreakpoint SBTarget::BreakpointCreateByLocation (const SBFileSpec &sb_file_spec, uint32_t line) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1312,7 +1312,7 @@ SBTarget::BreakpointCreateByLocation (const SBFileSpec &sb_file_spec, uint32_t l SBBreakpoint SBTarget::BreakpointCreateByName (const char *symbol_name, const char *module_name) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1358,7 +1358,7 @@ SBTarget::BreakpointCreateByName (const char *symbol_name, const SBFileSpecList &module_list, const SBFileSpecList &comp_unit_list) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1391,7 +1391,7 @@ SBTarget::BreakpointCreateByNames (const char *symbol_names[], const SBFileSpecList &module_list, const SBFileSpecList &comp_unit_list) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1434,7 +1434,7 @@ SBTarget::BreakpointCreateByNames (const char *symbol_names[], SBBreakpoint SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, const char *module_name) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1472,7 +1472,7 @@ SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, const SBFileSpecList &module_list, const SBFileSpecList &comp_unit_list) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1498,7 +1498,7 @@ SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, SBBreakpoint SBTarget::BreakpointCreateByAddress (addr_t address) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1519,7 +1519,7 @@ SBTarget::BreakpointCreateByAddress (addr_t address) lldb::SBBreakpoint SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, const lldb::SBFileSpec &source_file, const char *module_name) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1559,7 +1559,7 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, const SBFileSpecList &module_list, const lldb::SBFileSpecList &source_file_list) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1584,7 +1584,7 @@ SBTarget::BreakpointCreateForException (lldb::LanguageType language, bool catch_bp, bool throw_bp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_bp; TargetSP target_sp(GetSP()); @@ -1635,7 +1635,7 @@ SBTarget::GetBreakpointAtIndex (uint32_t idx) const bool SBTarget::BreakpointDelete (break_id_t bp_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool result = false; TargetSP target_sp(GetSP()); @@ -1656,7 +1656,7 @@ SBTarget::BreakpointDelete (break_id_t bp_id) SBBreakpoint SBTarget::FindBreakpointByID (break_id_t bp_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBBreakpoint sb_breakpoint; TargetSP target_sp(GetSP()); @@ -1742,7 +1742,7 @@ SBTarget::GetWatchpointAtIndex (uint32_t idx) const bool SBTarget::DeleteWatchpoint (watch_id_t wp_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool result = false; TargetSP target_sp(GetSP()); @@ -1765,7 +1765,7 @@ SBTarget::DeleteWatchpoint (watch_id_t wp_id) SBWatchpoint SBTarget::FindWatchpointByID (lldb::watch_id_t wp_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBWatchpoint sb_watchpoint; lldb::WatchpointSP watchpoint_sp; @@ -1791,7 +1791,7 @@ SBTarget::FindWatchpointByID (lldb::watch_id_t wp_id) lldb::SBWatchpoint SBTarget::WatchAddress (lldb::addr_t addr, size_t size, bool read, bool write, SBError &error) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBWatchpoint sb_watchpoint; lldb::WatchpointSP watchpoint_sp; @@ -1919,7 +1919,7 @@ SBTarget::AddModule (lldb::SBModule &module) uint32_t SBTarget::GetNumModules () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t num = 0; TargetSP target_sp(GetSP()); @@ -1938,7 +1938,7 @@ SBTarget::GetNumModules () const void SBTarget::Clear () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBTarget(%p)::Clear ()", m_opaque_sp.get()); @@ -1999,7 +1999,7 @@ SBTarget::GetAddressByteSize() SBModule SBTarget::GetModuleAtIndex (uint32_t idx) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBModule sb_module; ModuleSP module_sp; @@ -2033,7 +2033,7 @@ SBTarget::RemoveModule (lldb::SBModule module) SBBroadcaster SBTarget::GetBroadcaster () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); TargetSP target_sp(GetSP()); SBBroadcaster broadcaster(target_sp.get(), false); @@ -2540,8 +2540,8 @@ SBTarget::FindSymbols (const char *name, lldb::SymbolType symbol_type) lldb::SBValue SBTarget::EvaluateExpression (const char *expr, const SBExpressionOptions &options) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - LogSP expr_log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log * expr_log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); SBValue expr_result; ExecutionResults exe_results = eExecutionSetupError; ValueObjectSP expr_value_sp; diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp index e347e3d3925..5ea21012709 100644 --- a/lldb/source/API/SBThread.cpp +++ b/lldb/source/API/SBThread.cpp @@ -102,7 +102,7 @@ SBThread::Clear () StopReason SBThread::GetStopReason() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); StopReason reason = eStopReasonInvalid; Mutex::Locker api_locker; @@ -179,7 +179,7 @@ SBThread::GetStopReasonDataCount () } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBThread(%p)::GetStopReasonDataCount() => error: process is running", exe_ctx.GetThreadPtr()); } @@ -253,7 +253,7 @@ SBThread::GetStopReasonDataAtIndex (uint32_t idx) } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBThread(%p)::GetStopReasonDataAtIndex() => error: process is running", exe_ctx.GetThreadPtr()); } @@ -264,7 +264,7 @@ SBThread::GetStopReasonDataAtIndex (uint32_t idx) size_t SBThread::GetStopDescription (char *dst, size_t dst_len) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -380,7 +380,7 @@ SBThread::GetStopDescription (char *dst, size_t dst_len) } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBThread(%p)::GetStopDescription() => error: process is running", exe_ctx.GetThreadPtr()); } @@ -393,7 +393,7 @@ SBThread::GetStopDescription (char *dst, size_t dst_len) SBValue SBThread::GetStopReturnValue () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ValueObjectSP return_valobj_sp; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -453,7 +453,7 @@ SBThread::GetIndexID () const const char * SBThread::GetName () const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *name = NULL; Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -485,7 +485,7 @@ SBThread::GetQueueName () const Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (exe_ctx.HasThreadScope()) { Process::StopLocker stop_locker; @@ -551,7 +551,7 @@ SBThread::ResumeNewPlan (ExecutionContext &exe_ctx, ThreadPlan *new_plan) void SBThread::StepOver (lldb::RunMode stop_other_threads) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -600,7 +600,7 @@ SBThread::StepInto (lldb::RunMode stop_other_threads) void SBThread::StepInto (const char *target_name, lldb::RunMode stop_other_threads) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -645,7 +645,7 @@ SBThread::StepInto (const char *target_name, lldb::RunMode stop_other_threads) void SBThread::StepOut () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -677,7 +677,7 @@ SBThread::StepOut () void SBThread::StepOutOfFrame (lldb::SBFrame &sb_frame) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -712,7 +712,7 @@ SBThread::StepOutOfFrame (lldb::SBFrame &sb_frame) void SBThread::StepInstruction (bool step_over) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -735,7 +735,7 @@ SBThread::StepInstruction (bool step_over) void SBThread::RunToAddress (lldb::addr_t addr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -766,7 +766,7 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame, uint32_t line) { SBError sb_error; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); char path[PATH_MAX]; Mutex::Locker api_locker; @@ -913,7 +913,7 @@ SBThread::ReturnFromFrame (SBFrame &frame, SBValue &return_value) { SBError sb_error; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); Mutex::Locker api_locker; ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker); @@ -935,7 +935,7 @@ SBThread::ReturnFromFrame (SBFrame &frame, SBValue &return_value) bool SBThread::Suspend() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ExecutionContext exe_ctx (m_opaque_sp.get()); bool result = false; if (exe_ctx.HasThreadScope()) @@ -960,7 +960,7 @@ SBThread::Suspend() bool SBThread::Resume () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); ExecutionContext exe_ctx (m_opaque_sp.get()); bool result = false; if (exe_ctx.HasThreadScope()) @@ -1002,7 +1002,7 @@ SBThread::GetProcess () sb_process.SetSP (exe_ctx.GetProcessSP()); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { SBStream frame_desc_strm; @@ -1017,7 +1017,7 @@ SBThread::GetProcess () uint32_t SBThread::GetNumFrames () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); uint32_t num_frames = 0; Mutex::Locker api_locker; @@ -1046,7 +1046,7 @@ SBThread::GetNumFrames () SBFrame SBThread::GetFrameAtIndex (uint32_t idx) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFrame sb_frame; StackFrameSP frame_sp; @@ -1082,7 +1082,7 @@ SBThread::GetFrameAtIndex (uint32_t idx) lldb::SBFrame SBThread::GetSelectedFrame () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFrame sb_frame; StackFrameSP frame_sp; @@ -1118,7 +1118,7 @@ SBThread::GetSelectedFrame () lldb::SBFrame SBThread::SetSelectedFrame (uint32_t idx) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBFrame sb_frame; StackFrameSP frame_sp; diff --git a/lldb/source/API/SBType.cpp b/lldb/source/API/SBType.cpp index 4914daeeccb..d5027d90c52 100644 --- a/lldb/source/API/SBType.cpp +++ b/lldb/source/API/SBType.cpp @@ -534,7 +534,7 @@ SBTypeList::~SBTypeList() bool SBType::IsPointerType (void *opaque_type) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool ret_value = ClangASTContext::IsPointerType (opaque_type); diff --git a/lldb/source/API/SBValue.cpp b/lldb/source/API/SBValue.cpp index 7dde95476fa..9ac0af00255 100644 --- a/lldb/source/API/SBValue.cpp +++ b/lldb/source/API/SBValue.cpp @@ -220,7 +220,7 @@ SBValue::GetName() if (value_sp) name = value_sp->GetName().GetCString(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (name) @@ -235,7 +235,7 @@ SBValue::GetName() const char * SBValue::GetTypeName () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *name = NULL; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -275,7 +275,7 @@ SBValue::GetTypeName () size_t SBValue::GetByteSize () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); size_t result = 0; lldb::ValueObjectSP value_sp(GetSP()); @@ -324,7 +324,7 @@ SBValue::IsInScope () } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::IsInScope () => %i", value_sp.get(), result); @@ -334,7 +334,7 @@ SBValue::IsInScope () const char * SBValue::GetValue () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *cstr = NULL; lldb::ValueObjectSP value_sp(GetSP()); @@ -375,7 +375,7 @@ SBValue::GetValueType () lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) result = value_sp->GetValueType(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { switch (result) @@ -396,7 +396,7 @@ SBValue::GetValueType () const char * SBValue::GetObjectDescription () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *cstr = NULL; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -431,7 +431,7 @@ SBValue::GetObjectDescription () SBType SBValue::GetType() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); SBType sb_type; lldb::ValueObjectSP value_sp(GetSP()); TypeImplSP type_sp; @@ -468,7 +468,7 @@ SBValue::GetType() bool SBValue::GetValueDidChange () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool result = false; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -500,7 +500,7 @@ SBValue::GetValueDidChange () const char * SBValue::GetSummary () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *cstr = NULL; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -536,7 +536,7 @@ SBValue::GetSummary () const char * SBValue::GetLocation () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); const char *cstr = NULL; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -581,7 +581,7 @@ SBValue::SetValueFromCString (const char *value_str, lldb::SBError& error) { bool success = false; lldb::ValueObjectSP value_sp(GetSP()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (value_sp) { ProcessSP process_sp(value_sp->GetProcessSP()); @@ -618,7 +618,7 @@ SBValue::GetTypeFormat () Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetTypeFormat() => error: process is running", value_sp.get()); } @@ -652,7 +652,7 @@ SBValue::GetTypeSummary () Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetTypeSummary() => error: process is running", value_sp.get()); } @@ -686,7 +686,7 @@ SBValue::GetTypeFilter () Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetTypeFilter() => error: process is running", value_sp.get()); } @@ -724,7 +724,7 @@ SBValue::GetTypeSynthetic () Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetTypeSynthetic() => error: process is running", value_sp.get()); } @@ -763,7 +763,7 @@ SBValue::CreateChildAtOffset (const char *name, uint32_t offset, SBType type) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::CreateChildAtOffset() => error: process is running", value_sp.get()); } @@ -784,7 +784,7 @@ SBValue::CreateChildAtOffset (const char *name, uint32_t offset, SBType type) } } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (new_value_sp) @@ -820,7 +820,7 @@ SBValue::CreateValueFromExpression (const char *name, const char* expression) lldb::SBValue SBValue::CreateValueFromExpression (const char *name, const char *expression, SBExpressionOptions &options) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::SBValue sb_value; lldb::ValueObjectSP value_sp(GetSP()); lldb::ValueObjectSP new_value_sp; @@ -905,7 +905,7 @@ SBValue::CreateValueFromAddress(const char* name, lldb::addr_t address, SBType s sb_value.SetSP(new_value_sp); } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (new_value_sp) @@ -935,7 +935,7 @@ SBValue::CreateValueFromData (const char* name, SBData data, SBType type) new_value_sp->SetAddressTypeOfChildren(eAddressTypeLoad); sb_value.SetSP(new_value_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (new_value_sp) @@ -965,7 +965,7 @@ SBValue SBValue::GetChildAtIndex (uint32_t idx, lldb::DynamicValueType use_dynamic, bool can_create_synthetic) { lldb::ValueObjectSP child_sp; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -1024,7 +1024,7 @@ SBValue::GetIndexOfChildWithName (const char *name) idx = value_sp->GetIndexOfChildWithName (ConstString(name)); } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (idx == UINT32_MAX) @@ -1059,7 +1059,7 @@ SBValue::GetChildMemberWithName (const char *name, lldb::DynamicValueType use_dy lldb::ValueObjectSP child_sp; const ConstString str_name (name); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -1192,7 +1192,7 @@ SBValue::IsSynthetic () lldb::SBValue SBValue::GetValueForExpressionPath(const char* expr_path) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::ValueObjectSP child_sp; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -1236,7 +1236,7 @@ SBValue::GetValueAsSigned(SBError& error, int64_t fail_value) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetValueAsSigned() => error: process is running", value_sp.get()); error.SetErrorString("process is running"); @@ -1272,7 +1272,7 @@ SBValue::GetValueAsUnsigned(SBError& error, uint64_t fail_value) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetValueAsUnsigned() => error: process is running", value_sp.get()); error.SetErrorString("process is running"); @@ -1307,7 +1307,7 @@ SBValue::GetValueAsSigned(int64_t fail_value) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetValueAsSigned() => error: process is running", value_sp.get()); } @@ -1336,7 +1336,7 @@ SBValue::GetValueAsUnsigned(uint64_t fail_value) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetValueAsUnsigned() => error: process is running", value_sp.get()); } @@ -1358,7 +1358,7 @@ SBValue::GetValueAsUnsigned(uint64_t fail_value) bool SBValue::MightHaveChildren () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); bool has_children = false; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -1374,7 +1374,7 @@ SBValue::GetNumChildren () { uint32_t num_children = 0; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) { @@ -1420,7 +1420,7 @@ SBValue::Dereference () sb_value = value_sp->Dereference (error); } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::Dereference () => SBValue(%p)", value_sp.get(), value_sp.get()); @@ -1444,7 +1444,7 @@ SBValue::TypeIsPointerType () } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::TypeIsPointerType () => %i", value_sp.get(), is_ptr_type); @@ -1480,7 +1480,7 @@ SBValue::GetTarget() target_sp = value_sp->GetTargetSP(); sb_target.SetSP (target_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (target_sp.get() == NULL) @@ -1503,7 +1503,7 @@ SBValue::GetProcess() if (process_sp) sb_process.SetSP (process_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (process_sp.get() == NULL) @@ -1525,7 +1525,7 @@ SBValue::GetThread() thread_sp = value_sp->GetThreadSP(); sb_thread.SetThread(thread_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (thread_sp.get() == NULL) @@ -1547,7 +1547,7 @@ SBValue::GetFrame() frame_sp = value_sp->GetFrameSP(); sb_frame.SetFrameSP (frame_sp); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { if (frame_sp.get() == NULL) @@ -1670,7 +1670,7 @@ SBValue::GetDescription (SBStream &description) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetDescription() => error: process is running", value_sp.get()); } @@ -1717,7 +1717,7 @@ SBValue::AddressOf() sb_value.SetSP(value_sp->AddressOf (error),GetPreferDynamicValue(), GetPreferSyntheticValue()); } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::AddressOf () => SBValue(%p)", value_sp.get(), value_sp.get()); @@ -1754,7 +1754,7 @@ SBValue::GetLoadAddress() value = LLDB_INVALID_ADDRESS; } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetLoadAddress () => (%" PRIu64 ")", value_sp.get(), value); @@ -1791,7 +1791,7 @@ SBValue::GetAddress() } } } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::GetAddress () => (%s,%" PRIu64 ")", value_sp.get(), (addr.GetSection() ? addr.GetSection()->GetName().GetCString() : "NULL"), @@ -1803,7 +1803,7 @@ lldb::SBData SBValue::GetPointeeData (uint32_t item_idx, uint32_t item_count) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::SBData sb_data; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -1841,7 +1841,7 @@ SBValue::GetPointeeData (uint32_t item_idx, lldb::SBData SBValue::GetData () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); lldb::SBData sb_data; lldb::ValueObjectSP value_sp(GetSP()); if (value_sp) @@ -1903,7 +1903,7 @@ SBValue::Watch (bool resolve_location, bool read, bool write, SBError &error) Process::StopLocker stop_locker; if (process_sp && !stop_locker.TryLock(&process_sp->GetRunLock())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBValue(%p)::Watch() => error: process is running", value_sp.get()); return sb_watchpoint; diff --git a/lldb/source/API/SBValueList.cpp b/lldb/source/API/SBValueList.cpp index 9b0073d9bd3..d36e448af5f 100644 --- a/lldb/source/API/SBValueList.cpp +++ b/lldb/source/API/SBValueList.cpp @@ -94,7 +94,7 @@ SBValueList::SBValueList () : SBValueList::SBValueList (const SBValueList &rhs) : m_opaque_ap () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (rhs.IsValid()) m_opaque_ap.reset (new ValueListImpl (*rhs)); @@ -110,7 +110,7 @@ SBValueList::SBValueList (const SBValueList &rhs) : SBValueList::SBValueList (const ValueListImpl *lldb_object_ptr) : m_opaque_ap () { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (lldb_object_ptr) m_opaque_ap.reset (new ValueListImpl (*lldb_object_ptr)); @@ -207,7 +207,7 @@ SBValueList::Append (const lldb::SBValueList& value_list) SBValue SBValueList::GetValueAtIndex (uint32_t idx) const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); //if (log) // log->Printf ("SBValueList::GetValueAtIndex (uint32_t idx) idx = %d", idx); @@ -230,7 +230,7 @@ SBValueList::GetValueAtIndex (uint32_t idx) const uint32_t SBValueList::GetSize () const { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); //if (log) // log->Printf ("SBValueList::GetSize ()"); diff --git a/lldb/source/API/SBWatchpoint.cpp b/lldb/source/API/SBWatchpoint.cpp index eb50fa8118e..194695c31d5 100644 --- a/lldb/source/API/SBWatchpoint.cpp +++ b/lldb/source/API/SBWatchpoint.cpp @@ -35,7 +35,7 @@ SBWatchpoint::SBWatchpoint () : SBWatchpoint::SBWatchpoint (const lldb::WatchpointSP &wp_sp) : m_opaque_sp (wp_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) { @@ -67,7 +67,7 @@ SBWatchpoint::~SBWatchpoint () watch_id_t SBWatchpoint::GetID () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); watch_id_t watch_id = LLDB_INVALID_WATCH_ID; lldb::WatchpointSP watchpoint_sp(GetSP()); @@ -183,7 +183,7 @@ SBWatchpoint::GetHitCount () count = watchpoint_sp->GetHitCount(); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); if (log) log->Printf ("SBWatchpoint(%p)::GetHitCount () => %u", watchpoint_sp.get(), count); |
