diff options
155 files changed, 1008 insertions, 1001 deletions
diff --git a/lldb/include/lldb/Core/Log.h b/lldb/include/lldb/Core/Log.h index 32b0287e954..dafb5b5aa51 100644 --- a/lldb/include/lldb/Core/Log.h +++ b/lldb/include/lldb/Core/Log.h @@ -61,10 +61,10 @@ public: // Callback definitions for abstracted plug-in log access. //------------------------------------------------------------------ typedef void (*DisableCallback) (const char **categories, Stream *feedback_strm); - typedef lldb::LogSP (*EnableCallback) (lldb::StreamSP &log_stream_sp, - uint32_t log_options, - const char **categories, - Stream *feedback_strm); + typedef Log * (*EnableCallback) (lldb::StreamSP &log_stream_sp, + uint32_t log_options, + const char **categories, + Stream *feedback_strm); typedef void (*ListCategoriesCallback) (Stream *strm); struct Callbacks @@ -119,7 +119,7 @@ public: //------------------------------------------------------------------ Log (); - Log (lldb::StreamSP &stream_sp); + Log (const lldb::StreamSP &stream_sp); ~Log (); @@ -177,6 +177,12 @@ public: bool GetDebug() const; + void + SetStream (const lldb::StreamSP &stream_sp) + { + m_stream_sp = stream_sp; + } + protected: //------------------------------------------------------------------ // Member variables @@ -218,7 +224,7 @@ public: ListCategories (Stream *strm) = 0; protected: - lldb::LogSP m_log_sp; + std::unique_ptr<Log> m_log_ap; private: DISALLOW_COPY_AND_ASSIGN (LogChannel); diff --git a/lldb/include/lldb/Core/ModuleList.h b/lldb/include/lldb/Core/ModuleList.h index 16e2375abdc..46b2468441e 100644 --- a/lldb/include/lldb/Core/ModuleList.h +++ b/lldb/include/lldb/Core/ModuleList.h @@ -156,8 +156,7 @@ public: Dump (Stream *s) const; void - LogUUIDAndPaths (lldb::LogSP &log_sp, - const char *prefix_cstr); + LogUUIDAndPaths (Log *log, const char *prefix_cstr); Mutex & GetMutex () const diff --git a/lldb/include/lldb/DataFormatters/FormatNavigator.h b/lldb/include/lldb/DataFormatters/FormatNavigator.h index 7f56417aedf..64aa2dd4281 100644 --- a/lldb/include/lldb/DataFormatters/FormatNavigator.h +++ b/lldb/include/lldb/DataFormatters/FormatNavigator.h @@ -34,8 +34,6 @@ #include "lldb/Target/StackFrame.h" #include "lldb/Target/TargetList.h" -using lldb::LogSP; - namespace lldb_private { // this file (and its. cpp) contain the low-level implementation of LLDB Data Visualization @@ -471,7 +469,7 @@ protected: MapValueType& entry, uint32_t& reason) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); // for bitfields, append size to the typename so one can custom format them StreamString sstring; sstring.Printf("%s:%d",typeName.AsCString(),valobj.GetBitfieldBitSize()); @@ -496,7 +494,7 @@ protected: bool Get_ObjC (ValueObject& valobj, MapValueType& entry) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); lldb::ProcessSP process_sp = valobj.GetProcessSP(); ObjCLanguageRuntime* runtime = process_sp->GetObjCLanguageRuntime(); if (runtime == NULL) @@ -533,7 +531,7 @@ protected: lldb::DynamicValueType use_dynamic, uint32_t& reason) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); if (type.isNull()) { @@ -649,7 +647,7 @@ protected: lldb::DynamicValueType use_dynamic, uint32_t& reason) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); if (Get_Impl (valobj,type,entry,use_dynamic,reason)) return true; diff --git a/lldb/include/lldb/Expression/ASTDumper.h b/lldb/include/lldb/Expression/ASTDumper.h index d9f930f6834..5118eb38b42 100644 --- a/lldb/include/lldb/Expression/ASTDumper.h +++ b/lldb/include/lldb/Expression/ASTDumper.h @@ -31,7 +31,7 @@ public: const char *GetCString(); void ToSTDERR(); - void ToLog(lldb::LogSP &log, const char *prefix); + void ToLog(Log *log, const char *prefix); void ToStream(lldb::StreamSP &stream); private: std::string m_dump; diff --git a/lldb/include/lldb/Expression/IRExecutionUnit.h b/lldb/include/lldb/Expression/IRExecutionUnit.h index a75d4c413d5..f5db6295db9 100644 --- a/lldb/include/lldb/Expression/IRExecutionUnit.h +++ b/lldb/include/lldb/Expression/IRExecutionUnit.h @@ -451,7 +451,7 @@ private: { } - void dump (lldb::LogSP log); + void dump (Log *log); }; //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Symbol/ClangASTImporter.h b/lldb/include/lldb/Symbol/ClangASTImporter.h index 280b5c4b87e..88dac6e7b1d 100644 --- a/lldb/include/lldb/Symbol/ClangASTImporter.h +++ b/lldb/include/lldb/Symbol/ClangASTImporter.h @@ -24,7 +24,7 @@ namespace lldb_private { class ClangASTMetrics { public: - static void DumpCounters (lldb::LogSP log); + static void DumpCounters (Log *log); static void ClearLocalCounters () { local_counters = { 0, 0, 0, 0, 0, 0 }; @@ -80,7 +80,7 @@ private: static Counters global_counters; static Counters local_counters; - static void DumpCounters (lldb::LogSP log, Counters &counters); + static void DumpCounters (Log *log, Counters &counters); }; class ClangASTImporter diff --git a/lldb/include/lldb/lldb-forward.h b/lldb/include/lldb/lldb-forward.h index 2227fdb4c21..872d2e9214a 100644 --- a/lldb/include/lldb/lldb-forward.h +++ b/lldb/include/lldb/lldb-forward.h @@ -306,7 +306,6 @@ namespace lldb { typedef STD_SHARED_PTR(lldb_private::LanguageRuntime) LanguageRuntimeSP; typedef STD_SHARED_PTR(lldb_private::LineTable) LineTableSP; typedef STD_SHARED_PTR(lldb_private::Listener) ListenerSP; - typedef STD_SHARED_PTR(lldb_private::Log) LogSP; typedef STD_SHARED_PTR(lldb_private::LogChannel) LogChannelSP; typedef STD_SHARED_PTR(lldb_private::Module) ModuleSP; typedef STD_WEAK_PTR( lldb_private::Module) ModuleWP; @@ -324,7 +323,6 @@ namespace lldb { typedef STD_SHARED_PTR(lldb_private::OptionValueFormat) OptionValueFormatSP; typedef STD_SHARED_PTR(lldb_private::OptionValuePathMappings) OptionValuePathMappingsSP; typedef STD_SHARED_PTR(lldb_private::OptionValueProperties) OptionValuePropertiesSP; -// typedef STD_WEAK_PTR( lldb_private::OptionValueProperties) OptionValuePropertiesWP; typedef STD_SHARED_PTR(lldb_private::OptionValueRegex) OptionValueRegexSP; typedef STD_SHARED_PTR(lldb_private::OptionValueSInt64) OptionValueSInt64SP; typedef STD_SHARED_PTR(lldb_private::OptionValueString) OptionValueStringSP; diff --git a/lldb/include/lldb/lldb-private-log.h b/lldb/include/lldb/lldb-private-log.h index 6f7e63ab23c..22fba7af277 100644 --- a/lldb/include/lldb/lldb-private-log.h +++ b/lldb/include/lldb/lldb-private-log.h @@ -63,10 +63,10 @@ LogIfAllCategoriesSet (uint32_t mask, const char *format, ...); void LogIfAnyCategoriesSet (uint32_t mask, const char *format, ...); -lldb::LogSP +Log * GetLogIfAllCategoriesSet (uint32_t mask); -lldb::LogSP +Log * GetLogIfAnyCategoriesSet (uint32_t mask); uint32_t @@ -78,7 +78,7 @@ IsLogVerbose (); void DisableLog (const char **categories, Stream *feedback_strm); -lldb::LogSP +Log * EnableLog (lldb::StreamSP &log_stream_sp, uint32_t log_options, const char **categories, Stream *feedback_strm); void diff --git a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/LLDB.xcscheme b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/LLDB.xcscheme index 2df57c39481..478ffa141a7 100644 --- a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/LLDB.xcscheme +++ b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/LLDB.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0450" + LastUpgradeVersion = "0500" version = "1.8"> <BuildAction parallelizeBuildables = "NO" @@ -56,7 +56,6 @@ buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" - enableOpenGLFrameCaptureMode = "0" allowLocationSimulation = "YES"> <BuildableProductRunnable> <BuildableReference diff --git a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/darwin-debug.xcscheme b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/darwin-debug.xcscheme index 0e098836993..39261847283 100644 --- a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/darwin-debug.xcscheme +++ b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/darwin-debug.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0450" + LastUpgradeVersion = "0500" version = "1.8"> <BuildAction parallelizeBuildables = "NO" @@ -47,7 +47,6 @@ buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" - enableOpenGLFrameCaptureMode = "0" allowLocationSimulation = "YES"> <BuildableProductRunnable> <BuildableReference diff --git a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherRootXPCService.xcscheme b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherRootXPCService.xcscheme index 78c38b91a96..451aecabf34 100644 --- a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherRootXPCService.xcscheme +++ b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherRootXPCService.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0450" + LastUpgradeVersion = "0500" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -38,7 +38,6 @@ buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" - enableOpenGLFrameCaptureMode = "0" allowLocationSimulation = "YES"> <AdditionalOptions> </AdditionalOptions> diff --git a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherXPCService.xcscheme b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherXPCService.xcscheme index cf81ef2741f..120400ff969 100644 --- a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherXPCService.xcscheme +++ b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/launcherXPCService.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0450" + LastUpgradeVersion = "0500" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -38,7 +38,6 @@ buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" - enableOpenGLFrameCaptureMode = "0" allowLocationSimulation = "YES"> <PathRunnable FilePath = "/Users/moi/Library/Developer/Xcode/DerivedData/Xcode-ezhudafllefyhcfivqaeslnymjsj/Build/Products/Debug/LLDB.framework/XPCServices/com.apple.lldb.launcherXPCService.xpc/Contents/MacOS/com.apple.lldb.launcherXPCService"> diff --git a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme index 101410da85a..34560feaaeb 100644 --- a/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme +++ b/lldb/lldb.xcodeproj/xcshareddata/xcschemes/lldb-tool.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0450" + LastUpgradeVersion = "0500" version = "1.3"> <BuildAction parallelizeBuildables = "NO" 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); diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp index ce7cc9223a3..9bc43814b48 100644 --- a/lldb/source/Breakpoint/Breakpoint.cpp +++ b/lldb/source/Breakpoint/Breakpoint.cpp @@ -393,7 +393,7 @@ Breakpoint::ModulesChanged (ModuleList &module_list, bool load, bool delete_loca if (!break_loc->ResolveBreakpointSite()) { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Warning: could not set breakpoint site for breakpoint location %d of breakpoint %d.\n", break_loc->GetID(), GetID()); diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp index 5a924cfae03..71e8eb7c868 100644 --- a/lldb/source/Breakpoint/BreakpointLocation.cpp +++ b/lldb/source/Breakpoint/BreakpointLocation.cpp @@ -322,7 +322,7 @@ bool BreakpointLocation::ShouldStop (StoppointCallbackContext *context) { bool should_stop = true; - LogSP log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); + Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); IncrementHitCount(); @@ -378,7 +378,7 @@ BreakpointLocation::ResolveBreakpointSite () if (new_id == LLDB_INVALID_BREAK_ID) { - LogSP log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); + Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); if (log) log->Warning ("Tried to add breakpoint site at 0x%" PRIx64 " but it was already present.\n", m_address.GetOpcodeLoadAddress (&m_owner.GetTarget())); diff --git a/lldb/source/Breakpoint/BreakpointResolverAddress.cpp b/lldb/source/Breakpoint/BreakpointResolverAddress.cpp index f8eff8f2702..1bcef93aeda 100644 --- a/lldb/source/Breakpoint/BreakpointResolverAddress.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverAddress.cpp @@ -83,7 +83,7 @@ BreakpointResolverAddress::SearchCallback { StreamString s; bp_loc_sp->GetDescription(&s, lldb::eDescriptionLevelVerbose); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Added location: %s\n", s.GetData()); } diff --git a/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp b/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp index 56859875224..b93705d22a7 100644 --- a/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp @@ -59,7 +59,7 @@ BreakpointResolverFileLine::SearchCallback SymbolContextList sc_list; assert (m_breakpoint != NULL); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); // There is a tricky bit here. You can have two compilation units that #include the same file, and // in one of them the function at m_line_number is used (and so code and a line entry for it is generated) but in the diff --git a/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp b/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp index b0af574f451..6629feeea2e 100644 --- a/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp @@ -55,7 +55,7 @@ BreakpointResolverFileRegex::SearchCallback if (!context.target_sp) return eCallbackReturnContinue; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); CompileUnit *cu = context.comp_unit; FileSpec cu_file_spec = *(static_cast<FileSpec *>(cu)); diff --git a/lldb/source/Breakpoint/BreakpointResolverName.cpp b/lldb/source/Breakpoint/BreakpointResolverName.cpp index b20913ecc45..2848abfa62f 100644 --- a/lldb/source/Breakpoint/BreakpointResolverName.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverName.cpp @@ -47,7 +47,7 @@ BreakpointResolverName::BreakpointResolverName { if (!m_regex.Compile (func_name)) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Warning ("function name regexp: \"%s\" did not compile.", func_name); @@ -163,7 +163,7 @@ BreakpointResolverName::SearchCallback Address break_addr; assert (m_breakpoint != NULL); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (m_class_name) { diff --git a/lldb/source/Core/AddressResolverFileLine.cpp b/lldb/source/Core/AddressResolverFileLine.cpp index 78f156d9556..f7004c8bb08 100644 --- a/lldb/source/Core/AddressResolverFileLine.cpp +++ b/lldb/source/Core/AddressResolverFileLine.cpp @@ -52,7 +52,7 @@ AddressResolverFileLine::SearchCallback uint32_t sc_list_size; CompileUnit *cu = context.comp_unit; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); sc_list_size = cu->ResolveSymbolContext (m_file_spec, m_line_number, m_inlines, false, eSymbolContextEverything, sc_list); diff --git a/lldb/source/Core/AddressResolverName.cpp b/lldb/source/Core/AddressResolverName.cpp index 3e7c373998b..c8b9db896d9 100644 --- a/lldb/source/Core/AddressResolverName.cpp +++ b/lldb/source/Core/AddressResolverName.cpp @@ -37,7 +37,7 @@ AddressResolverName::AddressResolverName { if (!m_regex.Compile (m_func_name.AsCString())) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Warning ("function name regexp: \"%s\" did not compile.", m_func_name.AsCString()); @@ -98,7 +98,7 @@ AddressResolverName::SearchCallback SymbolContext sc; Address func_addr; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (m_class_name) { diff --git a/lldb/source/Core/Broadcaster.cpp b/lldb/source/Core/Broadcaster.cpp index 584bf00d32f..5af7497c8da 100644 --- a/lldb/source/Core/Broadcaster.cpp +++ b/lldb/source/Core/Broadcaster.cpp @@ -29,7 +29,7 @@ Broadcaster::Broadcaster (BroadcasterManager *manager, const char *name) : m_hijacking_masks(), m_manager (manager) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Broadcaster::Broadcaster(\"%s\")", this, m_broadcaster_name.AsCString()); @@ -37,7 +37,7 @@ Broadcaster::Broadcaster (BroadcasterManager *manager, const char *name) : Broadcaster::~Broadcaster() { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Broadcaster::~Broadcaster(\"%s\")", this, m_broadcaster_name.AsCString()); @@ -236,7 +236,7 @@ Broadcaster::PrivateBroadcastEvent (EventSP &event_sp, bool unique) hijacking_listener = NULL; } - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS)); if (log) { StreamString event_description; @@ -294,7 +294,7 @@ Broadcaster::HijackBroadcaster (Listener *listener, uint32_t event_mask) { Mutex::Locker event_types_locker(m_listeners_mutex); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS)); if (log) { log->Printf ("%p Broadcaster(\"%s\")::HijackBroadcaster (listener(\"%s\")=%p)", @@ -313,7 +313,7 @@ Broadcaster::RestoreBroadcaster () { Mutex::Locker event_types_locker(m_listeners_mutex); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS)); if (log) { Listener *listener = m_hijacking_listeners.back(); diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index b55698880a5..51bf4c39706 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/source/Core/Communication.cpp @@ -338,7 +338,7 @@ Communication::ReadThread (void *p) { Communication *comm = (Communication *)p; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMUNICATION)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMUNICATION)); if (log) log->Printf ("%p Communication::ReadThread () thread starting...", p); @@ -377,10 +377,10 @@ Communication::ReadThread (void *p) case eConnectionStatusError: // Check GetError() for details case eConnectionStatusTimedOut: // Request timed out if (log) - error.LogIfError(log.get(), - "%p Communication::ReadFromConnection () => status = %s", - p, - Communication::ConnectionStatusAsCString (status)); + error.LogIfError (log, + "%p Communication::ReadFromConnection () => status = %s", + p, + Communication::ConnectionStatusAsCString (status)); break; } } diff --git a/lldb/source/Core/ConnectionFileDescriptor.cpp b/lldb/source/Core/ConnectionFileDescriptor.cpp index a511ee20a89..cf8944a8e18 100644 --- a/lldb/source/Core/ConnectionFileDescriptor.cpp +++ b/lldb/source/Core/ConnectionFileDescriptor.cpp @@ -90,7 +90,7 @@ ConnectionFileDescriptor::ConnectionFileDescriptor () : m_mutex (Mutex::eMutexTypeRecursive), m_shutting_down (false) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p ConnectionFileDescriptor::ConnectionFileDescriptor ()", this); } @@ -109,7 +109,7 @@ ConnectionFileDescriptor::ConnectionFileDescriptor (int fd, bool owns_fd) : m_mutex (Mutex::eMutexTypeRecursive), m_shutting_down (false) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p ConnectionFileDescriptor::ConnectionFileDescriptor (fd = %i, owns_fd = %i)", this, fd, owns_fd); OpenCommandPipe (); @@ -118,7 +118,7 @@ ConnectionFileDescriptor::ConnectionFileDescriptor (int fd, bool owns_fd) : ConnectionFileDescriptor::~ConnectionFileDescriptor () { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION | LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p ConnectionFileDescriptor::~ConnectionFileDescriptor ()", this); Disconnect (NULL); @@ -130,7 +130,7 @@ ConnectionFileDescriptor::OpenCommandPipe () { CloseCommandPipe(); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); // Make the command file descriptor here: int filedes[2]; int result = pipe (filedes); @@ -174,7 +174,7 @@ ConnectionStatus ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr) { Mutex::Locker locker (m_mutex); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Connect (url = '%s')", this, s); @@ -295,7 +295,7 @@ ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr) ConnectionStatus ConnectionFileDescriptor::Disconnect (Error *error_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Disconnect ()", this); @@ -370,7 +370,7 @@ ConnectionFileDescriptor::Read (void *dst, ConnectionStatus &status, Error *error_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Read () ::read (fd = %i, dst = %p, dst_len = %" PRIu64 ")...", this, m_fd_recv, dst, (uint64_t)dst_len); @@ -482,7 +482,7 @@ ConnectionFileDescriptor::Read (void *dst, size_t ConnectionFileDescriptor::Write (const void *src, size_t src_len, ConnectionStatus &status, Error *error_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Write (src = %p, src_len = %" PRIu64 ")", this, src, (uint64_t)src_len); @@ -620,7 +620,7 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt // Don't need to take the mutex here separately since we are only called from Read. If we // ever get used more generally we will need to lock here as well. - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf("%p ConnectionFileDescriptor::BytesAvailable (timeout_usec = %u)", this, timeout_usec); struct timeval *tv_ptr; @@ -770,7 +770,7 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt // Don't need to take the mutex here separately since we are only called from Read. If we // ever get used more generally we will need to lock here as well. - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf("%p ConnectionFileDescriptor::BytesAvailable (timeout_usec = %u)", this, timeout_usec); struct timeval *tv_ptr; @@ -927,7 +927,7 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt // Don't need to take the mutex here separately since we are only called from Read. If we // ever get used more generally we will need to lock here as well. - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf("%p ConnectionFileDescriptor::BytesAvailable (timeout_usec = %u)", this, timeout_usec); int timeout_msec = 0; @@ -1068,7 +1068,7 @@ ConnectionFileDescriptor::Close (int& fd, Error *error_ptr) // can get into the close scope below if (fd >= 0) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::Close (fd = %i)", this,fd); @@ -1177,7 +1177,7 @@ ConnectionFileDescriptor::NamedSocketConnect (const char *socket_name, Error *er ConnectionStatus ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::SocketListen (port = %i)", this, listen_port_num); @@ -1240,7 +1240,7 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p ConnectionStatus ConnectionFileDescriptor::ConnectTCP (const char *host_and_port, Error *error_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::ConnectTCP (host/port = %s)", this, host_and_port); Disconnect (NULL); @@ -1314,7 +1314,7 @@ ConnectionFileDescriptor::ConnectTCP (const char *host_and_port, Error *error_pt ConnectionStatus ConnectionFileDescriptor::ConnectUDP (const char *host_and_port, Error *error_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION)); if (log) log->Printf ("%p ConnectionFileDescriptor::ConnectUDP (host/port = %s)", this, host_and_port); Disconnect (NULL); diff --git a/lldb/source/Core/DataBufferMemoryMap.cpp b/lldb/source/Core/DataBufferMemoryMap.cpp index d1131ae865f..f52072bd27a 100644 --- a/lldb/source/Core/DataBufferMemoryMap.cpp +++ b/lldb/source/Core/DataBufferMemoryMap.cpp @@ -83,7 +83,7 @@ DataBufferMemoryMap::Clear() { if (m_mmap_addr != NULL) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP)); if (log) log->Printf("DataBufferMemoryMap::Clear() m_mmap_addr = %p, m_mmap_size = %zu", m_mmap_addr, m_mmap_size); ::munmap((void *)m_mmap_addr, m_mmap_size); @@ -110,7 +110,7 @@ DataBufferMemoryMap::MemoryMapFromFileSpec (const FileSpec* filespec, { if (filespec != NULL) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP)); if (log) { log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(file=\"%s/%s\", offset=0x%" PRIx64 ", length=0x%" PRIx64 ", writeable=%i", @@ -164,7 +164,7 @@ DataBufferMemoryMap::MemoryMapFromFileDescriptor (int fd, Clear(); if (fd >= 0) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP|LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP|LIBLLDB_LOG_VERBOSE)); if (log) { log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(fd=%i, offset=0x%" PRIx64 ", length=0x%" PRIx64 ", writeable=%i, fd_is_file=%i)", diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index 20c55e63c7a..f9d096118b5 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -1117,7 +1117,7 @@ ScanFormatDescriptor (const char* var_name_begin, Format* custom_format, ValueObject::ValueObjectRepresentationStyle* val_obj_display) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); *percent_position = ::strchr(var_name_begin,'%'); if (!*percent_position || *percent_position > var_name_end) { @@ -1184,7 +1184,7 @@ ScanBracketedRange (const char* var_name_begin, int64_t* index_lower, int64_t* index_higher) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); *open_bracket_position = ::strchr(var_name_begin,'['); if (*open_bracket_position && *open_bracket_position < var_name_final) { @@ -1241,7 +1241,7 @@ ExpandIndexedExpression (ValueObject* valobj, StackFrame* frame, bool deref_pointer) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); const char* ptr_deref_format = "[%d]"; std::string ptr_deref_buffer(10,0); ::sprintf(&ptr_deref_buffer[0], ptr_deref_format, index); @@ -1290,7 +1290,7 @@ Debugger::FormatPrompt ValueObject* realvalobj = NULL; // makes it super-easy to parse pointers bool success = true; const char *p; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); for (p = format; *p != '\0'; ++p) { if (realvalobj) diff --git a/lldb/source/Core/Listener.cpp b/lldb/source/Core/Listener.cpp index 79fa9cf373c..4b6a964b8ae 100644 --- a/lldb/source/Core/Listener.cpp +++ b/lldb/source/Core/Listener.cpp @@ -32,14 +32,14 @@ Listener::Listener(const char *name) : m_events_mutex (Mutex::eMutexTypeRecursive), m_cond_wait() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Listener::Listener('%s')", this, m_name.c_str()); } Listener::~Listener() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); Mutex::Locker locker (m_broadcasters_mutex); size_t num_managers = m_broadcaster_managers.size(); @@ -84,7 +84,7 @@ Listener::StartListeningForEvents (Broadcaster* broadcaster, uint32_t event_mask { } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); if (log) log->Printf ("%p Listener::StartListeningForEvents (broadcaster = %p, mask = 0x%8.8x) acquired_mask = 0x%8.8x for %s", this, @@ -113,7 +113,7 @@ Listener::StartListeningForEvents (Broadcaster* broadcaster, uint32_t event_mask uint32_t acquired_mask = broadcaster->AddListener (this, event_mask); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); if (log) log->Printf ("%p Listener::StartListeningForEvents (broadcaster = %p, mask = 0x%8.8x, callback = %p, user_data = %p) acquired_mask = 0x%8.8x for %s", this, broadcaster, event_mask, callback, callback_user_data, acquired_mask, m_name.c_str()); @@ -183,7 +183,7 @@ Listener::BroadcasterManagerWillDestruct (BroadcasterManager *manager) void Listener::AddEvent (EventSP &event_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); if (log) log->Printf ("%p Listener('%s')::AddEvent (event_sp = {%p})", this, m_name.c_str(), event_sp.get()); @@ -270,7 +270,7 @@ Listener::FindNextEventInternal EventSP &event_sp, bool remove) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); Mutex::Locker lock(m_events_mutex); @@ -400,7 +400,7 @@ Listener::WaitForEventsInternal EventSP &event_sp ) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EVENTS)); bool timed_out = false; if (log) diff --git a/lldb/source/Core/Log.cpp b/lldb/source/Core/Log.cpp index 3743631fbb7..881d9892fd7 100644 --- a/lldb/source/Core/Log.cpp +++ b/lldb/source/Core/Log.cpp @@ -41,7 +41,7 @@ Log::Log () : { } -Log::Log (StreamSP &stream_sp) : +Log::Log (const StreamSP &stream_sp) : m_stream_sp(stream_sp), m_options(0), m_mask_bits(0) @@ -517,7 +517,7 @@ LogChannel::FindPlugin (const char *plugin_name) } LogChannel::LogChannel () : - m_log_sp () + m_log_ap () { } diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index 822fbd8f1c6..671d6e4c125 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -152,7 +152,7 @@ Module::Module (const ModuleSpec &module_spec) : GetModuleCollection().push_back(this); } - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT|LIBLLDB_LOG_MODULES)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT|LIBLLDB_LOG_MODULES)); if (log) log->Printf ("%p Module::Module((%s) '%s/%s%s%s%s')", this, @@ -197,7 +197,7 @@ Module::Module(const FileSpec& file_spec, if (object_name) m_object_name = *object_name; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT|LIBLLDB_LOG_MODULES)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT|LIBLLDB_LOG_MODULES)); if (log) log->Printf ("%p Module::Module((%s) '%s/%s%s%s%s')", this, @@ -220,7 +220,7 @@ Module::~Module() assert (pos != end); modules.erase(pos); } - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT|LIBLLDB_LOG_MODULES)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT|LIBLLDB_LOG_MODULES)); if (log) log->Printf ("%p Module::~Module((%s) '%s/%s%s%s%s')", this, diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp index 05dc3e3a786..8e79a455182 100644 --- a/lldb/source/Core/ModuleList.cpp +++ b/lldb/source/Core/ModuleList.cpp @@ -596,9 +596,9 @@ ModuleList::Dump(Stream *s) const } void -ModuleList::LogUUIDAndPaths (LogSP &log_sp, const char *prefix_cstr) +ModuleList::LogUUIDAndPaths (Log *log, const char *prefix_cstr) { - if (log_sp) + if (log) { Mutex::Locker locker(m_modules_mutex); char uuid_cstr[256]; @@ -608,13 +608,13 @@ ModuleList::LogUUIDAndPaths (LogSP &log_sp, const char *prefix_cstr) Module *module = pos->get(); module->GetUUID().GetAsCString (uuid_cstr, sizeof(uuid_cstr)); const FileSpec &module_file_spec = module->GetFileSpec(); - log_sp->Printf ("%s[%u] %s (%s) \"%s/%s\"", - prefix_cstr ? prefix_cstr : "", - (uint32_t)std::distance (begin, pos), - uuid_cstr, - module->GetArchitecture().GetArchitectureName(), - module_file_spec.GetDirectory().GetCString(), - module_file_spec.GetFilename().GetCString()); + log->Printf ("%s[%u] %s (%s) \"%s/%s\"", + prefix_cstr ? prefix_cstr : "", + (uint32_t)std::distance (begin, pos), + uuid_cstr, + module->GetArchitecture().GetArchitectureName(), + module_file_spec.GetDirectory().GetCString(), + module_file_spec.GetFilename().GetCString()); } } } @@ -791,7 +791,7 @@ ModuleList::GetSharedModule if (old_module_sp_ptr && !old_module_sp_ptr->get()) *old_module_sp_ptr = module_sp; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_MODULES)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_MODULES)); if (log) log->Printf("module changed: %p, removing from global module list", module_sp.get()); diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp index 783fa129163..140c4b48b5e 100644 --- a/lldb/source/Core/ValueObject.cpp +++ b/lldb/source/Core/ValueObject.cpp @@ -229,7 +229,7 @@ ValueObject::UpdateValueIfNeeded (bool update_format) bool ValueObject::UpdateFormatsIfNeeded() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); if (log) log->Printf("[%s %p] checking for FormatManager revisions. ValueObject rev: %d - Global rev: %d", GetName().GetCString(), diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp index a90ef0286fb..f82c66602ba 100644 --- a/lldb/source/Core/ValueObjectDynamicValue.cpp +++ b/lldb/source/Core/ValueObjectDynamicValue.cpp @@ -202,7 +202,7 @@ ValueObjectDynamicValue::UpdateValue () Value old_value(m_value); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); bool has_changed_type = false; diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index fa9ce499f37..01f5d7f05cd 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -341,7 +341,7 @@ FormatManager::GetSummaryFormat (ValueObject& valobj, { TypeSummaryImplSP retval; #if USE_CACHE - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); ConstString valobj_type(GetTypeForCache(valobj, use_dynamic)); if (valobj_type) { @@ -376,7 +376,7 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj, { SyntheticChildrenSP retval; #if USE_CACHE - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); ConstString valobj_type(GetTypeForCache(valobj, use_dynamic)); if (valobj_type) { diff --git a/lldb/source/DataFormatters/TypeCategoryMap.cpp b/lldb/source/DataFormatters/TypeCategoryMap.cpp index cd11016d797..9618dba9641 100644 --- a/lldb/source/DataFormatters/TypeCategoryMap.cpp +++ b/lldb/source/DataFormatters/TypeCategoryMap.cpp @@ -185,7 +185,7 @@ TypeCategoryMap::GetSummaryFormat (ValueObject& valobj, uint32_t reason_why; ActiveCategoriesIterator begin, end = m_active_categories.end(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); for (begin = m_active_categories.begin(); begin != end; begin++) { @@ -213,7 +213,7 @@ TypeCategoryMap::GetSyntheticChildren (ValueObject& valobj, ActiveCategoriesIterator begin, end = m_active_categories.end(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES)); for (begin = m_active_categories.begin(); begin != end; begin++) { diff --git a/lldb/source/Expression/ASTDumper.cpp b/lldb/source/Expression/ASTDumper.cpp index a82a892bc79..b5c7b32e4b3 100644 --- a/lldb/source/Expression/ASTDumper.cpp +++ b/lldb/source/Expression/ASTDumper.cpp @@ -89,7 +89,7 @@ void ASTDumper::ToSTDERR() fprintf(stderr, "%s\n", m_dump.c_str()); } -void ASTDumper::ToLog(lldb::LogSP &log, const char *prefix) +void ASTDumper::ToLog(Log *log, const char *prefix) { size_t len = m_dump.length() + 1; diff --git a/lldb/source/Expression/ASTResultSynthesizer.cpp b/lldb/source/Expression/ASTResultSynthesizer.cpp index e33fd76168d..afd6c61a970 100644 --- a/lldb/source/Expression/ASTResultSynthesizer.cpp +++ b/lldb/source/Expression/ASTResultSynthesizer.cpp @@ -60,7 +60,7 @@ ASTResultSynthesizer::Initialize(ASTContext &Context) void ASTResultSynthesizer::TransformTopLevelDecl(Decl* D) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (NamedDecl *named_decl = dyn_cast<NamedDecl>(D)) { @@ -129,7 +129,7 @@ ASTResultSynthesizer::HandleTopLevelDecl(DeclGroupRef D) bool ASTResultSynthesizer::SynthesizeFunctionResult (FunctionDecl *FunDecl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!m_sema) return false; @@ -175,7 +175,7 @@ ASTResultSynthesizer::SynthesizeFunctionResult (FunctionDecl *FunDecl) bool ASTResultSynthesizer::SynthesizeObjCMethodResult (ObjCMethodDecl *MethodDecl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!m_sema) return false; @@ -224,7 +224,7 @@ bool ASTResultSynthesizer::SynthesizeBodyResult (CompoundStmt *Body, DeclContext *DC) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ASTContext &Ctx(*m_ast_context); @@ -452,7 +452,7 @@ ASTResultSynthesizer::MaybeRecordPersistentType(TypeDecl *D) if (name.size() == 0 || name[0] != '$') return; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ConstString name_cs(name.str().c_str()); diff --git a/lldb/source/Expression/ClangASTSource.cpp b/lldb/source/Expression/ClangASTSource.cpp index a508c48d449..eb21980ca35 100644 --- a/lldb/source/Expression/ClangASTSource.cpp +++ b/lldb/source/Expression/ClangASTSource.cpp @@ -169,7 +169,7 @@ ClangASTSource::FindExternalVisibleDeclsByName void ClangASTSource::CompleteType (TagDecl *tag_decl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; @@ -306,7 +306,7 @@ ClangASTSource::CompleteType (TagDecl *tag_decl) void ClangASTSource::CompleteType (clang::ObjCInterfaceDecl *interface_decl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { @@ -370,7 +370,7 @@ ClangASTSource::FindExternalLexicalDecls (const DeclContext *decl_context, { ClangASTMetrics::RegisterLexicalQuery(); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); const Decl *context_decl = dyn_cast<Decl>(decl_context); @@ -487,7 +487,7 @@ ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context) const ConstString name(context.m_decl_name.getAsString().c_str()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; @@ -578,7 +578,7 @@ ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context, { assert (m_ast_context); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); SymbolContextList sc_list; @@ -886,7 +886,7 @@ FindObjCMethodDeclsWithOrigin (unsigned int current_id, if (!copied_method_decl) return false; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { @@ -902,7 +902,7 @@ FindObjCMethodDeclsWithOrigin (unsigned int current_id, void ClangASTSource::FindObjCMethodDecls (NameSearchContext &context) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; @@ -1189,7 +1189,7 @@ FindObjCPropertyAndIvarDeclsWithOrigin (unsigned int current_id, ClangASTImporter *ast_importer, DeclFromUser<const ObjCInterfaceDecl> &origin_iface_decl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (origin_iface_decl.IsInvalid()) return false; @@ -1242,7 +1242,7 @@ FindObjCPropertyAndIvarDeclsWithOrigin (unsigned int current_id, void ClangASTSource::FindObjCPropertyAndIvarDecls (NameSearchContext &context) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; @@ -1440,7 +1440,7 @@ ClangASTSource::layoutRecordType(const RecordDecl *record, static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { @@ -1562,7 +1562,7 @@ ClangASTSource::CompleteNamespaceMap (ClangASTImporter::NamespaceMapSP &namespac static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { @@ -1657,8 +1657,6 @@ ClangASTSource::AddNamespace (NameSearchContext &context, ClangASTImporter::Name if (!namespace_decls) return NULL; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - const ClangNamespaceDecl &namespace_decl = namespace_decls->begin()->second; Decl *copied_decl = m_ast_importer->CopyDecl(m_ast_context, namespace_decl.GetASTContext(), namespace_decl.GetNamespaceDecl()); @@ -1773,7 +1771,7 @@ NameSearchContext::AddFunDecl (void *type) } else { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); log->Printf("Function type wasn't a FunctionProtoType"); } diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp index c6517e5b0e7..5bbe06de3ba 100644 --- a/lldb/source/Expression/ClangExpressionDeclMap.cpp +++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp @@ -113,7 +113,7 @@ ClangExpressionDeclMap::WillParse(ExecutionContext &exe_ctx) void ClangExpressionDeclMap::DidParse() { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) ClangASTMetrics::DumpCounters(log); @@ -216,7 +216,7 @@ ClangExpressionDeclMap::BuildIntegerVariable (const ConstString &name, if (!user_type.GetOpaqueQualType()) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("ClangExpressionDeclMap::BuildIntegerVariable - Couldn't export the type for a constant integer result"); @@ -289,7 +289,7 @@ ClangExpressionDeclMap::BuildCastVariable (const ConstString &name, { assert (m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Target *target = exe_ctx.GetTargetPtr(); @@ -455,7 +455,7 @@ ClangExpressionDeclMap::AddPersistentVariable { assert (m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Target *target = exe_ctx.GetTargetPtr(); if (target == NULL) @@ -533,7 +533,7 @@ ClangExpressionDeclMap::AddValueToStruct assert (m_struct_vars.get()); assert (m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); m_struct_vars->m_struct_laid_out = false; @@ -740,7 +740,7 @@ ClangExpressionDeclMap::GetFunctionAddress { assert (m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Target *target = exe_ctx.GetTargetPtr(); // Back out in all cases where we're not fully initialized @@ -1522,7 +1522,7 @@ ClangExpressionDeclMap::DoMaterialize assert (m_struct_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!m_struct_vars->m_struct_laid_out) { @@ -1682,7 +1682,7 @@ ClangExpressionDeclMap::DoMaterializeOnePersistentVariable Error &err ) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!var_sp) { @@ -1961,7 +1961,7 @@ ClangExpressionDeclMap::DoMaterializeOneVariable Error &err ) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); Process *process = m_parser_vars->m_exe_ctx.GetProcessPtr(); StackFrame *frame = m_parser_vars->m_exe_ctx.GetFramePtr(); @@ -2428,7 +2428,7 @@ ClangExpressionDeclMap::FindVariableInScope bool object_pointer ) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ValueObjectSP valobj; VariableSP var_sp; @@ -2631,7 +2631,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context) const ConstString name(context.m_decl_name.getAsString().c_str()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (GetImportInProgress()) { @@ -2707,7 +2707,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, { assert (m_ast_context); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); SymbolContextList sc_list; @@ -3240,7 +3240,7 @@ ClangExpressionDeclMap::GetVariableValue TypeFromParser *parser_type ) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Type *var_type = var->GetType(); @@ -3369,7 +3369,7 @@ ClangExpressionDeclMap::AddOneVariable (NameSearchContext &context, VariableSP v { assert (m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); TypeFromUser ut; TypeFromParser pt; @@ -3431,7 +3431,7 @@ ClangExpressionDeclMap::AddOneVariable(NameSearchContext &context, ClangExpressionVariableSP &pvar_sp, unsigned int current_id) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); TypeFromUser user_type (pvar_sp->GetTypeFromUser()); @@ -3470,7 +3470,7 @@ ClangExpressionDeclMap::AddOneGenericVariable(NameSearchContext &context, { assert(m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); @@ -3524,7 +3524,7 @@ ClangExpressionDeclMap::AddOneGenericVariable(NameSearchContext &context, bool ClangExpressionDeclMap::ResolveUnknownTypes() { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); ASTContext *scratch_ast_context = target->GetScratchClangASTContext()->getASTContext(); @@ -3588,7 +3588,7 @@ ClangExpressionDeclMap::AddOneRegister (NameSearchContext &context, const RegisterInfo *reg_info, unsigned int current_id) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); void *ast_type = ClangASTContext::GetBuiltinTypeForEncodingAndBitSize(m_ast_context, reg_info->encoding, @@ -3636,7 +3636,7 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, { assert (m_parser_vars.get()); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); NamedDecl *fun_decl = NULL; std::auto_ptr<Value> fun_location(new Value); @@ -3764,7 +3764,7 @@ ClangExpressionDeclMap::CopyClassType(TypeFromUser &ut, if (!copied_type) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("ClangExpressionDeclMap::CopyClassType - Couldn't import the type"); @@ -3820,7 +3820,7 @@ ClangExpressionDeclMap::AddOneType(NameSearchContext &context, if (!copied_type) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("ClangExpressionDeclMap::AddOneType - Couldn't import the type"); diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp index 4f8e3341494..dd6da06e251 100644 --- a/lldb/source/Expression/ClangExpressionParser.cpp +++ b/lldb/source/Expression/ClangExpressionParser.cpp @@ -468,7 +468,7 @@ ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_addr, { func_addr = LLDB_INVALID_ADDRESS; func_end = LLDB_INVALID_ADDRESS; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); std::auto_ptr<llvm::ExecutionEngine> execution_engine_ap; diff --git a/lldb/source/Expression/ClangFunction.cpp b/lldb/source/Expression/ClangFunction.cpp index 95b75574101..f8db5c9c798 100644 --- a/lldb/source/Expression/ClangFunction.cpp +++ b/lldb/source/Expression/ClangFunction.cpp @@ -214,7 +214,7 @@ ClangFunction::CompileFunction (Stream &errors) m_wrapper_function_text.append (args_list_buffer); m_wrapper_function_text.append (");\n}\n"); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf ("Expression: \n\n%s\n\n", m_wrapper_function_text.c_str()); @@ -388,7 +388,7 @@ ClangFunction::InsertFunction (ExecutionContext &exe_ctx, lldb::addr_t &args_add if (!WriteFunctionArguments(exe_ctx, args_addr_ref, errors)) return false; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("Call Address: 0x%" PRIx64 " Struct Address: 0x%" PRIx64 ".\n", m_jit_start_addr, args_addr_ref); @@ -406,7 +406,7 @@ ClangFunction::GetThreadPlanToCallFunction (ExecutionContext &exe_ctx, lldb::addr_t *this_arg, lldb::addr_t *cmd_arg) { - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); if (log) log->Printf("-- [ClangFunction::GetThreadPlanToCallFunction] Creating thread plan to call function --"); @@ -444,7 +444,7 @@ ClangFunction::FetchFunctionResults (ExecutionContext &exe_ctx, lldb::addr_t arg // FIXME: Create our ThreadPlanCallFunction with the return ClangASTType, and then use GetReturnValueObject // to fetch the value. That way we can fetch any values we need. - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); if (log) log->Printf("-- [ClangFunction::FetchFunctionResults] Fetching function results --"); @@ -526,7 +526,7 @@ ClangFunction::ExecuteFunction ( Stream &errors, lldb::addr_t *this_arg) { - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); if (log) log->Printf("== [ClangFunction::ExecuteFunction] Executing function =="); diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp index 5a55609fc53..19b2881c360 100644 --- a/lldb/source/Expression/ClangUserExpression.cpp +++ b/lldb/source/Expression/ClangUserExpression.cpp @@ -106,7 +106,7 @@ ClangUserExpression::ASTTransformer (clang::ASTConsumer *passthrough) void ClangUserExpression::ScanContext(ExecutionContext &exe_ctx, Error &err) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("ClangUserExpression::ScanContext()"); @@ -372,7 +372,7 @@ ClangUserExpression::Parse (Stream &error_stream, lldb_private::ExecutionPolicy execution_policy, bool keep_result_in_memory) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Error err; @@ -492,7 +492,7 @@ ClangUserExpression::PrepareToExecuteJITExpression (Stream &error_stream, lldb::addr_t &object_ptr, lldb::addr_t &cmd_ptr) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); lldb::TargetSP target; lldb::ProcessSP process; @@ -627,7 +627,7 @@ ClangUserExpression::FinalizeJITExecution (Stream &error_stream, { Error expr_error; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { @@ -674,7 +674,7 @@ ClangUserExpression::Execute (Stream &error_stream, { // The expression log is quite verbose, and if you're just tracking the execution of the // expression, it's quite convenient to have these logs come out with the STEP log as well. - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); if (m_jit_start_addr != LLDB_INVALID_ADDRESS) { @@ -815,7 +815,7 @@ ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx, bool run_others, uint32_t timeout_usec) { - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP)); ExecutionResults execution_results = eExecutionSetupError; diff --git a/lldb/source/Expression/ClangUtilityFunction.cpp b/lldb/source/Expression/ClangUtilityFunction.cpp index e457bb94655..af33340bd16 100644 --- a/lldb/source/Expression/ClangUtilityFunction.cpp +++ b/lldb/source/Expression/ClangUtilityFunction.cpp @@ -68,8 +68,6 @@ bool ClangUtilityFunction::Install (Stream &error_stream, ExecutionContext &exe_ctx) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - if (m_jit_start_addr != LLDB_INVALID_ADDRESS) { error_stream.PutCString("error: already installed\n"); diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index 82d40af1562..c9e03519449 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -1331,7 +1331,7 @@ DWARFExpression::Evaluate error_ptr->SetErrorString ("Invalid offset and/or length for opcodes buffer."); return false; } - LogSP log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); while (opcodes.ValidOffset(offset) && offset < end_offset) diff --git a/lldb/source/Expression/IRDynamicChecks.cpp b/lldb/source/Expression/IRDynamicChecks.cpp index 1b9e362cfad..c2515c9730c 100644 --- a/lldb/source/Expression/IRDynamicChecks.cpp +++ b/lldb/source/Expression/IRDynamicChecks.cpp @@ -356,7 +356,7 @@ public: private: bool InstrumentInstruction(llvm::Instruction *inst) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("Instrumenting load/store instruction: %s\n", @@ -497,7 +497,7 @@ private: bool InspectInstruction(llvm::Instruction &i) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); CallInst *call_inst = dyn_cast<CallInst>(&i); @@ -604,7 +604,7 @@ IRDynamicChecks::~IRDynamicChecks() bool IRDynamicChecks::runOnModule(llvm::Module &M) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); llvm::Function* function = M.getFunction(StringRef(m_func_name.c_str())); diff --git a/lldb/source/Expression/IRExecutionUnit.cpp b/lldb/source/Expression/IRExecutionUnit.cpp index c3a2f8aacb7..70a98adf27e 100644 --- a/lldb/source/Expression/IRExecutionUnit.cpp +++ b/lldb/source/Expression/IRExecutionUnit.cpp @@ -45,7 +45,7 @@ IRExecutionUnit::WriteNow (const uint8_t *bytes, size_t size, Error &error) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); auto iter = m_allocations.insert(m_allocations.end(), Allocation()); @@ -107,7 +107,7 @@ IRExecutionUnit::WriteNow (const uint8_t *bytes, void IRExecutionUnit::FreeNow (lldb::addr_t allocation) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (allocation == LLDB_INVALID_ADDRESS) return; @@ -134,7 +134,7 @@ Error IRExecutionUnit::DisassembleFunction (Stream &stream, lldb::ProcessSP &process_wp) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionContext exe_ctx(process_wp); @@ -226,7 +226,7 @@ IRExecutionUnit::DisassembleFunction (Stream &stream, if (log) { log->Printf("Function data has contents:"); - extractor.PutToLog (log.get(), + extractor.PutToLog (log, 0, extractor.GetByteSize(), func_remote_addr, @@ -271,7 +271,6 @@ IRExecutionUnit::GetRunnableInfo(Error &error, lldb::addr_t &func_addr, lldb::addr_t &func_end) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); lldb::ProcessSP process_sp(m_process_wp.lock()); func_addr = LLDB_INVALID_ADDRESS; @@ -305,7 +304,7 @@ IRExecutionUnit::GetRunnableInfo(Error &error, m_did_jit = true; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); std::string error_string; @@ -480,7 +479,7 @@ IRExecutionUnit::MemoryManager::allocateStub(const llvm::GlobalValue* F, unsigned StubSize, unsigned Alignment) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); uint8_t *return_value = m_default_mm_ap->allocateStub(F, StubSize, Alignment); @@ -513,7 +512,7 @@ IRExecutionUnit::MemoryManager::endFunctionBody(const llvm::Function *F, uint8_t * IRExecutionUnit::MemoryManager::allocateSpace(intptr_t Size, unsigned Alignment) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); uint8_t *return_value = m_default_mm_ap->allocateSpace(Size, Alignment); @@ -540,7 +539,7 @@ IRExecutionUnit::MemoryManager::allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); uint8_t *return_value = m_default_mm_ap->allocateCodeSection(Size, Alignment, SectionID); @@ -570,7 +569,7 @@ IRExecutionUnit::MemoryManager::allocateDataSection(uintptr_t Size, unsigned SectionID, bool IsReadOnly) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); uint8_t *return_value = m_default_mm_ap->allocateDataSection(Size, Alignment, SectionID, IsReadOnly); @@ -597,7 +596,7 @@ uint8_t * IRExecutionUnit::MemoryManager::allocateGlobal(uintptr_t Size, unsigned Alignment) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); uint8_t *return_value = m_default_mm_ap->allocateGlobal(Size, Alignment); @@ -676,7 +675,7 @@ IRExecutionUnit::GetRemoteRangeForLocal (lldb::addr_t local_address) bool IRExecutionUnit::CommitAllocations (lldb::ProcessSP &process_sp) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); bool ret = true; @@ -749,7 +748,7 @@ IRExecutionUnit::ReportAllocations (llvm::ExecutionEngine &engine) bool IRExecutionUnit::WriteData (lldb::ProcessSP &process_sp) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); for (Allocation &allocation : m_allocations) { @@ -779,7 +778,7 @@ IRExecutionUnit::WriteData (lldb::ProcessSP &process_sp) } void -IRExecutionUnit::Allocation::dump (lldb::LogSP log) +IRExecutionUnit::Allocation::dump (Log *log) { if (!log) return; diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp index b158732c741..e78eed9cbbe 100644 --- a/lldb/source/Expression/IRForTarget.cpp +++ b/lldb/source/Expression/IRForTarget.cpp @@ -123,8 +123,6 @@ IRForTarget::~IRForTarget() bool IRForTarget::FixFunctionLinkage(llvm::Function &llvm_function) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - llvm_function.setLinkage(GlobalValue::ExternalLinkage); std::string name = llvm_function.getName().str(); @@ -199,7 +197,7 @@ IRForTarget::GetFunctionAddress (llvm::Function *fun, lldb_private::ConstString &name, Constant **&value_ptr) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); fun_addr = LLDB_INVALID_ADDRESS; name.Clear(); @@ -330,8 +328,6 @@ IRForTarget::RegisterFunctionMetadata(LLVMContext &context, llvm::Value *function_ptr, const char *name) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - for (Value::use_iterator i = function_ptr->use_begin(), e = function_ptr->use_end(); i != e; ++i) @@ -359,7 +355,7 @@ bool IRForTarget::ResolveFunctionPointers(llvm::Module &llvm_module, llvm::Function &llvm_function) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); for (llvm::Module::iterator fi = llvm_module.begin(); fi != llvm_module.end(); @@ -405,8 +401,6 @@ IRForTarget::ResolveFunctionPointers(llvm::Module &llvm_module, clang::NamedDecl * IRForTarget::DeclForGlobal (const GlobalValue *global_val, Module *module) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - NamedMDNode *named_metadata = module->getNamedMetadata("clang.global.decl.ptrs"); if (!named_metadata) @@ -474,7 +468,7 @@ IRForTarget::MaybeSetConstantResult (llvm::Constant *initializer, void IRForTarget::MaybeSetCastResult (lldb_private::TypeFromParser type) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!m_result_store) return; @@ -543,7 +537,7 @@ IRForTarget::MaybeSetCastResult (lldb_private::TypeFromParser type) bool IRForTarget::CreateResultVariable (llvm::Function &llvm_function) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!m_resolve_vars) return true; @@ -826,7 +820,7 @@ IRForTarget::CreateResultVariable (llvm::Function &llvm_function) } #if 0 -static void DebugUsers(lldb::LogSP &log, Value *value, uint8_t depth) +static void DebugUsers(Log *log, Value *value, uint8_t depth) { if (!depth) return; @@ -855,7 +849,7 @@ IRForTarget::RewriteObjCConstString (llvm::GlobalVariable *ns_str, llvm::GlobalVariable *cstr, Instruction *FirstEntryInstruction) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Type *ns_str_ty = ns_str->getType(); @@ -968,7 +962,7 @@ IRForTarget::RewriteObjCConstString (llvm::GlobalVariable *ns_str, bool IRForTarget::RewriteObjCConstStrings(Function &llvm_function) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ValueSymbolTable& value_symbol_table = m_module->getValueSymbolTable(); @@ -1211,7 +1205,7 @@ static bool IsObjCSelectorRef (Value *value) bool IRForTarget::RewriteObjCSelector (Instruction* selector_load) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); LoadInst *load = dyn_cast<LoadInst>(selector_load); @@ -1327,7 +1321,7 @@ IRForTarget::RewriteObjCSelector (Instruction* selector_load) bool IRForTarget::RewriteObjCSelectors (BasicBlock &basic_block) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); BasicBlock::iterator ii; @@ -1372,7 +1366,7 @@ IRForTarget::RewriteObjCSelectors (BasicBlock &basic_block) bool IRForTarget::RewritePersistentAlloc (llvm::Instruction *persistent_alloc) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); AllocaInst *alloc = dyn_cast<AllocaInst>(persistent_alloc); @@ -1443,7 +1437,7 @@ IRForTarget::RewritePersistentAllocs(llvm::BasicBlock &basic_block) if (!m_resolve_vars) return true; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); BasicBlock::iterator ii; @@ -1508,7 +1502,7 @@ IRForTarget::MaterializeInitializer (uint8_t *data, Constant *initializer) if (!initializer) return true; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log && log->GetVerbose()) log->Printf(" MaterializeInitializer(%p, %s)", data, PrintValue(initializer).c_str()); @@ -1611,7 +1605,7 @@ IRForTarget::MaterializeInternalVariable (GlobalVariable *global_variable) bool IRForTarget::MaybeHandleVariable (Value *llvm_value_ptr) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("MaybeHandleVariable (%s)", PrintValue(llvm_value_ptr).c_str()); @@ -1728,7 +1722,7 @@ IRForTarget::MaybeHandleVariable (Value *llvm_value_ptr) bool IRForTarget::HandleSymbol (Value *symbol) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); lldb_private::ConstString name(symbol->getName().str().c_str()); @@ -1764,7 +1758,7 @@ IRForTarget::HandleSymbol (Value *symbol) bool IRForTarget::MaybeHandleCallArguments (CallInst *Old) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("MaybeHandleCallArguments(%s)", PrintValue(Old).c_str()); @@ -1786,7 +1780,7 @@ IRForTarget::MaybeHandleCallArguments (CallInst *Old) bool IRForTarget::HandleObjCClass(Value *classlist_reference) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); GlobalVariable *global_variable = dyn_cast<GlobalVariable>(classlist_reference); @@ -1918,7 +1912,7 @@ IRForTarget::ResolveCalls(BasicBlock &basic_block) bool IRForTarget::ResolveExternals (Function &llvm_function) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); for (Module::global_iterator global = m_module->global_begin(), end = m_module->global_end(); global != end; @@ -1977,7 +1971,7 @@ IRForTarget::ResolveExternals (Function &llvm_function) bool IRForTarget::ReplaceStrings () { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); typedef std::map <GlobalVariable *, size_t> OffsetsTy; @@ -2098,7 +2092,7 @@ IRForTarget::ReplaceStrings () bool IRForTarget::ReplaceStaticLiterals (llvm::BasicBlock &basic_block) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); typedef SmallVector <Value*, 2> ConstantList; typedef SmallVector <llvm::Instruction*, 2> UserList; @@ -2312,7 +2306,7 @@ IRForTarget::RemoveGuards(BasicBlock &basic_block) bool IRForTarget::UnfoldConstant(Constant *old_constant, Value *new_constant, Instruction *first_entry_inst) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); Value::use_iterator ui; @@ -2418,7 +2412,7 @@ IRForTarget::ReplaceVariables (Function &llvm_function) if (!m_resolve_vars) return true; - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); m_decl_map->DoStructLayout(); @@ -2592,11 +2586,8 @@ IRForTarget::ReplaceVariables (Function &llvm_function) } llvm::Constant * -IRForTarget::BuildRelocation(llvm::Type *type, - uint64_t offset) +IRForTarget::BuildRelocation(llvm::Type *type, uint64_t offset) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - IntegerType *intptr_ty = Type::getIntNTy(m_module->getContext(), (m_module->getPointerSize() == Module::Pointer64) ? 64 : 32); @@ -2617,7 +2608,7 @@ IRForTarget::BuildRelocation(llvm::Type *type, bool IRForTarget::CompleteDataAllocation () { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (!m_data_allocator.GetStream().GetSize()) return true; @@ -2651,7 +2642,7 @@ IRForTarget::CompleteDataAllocation () bool IRForTarget::StripAllGVs (Module &llvm_module) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); std::vector<GlobalVariable *> global_vars; std::set<GlobalVariable *>erased_vars; @@ -2701,7 +2692,7 @@ IRForTarget::StripAllGVs (Module &llvm_module) bool IRForTarget::runOnModule (Module &llvm_module) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); m_module = &llvm_module; m_target_data.reset(new DataLayout(m_module)); diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp index 3c7c76653fb..aa0ab5e4587 100644 --- a/lldb/source/Expression/IRInterpreter.cpp +++ b/lldb/source/Expression/IRInterpreter.cpp @@ -639,7 +639,7 @@ public: // resides. This is an IR-level variable. do { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); lldb_private::Value resolved_value; lldb_private::ClangExpressionVariable::FlagType flags = 0; @@ -984,7 +984,7 @@ bool IRInterpreter::supportsFunction (Function &llvm_function, lldb_private::Error &err) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); for (Function::iterator bbi = llvm_function.begin(), bbe = llvm_function.end(); bbi != bbe; @@ -1080,7 +1080,7 @@ IRInterpreter::runOnFunction (lldb::ClangExpressionVariableSP &result, Module &llvm_module, lldb_private::Error &err) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + lldb_private::Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); lldb_private::ClangExpressionDeclMap::TargetInfo target_info = m_decl_map.GetTargetInfo(); diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp index ab7faf54d19..61386b5833b 100644 --- a/lldb/source/Host/common/Host.cpp +++ b/lldb/source/Host/common/Host.cpp @@ -135,7 +135,7 @@ private: static void * MonitorChildProcessThreadFunction (void *arg) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); const char *function = __FUNCTION__; if (log) log->Printf ("%s (arg = %p) thread starting...", function, arg); @@ -552,7 +552,7 @@ ThreadCreateTrampoline (thread_arg_t arg) thread_func_t thread_fptr = info->thread_fptr; thread_arg_t thread_arg = info->thread_arg; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) log->Printf("thread created"); diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm index 6cfc59d8d4d..f40443c30ba 100644 --- a/lldb/source/Host/macosx/Host.mm +++ b/lldb/source/Host/macosx/Host.mm @@ -681,7 +681,7 @@ Host::OpenFileInExternalEditor (const FileSpec &file_spec, uint32_t line_no) uint32_t reserved2; // must be zero } BabelAESelInfo; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_HOST)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_HOST)); char file_path[PATH_MAX]; file_spec.GetPath(file_path, PATH_MAX); CFCString file_cfstr (file_path, kCFStringEncodingUTF8); @@ -1301,7 +1301,7 @@ static Error getXPCAuthorization (ProcessLaunchInfo &launch_info) { Error error; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); if ((launch_info.GetUserID() == 0) && !authorizationRef) { @@ -1312,7 +1312,7 @@ getXPCAuthorization (ProcessLaunchInfo &launch_info) error.SetErrorString("Can't create authorizationRef."); if (log) { - error.PutToLog(log.get(), "%s", error.AsCString()); + error.PutToLog(log, "%s", error.AsCString()); } return error; } @@ -1353,7 +1353,7 @@ getXPCAuthorization (ProcessLaunchInfo &launch_info) error.SetErrorStringWithFormat("Launching as root needs root authorization."); if (log) { - error.PutToLog(log.get(), "%s", error.AsCString()); + error.PutToLog(log, "%s", error.AsCString()); } if (authorizationRef) @@ -1376,7 +1376,7 @@ LaunchProcessXPC (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t if (error.Fail()) return error; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); uid_t requested_uid = launch_info.GetUserID(); const char *xpc_service = nil; @@ -1398,7 +1398,7 @@ LaunchProcessXPC (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t error.SetErrorStringWithFormat("Launching root via XPC needs to externalize authorization reference."); if (log) { - error.PutToLog(log.get(), "%s", error.AsCString()); + error.PutToLog(log, "%s", error.AsCString()); } return error; } @@ -1410,7 +1410,7 @@ LaunchProcessXPC (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t error.SetErrorStringWithFormat("Launching via XPC is only currently available for either the login user or root."); if (log) { - error.PutToLog(log.get(), "%s", error.AsCString()); + error.PutToLog(log, "%s", error.AsCString()); } return error; } @@ -1470,7 +1470,7 @@ LaunchProcessXPC (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t error.SetErrorStringWithFormat("Problems with launching via XPC. Error type : %i, code : %i", errorType, errorCode); if (log) { - error.PutToLog(log.get(), "%s", error.AsCString()); + error.PutToLog(log, "%s", error.AsCString()); } if (authorizationRef) @@ -1486,7 +1486,7 @@ LaunchProcessXPC (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t error.SetErrorStringWithFormat("Problems with launching via XPC. XPC error : %s", xpc_dictionary_get_string(reply, XPC_ERROR_KEY_DESCRIPTION)); if (log) { - error.PutToLog(log.get(), "%s", error.AsCString()); + error.PutToLog(log, "%s", error.AsCString()); } } @@ -1501,13 +1501,13 @@ static Error LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t &pid) { Error error; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); posix_spawnattr_t attr; error.SetError( ::posix_spawnattr_init (&attr), eErrorTypePOSIX); if (error.Fail() || log) - error.PutToLog(log.get(), "::posix_spawnattr_init ( &attr )"); + error.PutToLog(log, "::posix_spawnattr_init ( &attr )"); if (error.Fail()) return error; @@ -1525,7 +1525,7 @@ LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, : short flags = GetPosixspawnFlags(launch_info); error.SetError( ::posix_spawnattr_setflags (&attr, flags), eErrorTypePOSIX); if (error.Fail() || log) - error.PutToLog(log.get(), "::posix_spawnattr_setflags ( &attr, flags=0x%8.8x )", flags); + error.PutToLog(log, "::posix_spawnattr_setflags ( &attr, flags=0x%8.8x )", flags); if (error.Fail()) return error; @@ -1543,7 +1543,7 @@ LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, : size_t ocount = 0; error.SetError( ::posix_spawnattr_setbinpref_np (&attr, 1, &cpu, &ocount), eErrorTypePOSIX); if (error.Fail() || log) - error.PutToLog(log.get(), "::posix_spawnattr_setbinpref_np ( &attr, 1, cpu_type = 0x%8.8x, count => %llu )", cpu, (uint64_t)ocount); + error.PutToLog(log, "::posix_spawnattr_setbinpref_np ( &attr, 1, cpu_type = 0x%8.8x, count => %llu )", cpu, (uint64_t)ocount); if (error.Fail() || ocount != 1) return error; @@ -1586,7 +1586,7 @@ LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, : posix_spawn_file_actions_t file_actions; error.SetError( ::posix_spawn_file_actions_init (&file_actions), eErrorTypePOSIX); if (error.Fail() || log) - error.PutToLog(log.get(), "::posix_spawn_file_actions_init ( &file_actions )"); + error.PutToLog(log, "::posix_spawn_file_actions_init ( &file_actions )"); if (error.Fail()) return error; @@ -1601,7 +1601,7 @@ LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, : { if (!ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (&file_actions, launch_file_action, - log.get(), + log, error)) return error; } @@ -1617,7 +1617,7 @@ LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, : if (error.Fail() || log) { - error.PutToLog(log.get(), "::posix_spawnp ( pid => %i, path = '%s', file_actions = %p, attr = %p, argv = %p, envp = %p )", + error.PutToLog(log, "::posix_spawnp ( pid => %i, path = '%s', file_actions = %p, attr = %p, argv = %p, envp = %p )", pid, exe_path, &file_actions, @@ -1644,7 +1644,7 @@ LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, : if (error.Fail() || log) { - error.PutToLog(log.get(), "::posix_spawnp ( pid => %i, path = '%s', file_actions = NULL, attr = %p, argv = %p, envp = %p )", + error.PutToLog(log, "::posix_spawnp ( pid => %i, path = '%s', file_actions = NULL, attr = %p, argv = %p, envp = %p )", pid, exe_path, &attr, @@ -1790,7 +1790,7 @@ Host::StartMonitoringChildProcess (Host::MonitorChildProcessCallback callback, if (monitor_signals) mask |= DISPATCH_PROC_SIGNAL; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS)); dispatch_source_t source = ::dispatch_source_create (DISPATCH_SOURCE_TYPE_PROC, diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index ef1cdb63b7e..0c7e3afaa49 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -1441,7 +1441,7 @@ CommandInterpreter::HandleCommand (const char *command_line, std::string command_string (command_line); std::string original_command_string (command_line); - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMANDS)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMANDS)); Host::SetCrashDescriptionWithFormat ("HandleCommand(command = \"%s\")", command_line); // Make a scoped cleanup object that will clear the crash description string @@ -2588,7 +2588,7 @@ CommandInterpreter::GetScriptInterpreter (bool can_create) static Mutex g_interpreter_mutex(Mutex::eMutexTypeRecursive); Mutex::Locker interpreter_lock(g_interpreter_mutex); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf("Initializing the ScriptInterpreter now\n"); diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp index 68e984c1e6b..d56f21eed1d 100644 --- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp +++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp @@ -157,7 +157,7 @@ ScriptInterpreterPython::Locker::Locker (ScriptInterpreterPython *py_interpreter bool ScriptInterpreterPython::Locker::DoAcquireLock() { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT | LIBLLDB_LOG_VERBOSE)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT | LIBLLDB_LOG_VERBOSE)); m_GILState = PyGILState_Ensure(); if (log) log->Printf("Ensured PyGILState. Previous state = %slocked\n", m_GILState == PyGILState_UNLOCKED ? "un" : ""); @@ -175,7 +175,7 @@ ScriptInterpreterPython::Locker::DoInitSession(bool init_lldb_globals) bool ScriptInterpreterPython::Locker::DoFreeLock() { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT | LIBLLDB_LOG_VERBOSE)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT | LIBLLDB_LOG_VERBOSE)); if (log) log->Printf("Releasing PyGILState. Returning to state = %slocked\n", m_GILState == PyGILState_UNLOCKED ? "un" : ""); PyGILState_Release(m_GILState); @@ -267,7 +267,7 @@ ScriptInterpreterPython::PythonInputReaderManager::InputReaderCallback (void *ba size_t bytes_len) { lldb::thread_t embedded_interpreter_thread; - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); if (baton == NULL) return 0; @@ -583,7 +583,7 @@ ScriptInterpreterPython::RestoreTerminalState () void ScriptInterpreterPython::LeaveSession () { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); if (log) log->PutCString("ScriptInterpreterPython::LeaveSession()"); @@ -616,7 +616,7 @@ ScriptInterpreterPython::EnterSession (bool init_lldb_globals) { // If we have already entered the session, without having officially 'left' it, then there is no need to // 'enter' it again. - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); if (m_session_is_active) { if (log) @@ -833,7 +833,7 @@ ScriptInterpreterPython::InputReaderCallback ) { lldb::thread_t embedded_interpreter_thread; - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); if (baton == NULL) return 0; @@ -2266,7 +2266,7 @@ ScriptInterpreterPython::RunEmbeddedPythonInterpreter (lldb::thread_arg_t baton) { ScriptInterpreterPython *script_interpreter = (ScriptInterpreterPython *) baton; - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT)); if (log) log->Printf ("%p ScriptInterpreterPython::RunEmbeddedPythonInterpreter () thread starting...", baton); @@ -2846,7 +2846,7 @@ ScriptInterpreterPython::InitializePrivate () stdin_tty_state.Save(STDIN_FILENO, false); PyGILState_STATE gstate; - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT | LIBLLDB_LOG_VERBOSE)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SCRIPT | LIBLLDB_LOG_VERBOSE)); bool threads_already_initialized = false; if (PyEval_ThreadsInitialized ()) { gstate = PyGILState_Ensure (); diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp b/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp index fbb18ddce02..1f07c030def 100644 --- a/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp +++ b/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp @@ -315,7 +315,7 @@ ABISysV_x86_64::PrepareTrivialCall (Thread &thread, addr_t *arg5_ptr, addr_t *arg6_ptr) const { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("ABISysV_x86_64::PrepareTrivialCall\n(\n thread = %p\n sp = 0x%" PRIx64 "\n func_addr = 0x%" PRIx64 "\n return_addr = 0x%" PRIx64 "\n arg1_ptr = %p (0x%" PRIx64 ")\n arg2_ptr = %p (0x%" PRIx64 ")\n arg3_ptr = %p (0x%" PRIx64 ")\n)", diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 7735c766537..0552d7fbf31 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -1082,14 +1082,14 @@ DynamicLoaderDarwinKernel::BreakpointHit (StoppointCallbackContext *context, user_id_t break_id, user_id_t break_loc_id) { - LogSP log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); if (log) log->Printf ("DynamicLoaderDarwinKernel::BreakpointHit (...)\n"); ReadAllKextSummaries (); if (log) - PutToLog(log.get()); + PutToLog(log); return GetStopWhenImagesChange(); } @@ -1156,7 +1156,7 @@ bool DynamicLoaderDarwinKernel::ParseKextSummaries (const Address &kext_summary_addr, uint32_t count) { KextImageInfo::collection kext_summaries; - LogSP log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); if (log) log->Printf ("Kexts-changed breakpoint hit, there are %d kexts currently.\n", count); @@ -1287,7 +1287,7 @@ DynamicLoaderDarwinKernel::ParseKextSummaries (const Address &kext_summary_addr, s->Printf ("."); if (log) - kext_summaries[new_kext].PutToLog (log.get()); + kext_summaries[new_kext].PutToLog (log); } } m_process->GetTarget().ModulesDidLoad (loaded_module_list); @@ -1381,8 +1381,6 @@ DynamicLoaderDarwinKernel::ReadKextSummaries (const Address &kext_summary_addr, bool DynamicLoaderDarwinKernel::ReadAllKextSummaries () { - LogSP log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); - Mutex::Locker locker(m_mutex); if (ReadKextSummaryHeader ()) @@ -1537,7 +1535,7 @@ ThreadPlanSP DynamicLoaderDarwinKernel::GetStepThroughTrampolinePlan (Thread &thread, bool stop_others) { ThreadPlanSP thread_plan_sp; - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("Could not find symbol for step through."); return thread_plan_sp; diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 224ad3f83ab..61b6de2c50d 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -788,7 +788,7 @@ bool DynamicLoaderMacOSXDYLD::AddModulesUsingImageInfosAddress (lldb::addr_t image_infos_addr, uint32_t image_infos_count) { DYLDImageInfo::collection image_infos; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); if (log) log->Printf ("Adding %d modules.\n", image_infos_count); @@ -813,7 +813,7 @@ DynamicLoaderMacOSXDYLD::AddModulesUsingImageInfos (DYLDImageInfo::collection &i { // Now add these images to the main list. ModuleList loaded_module_list; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); Target &target = m_process->GetTarget(); ModuleList& target_images = target.GetImages(); @@ -822,7 +822,7 @@ DynamicLoaderMacOSXDYLD::AddModulesUsingImageInfos (DYLDImageInfo::collection &i if (log) { log->Printf ("Adding new image at address=0x%16.16" PRIx64 ".", image_infos[idx].address); - image_infos[idx].PutToLog (log.get()); + image_infos[idx].PutToLog (log); } m_dyld_image_infos.push_back(image_infos[idx]); @@ -917,7 +917,7 @@ bool DynamicLoaderMacOSXDYLD::RemoveModulesUsingImageInfosAddress (lldb::addr_t image_infos_addr, uint32_t image_infos_count) { DYLDImageInfo::collection image_infos; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); Mutex::Locker locker(m_mutex); if (m_process->GetStopID() == m_dyld_image_infos_stop_id) @@ -940,7 +940,7 @@ DynamicLoaderMacOSXDYLD::RemoveModulesUsingImageInfosAddress (lldb::addr_t image if (log) { log->Printf ("Removing module at address=0x%16.16" PRIx64 ".", image_infos[idx].address); - image_infos[idx].PutToLog (log.get()); + image_infos[idx].PutToLog (log); } // Remove this image_infos from the m_all_image_infos. We do the comparision by address @@ -973,7 +973,7 @@ DynamicLoaderMacOSXDYLD::RemoveModulesUsingImageInfosAddress (lldb::addr_t image if (log) { log->Printf ("Could not find module for unloading info entry:"); - image_infos[idx].PutToLog(log.get()); + image_infos[idx].PutToLog(log); } } @@ -989,7 +989,7 @@ DynamicLoaderMacOSXDYLD::RemoveModulesUsingImageInfosAddress (lldb::addr_t image if (log) { log->Printf ("Could not find image_info entry for unloading image:"); - image_infos[idx].PutToLog(log.get()); + image_infos[idx].PutToLog(log); } } } @@ -1059,7 +1059,7 @@ DynamicLoaderMacOSXDYLD::ReadImageInfos (lldb::addr_t image_infos_addr, bool DynamicLoaderMacOSXDYLD::InitializeFromAllImageInfos () { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); Mutex::Locker locker(m_mutex); if (m_process->GetStopID() == m_dyld_image_infos_stop_id @@ -1304,7 +1304,6 @@ DynamicLoaderMacOSXDYLD::UpdateImageInfosHeaderAndLoadCommands(DYLDImageInfo::co bool update_executable) { uint32_t exe_idx = UINT32_MAX; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER)); // Read any UUID values that we can get for (uint32_t i = 0; i < infos_count; i++) { @@ -1592,7 +1591,7 @@ DynamicLoaderMacOSXDYLD::GetStepThroughTrampolinePlan (Thread &thread, bool stop StackFrame *current_frame = thread.GetStackFrameAtIndex(0).get(); const SymbolContext ¤t_context = current_frame->GetSymbolContext(eSymbolContextSymbol); Symbol *current_symbol = current_context.symbol; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (current_symbol != NULL) { diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp index de4d1e77b88..05cc7172d70 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp @@ -84,7 +84,7 @@ AuxVector::AuxVector(Process *process) : m_process(process) { DataExtractor data; - LogSP log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER)); + Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER)); data.SetData(GetAuxvData()); data.SetByteOrder(m_process->GetByteOrder()); @@ -109,7 +109,7 @@ AuxVector::FindEntry(EntryType type) const } void -AuxVector::DumpToLog(LogSP log) const +AuxVector::DumpToLog(Log *log) const { if (!log) return; diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h index 8b93fd656e0..ea0fe002ec9 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h @@ -81,7 +81,7 @@ public: GetEntryName(EntryType type); void - DumpToLog(lldb::LogSP log) const; + DumpToLog(lldb_private::Log *log) const; private: lldb_private::Process *m_process; diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp index b57f2c5b0b3..e832739bdc0 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp @@ -295,7 +295,7 @@ DYLDRendezvous::ReadSOEntryFromMemory(lldb::addr_t addr, SOEntry &entry) } void -DYLDRendezvous::DumpToLog(LogSP log) const +DYLDRendezvous::DumpToLog(Log *log) const { int state = GetState(); diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h index 81cb74f153b..67e7228a38d 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h @@ -111,7 +111,7 @@ public: ModulesDidUnload() const { return !m_removed_soentries.empty(); } void - DumpToLog(lldb::LogSP log) const; + DumpToLog(lldb_private::Log *log) const; /// @brief Constants describing the state of the rendezvous. /// diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp index 410e6beec6d..05e66f38974 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp @@ -111,7 +111,7 @@ ItaniumABILanguageRuntime::GetDynamicTypeAndAddress (ValueObject &in_value, const char *name = symbol->GetMangled().GetDemangledName().AsCString(); if (strstr(name, vtable_demangled_prefix) == name) { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("0x%16.16" PRIx64 ": static-type = '%s' has vtable symbol '%s'\n", original_ptr, diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp index 52ec43535d8..944cc3507ac 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp @@ -366,7 +366,7 @@ AppleObjCRuntimeV1::UpdateISAToDescriptorMapIfNeeded() // map, wether it was successful or not. m_isa_to_descriptor_stop_id = process->GetStopID(); - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); ProcessSP process_sp = process->shared_from_this(); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 752e526a449..6cfc05a65cb 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -1638,7 +1638,7 @@ AppleObjCRuntimeV2::GetClassDescriptor (ValueObject& valobj) objc_class_sp = ObjCLanguageRuntime::GetClassDescriptor (isa); if (isa && !objc_class_sp) { - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); if (log) log->Printf("0x%" PRIx64 ": AppleObjCRuntimeV2::GetClassDescriptor() ISA was not in class descriptor cache 0x%" PRIx64, isa_pointer, @@ -1685,7 +1685,7 @@ AppleObjCRuntimeV2::UpdateISAToDescriptorMapDynamic(RemoteNXMapTable &hash_table if (process == NULL) return false; - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); ExecutionContext exe_ctx; @@ -1892,7 +1892,7 @@ AppleObjCRuntimeV2::ParseClassInfoArray (const DataExtractor &data, uint32_t num // uint32_t hash; // } __attribute__((__packed__)); - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); // Iterate through all ClassInfo structures lldb::offset_t offset = 0; @@ -1932,7 +1932,7 @@ AppleObjCRuntimeV2::UpdateISAToDescriptorMapSharedCache() if (process == NULL) return false; - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); ExecutionContext exe_ctx; @@ -2141,7 +2141,7 @@ AppleObjCRuntimeV2::UpdateISAToDescriptorMapSharedCache() bool AppleObjCRuntimeV2::UpdateISAToDescriptorMapFromMemory (RemoteNXMapTable &hash_table) { - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); Process *process = GetProcess(); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp index f54875857d1..28508fdefe0 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp @@ -560,7 +560,7 @@ AppleObjCTrampolineHandler::AppleObjCVTables::ReadRegions (lldb::addr_t region_a if (!m_process_sp) return false; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); // We aren't starting at the trampoline symbol. InitializeVTableSymbols (); @@ -711,7 +711,7 @@ AppleObjCTrampolineHandler::SetupDispatchFunction (Thread &thread, ValueList &di ExecutionContext exe_ctx (thread.shared_from_this()); Address impl_code_address; StreamString errors; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); lldb::addr_t args_addr = LLDB_INVALID_ADDRESS; // Scope for mutex locker: @@ -865,7 +865,7 @@ AppleObjCTrampolineHandler::GetStepThroughDispatchPlan (Thread &thread, bool sto if (found_it) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); // We are decoding a method dispatch. // First job is to pull the arguments out: diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp index a5e3e63a8d4..a741311c9b0 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp @@ -37,7 +37,7 @@ public: static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? if (log) { @@ -85,7 +85,7 @@ public: static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? if (log) { @@ -115,7 +115,7 @@ public: static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? if (log) { @@ -326,8 +326,6 @@ public: clang::ObjCMethodDecl *BuildMethod (clang::ObjCInterfaceDecl *interface_decl, const char *name, bool instance) { - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? - if (!m_is_valid || m_type_vector.size() < 3) return NULL; @@ -498,7 +496,7 @@ private: bool AppleObjCTypeVendor::FinishDecl(clang::ObjCInterfaceDecl *interface_decl) { - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? ClangASTMetadata *metadata = m_external_source->GetMetadata(interface_decl); ObjCLanguageRuntime::ObjCISA objc_isa = 0; @@ -594,7 +592,7 @@ AppleObjCTypeVendor::FindTypes (const ConstString &name, static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - lldb::LogSP log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? + Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS)); // FIXME - a more appropriate log channel? if (log) log->Printf("AppleObjCTypeVendor::FindTypes [%u] ('%s', %s, %u, )", diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp index 3f0acb6bb21..1a2639cd7ca 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp @@ -173,7 +173,7 @@ AppleThreadPlanStepThroughObjCTrampoline::ShouldStop (Event *event_ptr) lldb::addr_t target_addr = target_addr_value.GetScalar().ULongLong(); Address target_so_addr; target_so_addr.SetOpcodeLoadAddress(target_addr, exc_ctx.GetTargetPtr()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (target_addr == 0) { if (log) diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 069d23e72c9..36bd9292ba9 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -1231,7 +1231,7 @@ ObjectFileMachO::ParseSymtab (bool minimize) lldb::offset_t offset = MachHeaderSizeFromMagic(m_header.magic); uint32_t i; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); for (i=0; i<m_header.ncmds; ++i) { @@ -1252,28 +1252,28 @@ ObjectFileMachO::ParseSymtab (bool minimize) if (symtab_load_command.symoff == 0) { if (log) - module_sp->LogMessage(log.get(), "LC_SYMTAB.symoff == 0"); + module_sp->LogMessage(log, "LC_SYMTAB.symoff == 0"); return 0; } if (symtab_load_command.stroff == 0) { if (log) - module_sp->LogMessage(log.get(), "LC_SYMTAB.stroff == 0"); + module_sp->LogMessage(log, "LC_SYMTAB.stroff == 0"); return 0; } if (symtab_load_command.nsyms == 0) { if (log) - module_sp->LogMessage(log.get(), "LC_SYMTAB.nsyms == 0"); + module_sp->LogMessage(log, "LC_SYMTAB.nsyms == 0"); return 0; } if (symtab_load_command.strsize == 0) { if (log) - module_sp->LogMessage(log.get(), "LC_SYMTAB.strsize == 0"); + module_sp->LogMessage(log, "LC_SYMTAB.strsize == 0"); return 0; } break; @@ -1411,7 +1411,7 @@ ObjectFileMachO::ParseSymtab (bool minimize) if (nlist_data.GetByteSize() == 0) { if (log) - module_sp->LogMessage(log.get(), "failed to read nlist data"); + module_sp->LogMessage(log, "failed to read nlist data"); return 0; } @@ -1424,14 +1424,14 @@ ObjectFileMachO::ParseSymtab (bool minimize) if (strtab_addr == LLDB_INVALID_ADDRESS) { if (log) - module_sp->LogMessage(log.get(), "failed to locate the strtab in memory"); + module_sp->LogMessage(log, "failed to locate the strtab in memory"); return 0; } } else { if (log) - module_sp->LogMessage(log.get(), "failed to read strtab data"); + module_sp->LogMessage(log, "failed to read strtab data"); return 0; } } diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp index d867c891b33..2f9c69870f3 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp +++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp @@ -132,7 +132,7 @@ OperatingSystemPython::GetDynamicRegisterInfo () { if (!m_interpreter || !m_python_object_sp) return NULL; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("OperatingSystemPython::GetDynamicRegisterInfo() fetching thread register definitions from python for pid %" PRIu64, m_process->GetID()); @@ -175,7 +175,7 @@ OperatingSystemPython::UpdateThreadList (ThreadList &old_thread_list, ThreadList if (!m_interpreter || !m_python_object_sp) return false; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); // First thing we have to do is get the API lock, and the run lock. We're going to change the thread // content of the process, and we're going to use python, which requires the API lock to do it. @@ -267,7 +267,7 @@ OperatingSystemPython::CreateRegisterContextForThread (Thread *thread, addr_t re Target &target = m_process->GetTarget(); Mutex::Locker api_locker (target.GetAPIMutex()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (reg_data_addr != LLDB_INVALID_ADDRESS) { @@ -316,7 +316,7 @@ OperatingSystemPython::CreateThreadStopReason (lldb_private::Thread *thread) lldb::ThreadSP OperatingSystemPython::CreateThread (lldb::tid_t tid, addr_t context) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) log->Printf ("OperatingSystemPython::CreateThread (tid = 0x%" PRIx64 ", context = 0x%" PRIx64 ") fetching register data from python", tid, context); diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp index c98b2465fdb..bbde8ed0709 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp @@ -102,7 +102,7 @@ CommunicationKDP::SendRequestAndGetReply (const CommandType command, { if (IsRunning()) { - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS)); if (log) { PacketStreamType log_strm; @@ -153,7 +153,7 @@ CommunicationKDP::SendRequestPacketNoLock (const PacketStreamType &request_packe const char *packet_data = request_packet.GetData(); const size_t packet_size = request_packet.GetSize(); - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS)); if (log) { PacketStreamType log_strm; @@ -202,7 +202,7 @@ CommunicationKDP::WaitForPacketWithTimeoutMicroSecondsNoLock (DataExtractor &pac uint8_t buffer[8192]; Error error; - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS | KDP_LOG_VERBOSE)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS | KDP_LOG_VERBOSE)); // Check for a packet from our cache first without trying any reading... if (CheckForPacket (NULL, 0, packet)) @@ -257,7 +257,7 @@ CommunicationKDP::CheckForPacket (const uint8_t *src, size_t src_len, DataExtrac // Put the packet data into the buffer in a thread safe fashion Mutex::Locker locker(m_bytes_mutex); - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PACKETS)); if (src && src_len > 0) { diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index f27c5f8fa3f..339c83a3098 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -333,7 +333,7 @@ ProcessKDP::DoAttachToProcessWithName (const char *process_name, bool wait_for_l void ProcessKDP::DidAttach () { - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PROCESS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PROCESS)); if (log) log->Printf ("ProcessKDP::DidAttach()"); if (GetID() != LLDB_INVALID_PROCESS_ID) @@ -366,7 +366,7 @@ Error ProcessKDP::DoResume () { Error error; - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PROCESS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PROCESS)); // Only start the async thread if we try to do any process control if (!IS_VALID_LLDB_HOST_THREAD(m_async_thread)) StartAsyncThread (); @@ -445,7 +445,7 @@ bool ProcessKDP::UpdateThreadList (ThreadList &old_thread_list, ThreadList &new_thread_list) { // locker will keep a mutex locked until it goes out of scope - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_THREAD)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_THREAD)); if (log && log->GetMask().Test(KDP_LOG_VERBOSE)) log->Printf ("ProcessKDP::%s (pid = %" PRIu64 ")", __FUNCTION__, GetID()); @@ -490,7 +490,7 @@ Error ProcessKDP::DoDetach() { Error error; - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); if (log) log->Printf ("ProcessKDP::DoDetach()"); @@ -695,7 +695,7 @@ ProcessKDP::Initialize() bool ProcessKDP::StartAsyncThread () { - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); if (log) log->Printf ("ProcessKDP::StartAsyncThread ()"); @@ -710,7 +710,7 @@ ProcessKDP::StartAsyncThread () void ProcessKDP::StopAsyncThread () { - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); if (log) log->Printf ("ProcessKDP::StopAsyncThread ()"); @@ -733,7 +733,7 @@ ProcessKDP::AsyncThread (void *arg) const lldb::pid_t pid = process->GetID(); - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PROCESS)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (KDP_LOG_PROCESS)); if (log) log->Printf ("ProcessKDP::AsyncThread (arg = %p, pid = %" PRIu64 ") thread starting...", arg, pid); diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp index ff3c46ece3f..53b08d53c24 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp @@ -22,22 +22,25 @@ using namespace lldb_private; // control access to our static g_log_sp by hiding it in a singleton function // that will construct the static g_lob_sp the first time this function is // called. -static LogSP & +static bool g_log_enabled = false; +static Log * g_log = NULL; +static Log * GetLog () { - static LogSP g_log_sp; - return g_log_sp; + if (!g_log_enabled) + return NULL; + return g_log; } -LogSP +Log * ProcessKDPLog::GetLogIfAllCategoriesSet (uint32_t mask) { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log && mask) { uint32_t log_mask = log->GetMask().Get(); if ((log_mask & mask) != mask) - return LogSP(); + return NULL; } return log; } @@ -45,7 +48,7 @@ ProcessKDPLog::GetLogIfAllCategoriesSet (uint32_t mask) void ProcessKDPLog::DisableLog (const char **categories, Stream *feedback_strm) { - LogSP log (GetLog ()); + Log *log (GetLog ()); if (log) { uint32_t flag_bits = 0; @@ -81,33 +84,33 @@ ProcessKDPLog::DisableLog (const char **categories, Stream *feedback_strm) } } + log->GetMask().Reset (flag_bits); if (flag_bits == 0) - GetLog ().reset(); - else - log->GetMask().Reset (flag_bits); + g_log_enabled = false; } return; } -LogSP +Log * ProcessKDPLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const char **categories, Stream *feedback_strm) { // Try see if there already is a log - that way we can reuse its settings. // We could reuse the log in toto, but we don't know that the stream is the same. uint32_t flag_bits = 0; - LogSP log(GetLog ()); - if (log) - flag_bits = log->GetMask().Get(); + if (g_log) + flag_bits = g_log->GetMask().Get(); // Now make a new log with this stream if one was provided if (log_stream_sp) { - log.reset (new Log(log_stream_sp)); - GetLog () = log; + if (g_log) + g_log->SetStream(log_stream_sp); + else + g_log = new Log(log_stream_sp); } - if (log) + if (g_log) { bool got_unknown_category = false; for (size_t i=0; categories[i] != NULL; ++i) @@ -140,10 +143,11 @@ ProcessKDPLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const c } if (flag_bits == 0) flag_bits = KDP_LOG_DEFAULT; - log->GetMask().Reset(flag_bits); - log->GetOptions().Reset(log_options); + g_log->GetMask().Reset(flag_bits); + g_log->GetOptions().Reset(log_options); } - return log; + g_log_enabled = true; + return g_log; } void @@ -170,7 +174,7 @@ ProcessKDPLog::ListLogCategories (Stream *strm) void ProcessKDPLog::LogIf (uint32_t mask, const char *format, ...) { - LogSP log (ProcessKDPLog::GetLogIfAllCategoriesSet (mask)); + Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet (mask)); if (log) { va_list args; diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h index ffdc471ff3a..0cb32d9b2dc 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h @@ -35,13 +35,13 @@ class ProcessKDPLog { public: - static lldb::LogSP + static lldb_private::Log * GetLogIfAllCategoriesSet(uint32_t mask = 0); static void DisableLog (const char **categories, lldb_private::Stream *feedback_strm); - static lldb::LogSP + static lldb_private::Log * EnableLog (lldb::StreamSP &log_stream_sp, uint32_t log_options, const char **categories, lldb_private::Stream *feedback_strm); static void diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.cpp index 33c5e47d0b2..8ce90e57fde 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.cpp @@ -76,7 +76,7 @@ ThreadKDP::WillResume (StateType resume_state) ClearStackFrames(); - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("Resuming thread: %4.4" PRIx64 " with state: %s.", GetID(), StateAsCString(resume_state)); diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp index 6b52a62ecb2..8eb4c612bdf 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp @@ -87,7 +87,7 @@ RegisterContextLLDB::RegisterContextLLDB void RegisterContextLLDB::InitializeZerothFrame() { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); ExecutionContext exe_ctx(m_thread.shared_from_this()); RegisterContextSP reg_ctx_sp = m_thread.GetRegisterContext(); @@ -227,7 +227,7 @@ RegisterContextLLDB::InitializeZerothFrame() void RegisterContextLLDB::InitializeNonZerothFrame() { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (IsFrameZero ()) { m_frame_type = eNotAValidFrame; @@ -591,7 +591,7 @@ RegisterContextLLDB::GetFastUnwindPlanForFrame () { if (unwind_plan_sp->PlanValidAtAddress (m_current_pc)) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log && log->GetVerbose()) { if (m_fast_unwind_plan_sp) @@ -1456,7 +1456,7 @@ RegisterContextLLDB::ReadPC (addr_t& pc) void RegisterContextLLDB::UnwindLogMsg (const char *fmt, ...) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log) { va_list args; @@ -1482,7 +1482,7 @@ RegisterContextLLDB::UnwindLogMsg (const char *fmt, ...) void RegisterContextLLDB::UnwindLogMsgVerbose (const char *fmt, ...) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log && log->GetVerbose()) { va_list args; diff --git a/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp b/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp index 4f4d2182f25..db0306bd015 100644 --- a/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp +++ b/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp @@ -108,7 +108,7 @@ UnwindLLDB::AddOneMoreFrame (ABI *abi) if (m_unwind_complete) return false; - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); CursorSP cursor_sp(new Cursor ()); // Frame zero is a little different diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index fd9cecaa397..edce0543579 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -171,7 +171,7 @@ GDBRemoteCommunication::CalculcateChecksum (const char *payload, size_t payload_ size_t GDBRemoteCommunication::SendAck () { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); ConnectionStatus status = eConnectionStatusSuccess; char ch = '+'; const size_t bytes_written = Write (&ch, 1, status, NULL); @@ -184,7 +184,7 @@ GDBRemoteCommunication::SendAck () size_t GDBRemoteCommunication::SendNack () { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); ConnectionStatus status = eConnectionStatusSuccess; char ch = '-'; const size_t bytes_written = Write (&ch, 1, status, NULL); @@ -213,7 +213,7 @@ GDBRemoteCommunication::SendPacketNoLock (const char *payload, size_t payload_le packet.PutChar('#'); packet.PutHex8(CalculcateChecksum (payload, payload_length)); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); ConnectionStatus status = eConnectionStatusSuccess; size_t bytes_written = Write (packet.GetData(), packet.GetSize(), status, NULL); if (log) @@ -223,7 +223,7 @@ GDBRemoteCommunication::SendPacketNoLock (const char *payload, size_t payload_le // logs all of the packet will set a boolean so that we don't dump this more // than once if (!m_history.DidDumpToLog ()) - m_history.Dump (log.get()); + m_history.Dump (log); log->Printf ("<%4zu> send packet: %.*s", bytes_written, (int)packet.GetSize(), packet.GetData()); } @@ -285,7 +285,7 @@ GDBRemoteCommunication::WaitForPacketWithTimeoutMicroSecondsNoLock (StringExtrac uint8_t buffer[8192]; Error error; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS | GDBR_LOG_VERBOSE)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS | GDBR_LOG_VERBOSE)); // Check for a packet from our cache first without trying any reading... if (CheckForPacket (NULL, 0, packet)) @@ -340,7 +340,7 @@ GDBRemoteCommunication::CheckForPacket (const uint8_t *src, size_t src_len, Stri // Put the packet data into the buffer in a thread safe fashion Mutex::Locker locker(m_bytes_mutex); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); if (src && src_len > 0) { @@ -457,7 +457,7 @@ GDBRemoteCommunication::CheckForPacket (const uint8_t *src, size_t src_len, Stri // logs all of the packet will set a boolean so that we don't dump this more // than once if (!m_history.DidDumpToLog ()) - m_history.Dump (log.get()); + m_history.Dump (log); log->Printf ("<%4zu> read packet: %.*s", total_length, (int)(total_length), m_bytes.c_str()); } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index df89058d6a6..9351b93761b 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -311,7 +311,7 @@ GDBRemoteCommunicationClient::SendPacketAndWaitForResponse ) { Mutex::Locker locker; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); size_t response_len = 0; if (GetSequenceMutex (locker)) { @@ -527,7 +527,7 @@ GDBRemoteCommunicationClient::SendContinuePacketAndWaitForResponse ) { m_curr_tid = LLDB_INVALID_THREAD_ID; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); if (log) log->Printf ("GDBRemoteCommunicationClient::%s ()", __FUNCTION__); @@ -677,7 +677,7 @@ GDBRemoteCommunicationClient::SendContinuePacketAndWaitForResponse } else if (m_async_packet_predicate.GetValue()) { - LogSP packet_log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); + Log * packet_log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PACKETS)); // We are supposed to send an asynchronous packet while // we are running. @@ -837,7 +837,7 @@ GDBRemoteCommunicationClient::SendInterrupt ) { timed_out = false; - LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_PROCESS | GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_PROCESS | GDBR_LOG_PACKETS)); if (IsRunning()) { @@ -2283,7 +2283,7 @@ GDBRemoteCommunicationClient::GetCurrentThreadIDs (std::vector<lldb::tid_t> &thr #if defined (LLDB_CONFIGURATION_DEBUG) // assert(!"ProcessGDBRemote::UpdateThreadList() failed due to not getting the sequence mutex"); #else - LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_PROCESS | GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_PROCESS | GDBR_LOG_PACKETS)); if (log) log->Printf("error: failed to get packet sequence mutex, not sending packet 'qfThreadInfo'"); #endif diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp index e83ea40c91e..7f7361522a4 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp @@ -60,7 +60,7 @@ GDBRemoteCommunicationServer::~GDBRemoteCommunicationServer() //{ // GDBRemoteCommunicationServer *server = (GDBRemoteCommunicationServer*) arg; // -// LogSP log;// (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); +// Log *log;// (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); // if (log) // log->Printf ("ProcessGDBRemote::%s (arg = %p, pid = %i) thread starting...", __FUNCTION__, arg, process->GetID()); // diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp index 08c9de74b15..bf3dc4d8636 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -248,13 +248,13 @@ GDBRemoteRegisterContext::ReadRegisterBytes (const RegisterInfo *reg_info, DataE } else { - LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); #if LLDB_CONFIGURATION_DEBUG StreamString strm; gdb_comm.DumpHistory(strm); Host::SetCrashDescription (strm.GetData()); assert (!"Didn't get sequence mutex for read register."); #else + Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); if (log) { if (log->GetVerbose()) @@ -468,7 +468,7 @@ GDBRemoteRegisterContext::WriteRegisterBytes (const lldb_private::RegisterInfo * } else { - LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); if (log) { if (log->GetVerbose()) @@ -540,7 +540,7 @@ GDBRemoteRegisterContext::ReadAllRegisterValues (lldb::DataBufferSP &data_sp) } else { - LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); if (log) { if (log->GetVerbose()) @@ -673,7 +673,7 @@ GDBRemoteRegisterContext::WriteAllRegisterValues (const lldb::DataBufferSP &data } else { - LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS)); if (log) { if (log->GetVerbose()) diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 07f4d7b70c1..05c39f97fb5 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -578,7 +578,7 @@ ProcessGDBRemote::DoLaunch (Module *exe_module, const ProcessLaunchInfo &launch_ // ::LogSetBitMask (GDBR_LOG_DEFAULT); // ::LogSetOptions (LLDB_LOG_OPTION_THREADSAFE | LLDB_LOG_OPTION_PREPEND_TIMESTAMP | LLDB_LOG_OPTION_PREPEND_PROC_AND_THREAD); // ::LogSetLogFile ("/dev/stdout"); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); ObjectFile * object_file = exe_module->GetObjectFile(); if (object_file) @@ -798,7 +798,7 @@ ProcessGDBRemote::ConnectToDebugserver (const char *connect_url) void ProcessGDBRemote::DidLaunchOrAttach () { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::DidLaunch()"); if (GetID() != LLDB_INVALID_PROCESS_ID) @@ -1036,7 +1036,7 @@ Error ProcessGDBRemote::DoResume () { Error error; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::Resume()"); @@ -1293,7 +1293,7 @@ bool ProcessGDBRemote::UpdateThreadList (ThreadList &old_thread_list, ThreadList &new_thread_list) { // locker will keep a mutex locked until it goes out of scope - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_THREAD)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_THREAD)); if (log && log->GetMask().Test(GDBR_LOG_VERBOSE)) log->Printf ("ProcessGDBRemote::%s (pid = %" PRIu64 ")", __FUNCTION__, GetID()); @@ -1680,7 +1680,7 @@ ProcessGDBRemote::InterruptIfRunning { Error error; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); bool paused_private_state_thread = false; const bool is_running = m_gdb_comm.IsRunning(); @@ -1749,7 +1749,7 @@ ProcessGDBRemote::InterruptIfRunning Error ProcessGDBRemote::WillDetach () { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::WillDetach()"); @@ -1767,7 +1767,7 @@ Error ProcessGDBRemote::DoDetach() { Error error; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::DoDetach()"); @@ -1798,7 +1798,7 @@ Error ProcessGDBRemote::DoDestroy () { Error error; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::DoDestroy()"); @@ -2177,7 +2177,7 @@ ProcessGDBRemote::EnableBreakpointSite (BreakpointSite *bp_site) Error error; assert (bp_site != NULL); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_BREAKPOINTS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_BREAKPOINTS)); user_id_t site_id = bp_site->GetID(); const addr_t addr = bp_site->GetLoadAddress(); if (log) @@ -2241,7 +2241,7 @@ ProcessGDBRemote::DisableBreakpointSite (BreakpointSite *bp_site) assert (bp_site != NULL); addr_t addr = bp_site->GetLoadAddress(); user_id_t site_id = bp_site->GetID(); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_BREAKPOINTS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_BREAKPOINTS)); if (log) log->Printf ("ProcessGDBRemote::DisableBreakpointSite (site_id = %" PRIu64 ") addr = 0x%8.8" PRIx64, site_id, (uint64_t)addr); @@ -2307,7 +2307,7 @@ ProcessGDBRemote::EnableWatchpoint (Watchpoint *wp, bool notify) { user_id_t watchID = wp->GetID(); addr_t addr = wp->GetLoadAddress(); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_WATCHPOINTS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_WATCHPOINTS)); if (log) log->Printf ("ProcessGDBRemote::EnableWatchpoint(watchID = %" PRIu64 ")", watchID); if (wp->IsEnabled()) @@ -2349,7 +2349,7 @@ ProcessGDBRemote::DisableWatchpoint (Watchpoint *wp, bool notify) { user_id_t watchID = wp->GetID(); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_WATCHPOINTS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_WATCHPOINTS)); addr_t addr = wp->GetLoadAddress(); @@ -2401,7 +2401,7 @@ Error ProcessGDBRemote::DoSignal (int signo) { Error error; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::DoSignal (signal = %d)", signo); @@ -2464,7 +2464,7 @@ ProcessGDBRemote::StartDebugserverProcess (const char *debugserver_url, const Pr m_stdio_communication.Clear(); - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); Args &debugserver_args = debugserver_launch_info.GetArguments(); char arg_cstr[PATH_MAX]; @@ -2553,7 +2553,7 @@ ProcessGDBRemote::StartDebugserverProcess (const char *debugserver_url, const Pr m_debugserver_pid = LLDB_INVALID_PROCESS_ID; if (error.Fail() || log) - error.PutToLog(log.get(), "Host::LaunchProcess (launch_info) => pid=%" PRIu64 ", path='%s'", m_debugserver_pid, debugserver_path); + error.PutToLog(log, "Host::LaunchProcess (launch_info) => pid=%" PRIu64 ", path='%s'", m_debugserver_pid, debugserver_path); } else { @@ -2588,7 +2588,7 @@ ProcessGDBRemote::MonitorDebugserverProcess // "debugserver_pid" argument passed in is the process ID for // debugserver that we are tracking... - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); ProcessGDBRemote *process = (ProcessGDBRemote *)callback_baton; @@ -2689,7 +2689,7 @@ ProcessGDBRemote::Initialize() bool ProcessGDBRemote::StartAsyncThread () { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::%s ()", __FUNCTION__); @@ -2724,7 +2724,7 @@ ProcessGDBRemote::StartAsyncThread () void ProcessGDBRemote::StopAsyncThread () { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::%s ()", __FUNCTION__); @@ -2757,7 +2757,7 @@ ProcessGDBRemote::AsyncThread (void *arg) { ProcessGDBRemote *process = (ProcessGDBRemote*) arg; - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); if (log) log->Printf ("ProcessGDBRemote::%s (arg = %p, pid = %" PRIu64 ") thread starting...", __FUNCTION__, arg, process->GetID()); @@ -2990,7 +2990,7 @@ ProcessGDBRemote::NewThreadNotifyBreakpointHit (void *baton, { // I don't think I have to do anything here, just make sure I notice the new thread when it starts to // run so I can stop it if that's what I want to do. - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf("Hit New Thread Notification breakpoint."); return false; @@ -3000,7 +3000,7 @@ ProcessGDBRemote::NewThreadNotifyBreakpointHit (void *baton, bool ProcessGDBRemote::StartNoticingNewThreads() { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (m_thread_create_bp_sp) { if (log && log->GetVerbose()) @@ -3032,7 +3032,7 @@ ProcessGDBRemote::StartNoticingNewThreads() bool ProcessGDBRemote::StopNoticingNewThreads() { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("Disabling new thread notification breakpoint."); diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp index cb764238683..2bb6826e223 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp @@ -22,39 +22,43 @@ using namespace lldb_private; // control access to our static g_log_sp by hiding it in a singleton function // that will construct the static g_lob_sp the first time this function is // called. -static LogSP & +static bool g_log_enabled = false; +static Log * g_log = NULL; +static Log * GetLog () { - static LogSP g_log_sp; - return g_log_sp; + if (!g_log_enabled) + return NULL; + return g_log; } -LogSP + +Log * ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (uint32_t mask) { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log && mask) { uint32_t log_mask = log->GetMask().Get(); if ((log_mask & mask) != mask) - return LogSP(); + return NULL; } return log; } -LogSP +Log * ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (uint32_t mask) { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log && log->GetMask().Get() & mask) return log; - return LogSP(); + return NULL; } void ProcessGDBRemoteLog::DisableLog (const char **categories, Stream *feedback_strm) { - LogSP log (GetLog ()); + Log *log (GetLog ()); if (log) { uint32_t flag_bits = 0; @@ -91,7 +95,7 @@ ProcessGDBRemoteLog::DisableLog (const char **categories, Stream *feedback_strm) } if (flag_bits == 0) - GetLog ().reset(); + g_log_enabled = false; else log->GetMask().Reset (flag_bits); } @@ -99,24 +103,25 @@ ProcessGDBRemoteLog::DisableLog (const char **categories, Stream *feedback_strm) return; } -LogSP +Log * ProcessGDBRemoteLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const char **categories, Stream *feedback_strm) { // Try see if there already is a log - that way we can reuse its settings. // We could reuse the log in toto, but we don't know that the stream is the same. uint32_t flag_bits = 0; - LogSP log(GetLog ()); - if (log) - flag_bits = log->GetMask().Get(); + if (g_log) + flag_bits = g_log->GetMask().Get(); // Now make a new log with this stream if one was provided if (log_stream_sp) { - log.reset (new Log(log_stream_sp)); - GetLog () = log; + if (g_log) + g_log->SetStream(log_stream_sp); + else + g_log = new Log(log_stream_sp); } - if (log) + if (g_log) { bool got_unknown_category = false; for (size_t i=0; categories[i] != NULL; ++i) @@ -149,10 +154,11 @@ ProcessGDBRemoteLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, c } if (flag_bits == 0) flag_bits = GDBR_LOG_DEFAULT; - log->GetMask().Reset(flag_bits); - log->GetOptions().Reset(log_options); + g_log->GetMask().Reset(flag_bits); + g_log->GetOptions().Reset(log_options); } - return log; + g_log_enabled = true; + return g_log; } void @@ -179,7 +185,7 @@ ProcessGDBRemoteLog::ListLogCategories (Stream *strm) void ProcessGDBRemoteLog::LogIf (uint32_t mask, const char *format, ...) { - LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (mask)); + Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (mask)); if (log) { va_list args; diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h index cf5e176a213..93734067f13 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h @@ -35,16 +35,16 @@ class ProcessGDBRemoteLog { public: - static lldb::LogSP + static lldb_private::Log * GetLogIfAllCategoriesSet(uint32_t mask = 0); - static lldb::LogSP + static lldb_private::Log * GetLogIfAnyCategoryIsSet (uint32_t mask); static void DisableLog (const char **categories, lldb_private::Stream *feedback_strm); - static lldb::LogSP + static lldb_private::Log * EnableLog (lldb::StreamSP &log_stream_sp, uint32_t log_options, const char **categories, lldb_private::Stream *feedback_strm); static void diff --git a/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp index 001cc60aea1..4ac3f687aba 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp @@ -95,7 +95,7 @@ ThreadGDBRemote::WillResume (StateType resume_state) ClearStackFrames(); int signo = GetResumeSignal(); - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (GDBR_LOG_THREAD)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (GDBR_LOG_THREAD)); if (log) log->Printf ("Resuming thread: %4.4" PRIx64 " with state: %s.", GetID(), StateAsCString(resume_state)); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp index 40d5bd269d3..ebfd1e0420d 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp @@ -174,10 +174,10 @@ DWARFCompileUnit::ExtractDIEsIfNeeded (bool cu_die_only) // Keep a flat array of the DIE for binary lookup by DIE offset if (!cu_die_only) { - LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO | DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO | DWARF_LOG_LOOKUPS)); if (log) { - m_dwarf2Data->GetObjectFile()->GetModule()->LogMessageVerboseBacktrace (log.get(), + m_dwarf2Data->GetObjectFile()->GetModule()->LogMessageVerboseBacktrace (log, "DWARFCompileUnit::ExtractDIEsIfNeeded () for compile unit at .debug_info[0x%8.8x]", GetOffset()); } @@ -288,7 +288,7 @@ DWARFCompileUnit::ExtractDIEsIfNeeded (bool cu_die_only) DWARFDebugInfoEntry::collection exact_size_die_array (m_die_array.begin(), m_die_array.end()); exact_size_die_array.swap (m_die_array); } - LogSP log (LogChannelDWARF::GetLogIfAll (DWARF_LOG_DEBUG_INFO | DWARF_LOG_VERBOSE)); + Log *log (LogChannelDWARF::GetLogIfAll (DWARF_LOG_DEBUG_INFO | DWARF_LOG_VERBOSE)); if (log) { StreamString strm; @@ -434,11 +434,11 @@ DWARFCompileUnit::GetFunctionAranges () if (m_func_aranges_ap.get() == NULL) { m_func_aranges_ap.reset (new DWARFDebugAranges()); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); if (log) { - m_dwarf2Data->GetObjectFile()->GetModule()->LogMessage (log.get(), + m_dwarf2Data->GetObjectFile()->GetModule()->LogMessage (log, "DWARFCompileUnit::GetFunctionAranges() for compile unit at .debug_info[0x%8.8x]", GetOffset()); } @@ -609,11 +609,11 @@ DWARFCompileUnit::Index (const uint32_t cu_idx, const uint8_t *fixed_form_sizes = DWARFFormValue::GetFixedFormSizesForAddressSize (GetAddressByteSize()); - LogSP log (LogChannelDWARF::GetLogIfAll (DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll (DWARF_LOG_LOOKUPS)); if (log) { - m_dwarf2Data->GetObjectFile()->GetModule()->LogMessage (log.get(), + m_dwarf2Data->GetObjectFile()->GetModule()->LogMessage (log, "DWARFCompileUnit::Index() for compile unit at .debug_info[0x%8.8x]", GetOffset()); } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp index bcf62b88fef..3b004c4b389 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp @@ -138,7 +138,7 @@ DWARFDebugAranges::Sort (bool minimize) Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p", __PRETTY_FUNCTION__, this); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); size_t orig_arange_size = 0; if (log) { @@ -160,7 +160,7 @@ DWARFDebugAranges::Sort (bool minimize) (uint64_t)delta, (uint64_t)delta * sizeof(Range)); } - Dump (log.get()); + Dump (log); } } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp index 2015b2441f1..40300922713 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp @@ -54,7 +54,7 @@ DWARFDebugInfo::GetCompileUnitAranges () { if (m_cu_aranges_ap.get() == NULL && m_dwarf2Data) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES)); m_cu_aranges_ap.reset (new DWARFDebugAranges()); const DataExtractor &debug_aranges_data = m_dwarf2Data->get_debug_aranges_data(); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp index 0a19aa2cbdd..6c9336a0842 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp @@ -578,7 +578,7 @@ DWARFDebugLine::ParseStatementTable void* userData ) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_LINE)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_LINE)); Prologue::shared_ptr prologue(new Prologue()); @@ -598,11 +598,11 @@ DWARFDebugLine::ParseStatementTable } if (log) - prologue->Dump (log.get()); + prologue->Dump (log); const dw_offset_t end_offset = debug_line_offset + prologue->total_length + sizeof(prologue->total_length); - State state(prologue, log.get(), callback, userData); + State state(prologue, log, callback, userData); while (*offset_ptr < end_offset) { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp index 8e7191e4cb4..3e511007a1e 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp @@ -34,7 +34,7 @@ DWARFDebugPubnames::Extract(const DataExtractor& data) Timer scoped_timer (__PRETTY_FUNCTION__, "DWARFDebugPubnames::Extract (byte_size = %" PRIu64 ")", (uint64_t)data.GetByteSize()); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_PUBNAMES)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_PUBNAMES)); if (log) log->Printf("DWARFDebugPubnames::Extract (byte_size = %" PRIu64 ")", (uint64_t)data.GetByteSize()); @@ -54,7 +54,7 @@ DWARFDebugPubnames::Extract(const DataExtractor& data) break; } if (log) - Dump (log.get()); + Dump (log); return true; } return false; @@ -68,7 +68,7 @@ DWARFDebugPubnames::GeneratePubnames(SymbolFileDWARF* dwarf2Data) "DWARFDebugPubnames::GeneratePubnames (data = %p)", dwarf2Data); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_PUBNAMES)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_PUBNAMES)); if (log) log->Printf("DWARFDebugPubnames::GeneratePubnames (data = %p)", dwarf2Data); @@ -206,7 +206,7 @@ DWARFDebugPubnames::GeneratePubnames(SymbolFileDWARF* dwarf2Data) if (m_sets.empty()) return false; if (log) - Dump (log.get()); + Dump (log); return true; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp index 10f8cef2594..54e789e1fef 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp @@ -86,18 +86,16 @@ void LogChannelDWARF::Delete () { g_log_channel = NULL; - m_log_sp.reset(); } void LogChannelDWARF::Disable (const char **categories, Stream *feedback_strm) { - if (!m_log_sp) + if (m_log_ap.get() == NULL) return; - g_log_channel = this; - uint32_t flag_bits = m_log_sp->GetMask().Get(); + uint32_t flag_bits = m_log_ap->GetMask().Get(); for (size_t i = 0; categories[i] != NULL; ++i) { const char *arg = categories[i]; @@ -122,7 +120,7 @@ LogChannelDWARF::Disable (const char **categories, Stream *feedback_strm) if (flag_bits == 0) Delete (); else - m_log_sp->GetMask().Reset (flag_bits); + m_log_ap->GetMask().Reset (flag_bits); return; } @@ -138,7 +136,11 @@ LogChannelDWARF::Enable { Delete (); - m_log_sp.reset(new Log (log_stream_sp)); + if (m_log_ap) + m_log_ap->SetStream(log_stream_sp); + else + m_log_ap.reset(new Log (log_stream_sp)); + g_log_channel = this; uint32_t flag_bits = 0; bool got_unknown_category = false; @@ -168,9 +170,9 @@ LogChannelDWARF::Enable } if (flag_bits == 0) flag_bits = DWARF_LOG_DEFAULT; - m_log_sp->GetMask().Reset(flag_bits); - m_log_sp->GetOptions().Reset(log_options); - return m_log_sp.get() != NULL; + m_log_ap->GetMask().Reset(flag_bits); + m_log_ap->GetOptions().Reset(log_options); + return m_log_ap.get() != NULL; } void @@ -188,35 +190,35 @@ LogChannelDWARF::ListCategories (Stream *strm) SymbolFileDWARF::GetPluginNameStatic()); } -LogSP +Log * LogChannelDWARF::GetLog () { if (g_log_channel) - return g_log_channel->m_log_sp; + return g_log_channel->m_log_ap.get(); - return LogSP(); + return NULL; } -LogSP +Log * LogChannelDWARF::GetLogIfAll (uint32_t mask) { - if (g_log_channel && g_log_channel->m_log_sp) + if (g_log_channel && g_log_channel->m_log_ap.get()) { - if (g_log_channel->m_log_sp->GetMask().AllSet(mask)) - return g_log_channel->m_log_sp; + if (g_log_channel->m_log_ap->GetMask().AllSet(mask)) + return g_log_channel->m_log_ap.get(); } - return LogSP(); + return NULL; } -LogSP +Log * LogChannelDWARF::GetLogIfAny (uint32_t mask) { - if (g_log_channel && g_log_channel->m_log_sp) + if (g_log_channel && g_log_channel->m_log_ap.get()) { - if (g_log_channel->m_log_sp->GetMask().AnySet(mask)) - return g_log_channel->m_log_sp; + if (g_log_channel->m_log_ap->GetMask().AnySet(mask)) + return g_log_channel->m_log_ap.get(); } - return LogSP(); + return NULL; } void @@ -224,10 +226,13 @@ LogChannelDWARF::LogIf (uint32_t mask, const char *format, ...) { if (g_log_channel) { - LogSP log_sp(g_log_channel->m_log_sp); - va_list args; - va_start (args, format); - log_sp->VAPrintf (format, args); - va_end (args); + Log *log = g_log_channel->m_log_ap.get(); + if (log && log->GetMask().AnySet(mask)) + { + va_list args; + va_start (args, format); + log->VAPrintf (format, args); + va_end (args); + } } } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.h index 1f57f03e621..6a6375cc806 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.h @@ -76,13 +76,13 @@ public: virtual void ListCategories (lldb_private::Stream *strm); - static lldb::LogSP + static lldb_private::Log * GetLog (); - static lldb::LogSP + static lldb_private::Log * GetLogIfAll (uint32_t mask); - static lldb::LogSP + static lldb_private::Log * GetLogIfAny (uint32_t mask); static void diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 6d4e89d110c..3c0624dd68c 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -2061,9 +2061,9 @@ SymbolFileDWARF::ResolveTypeUID (DWARFCompileUnit* cu, const DWARFDebugInfoEntry { if (die != NULL) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ResolveTypeUID (die = 0x%8.8x) %s '%s'", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), @@ -2081,7 +2081,7 @@ SymbolFileDWARF::ResolveTypeUID (DWARFCompileUnit* cu, const DWARFDebugInfoEntry { // Get the type, which could be a forward declaration if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ResolveTypeUID (die = 0x%8.8x) %s '%s' resolve parent forward type for 0x%8.8x", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), @@ -2092,7 +2092,7 @@ SymbolFileDWARF::ResolveTypeUID (DWARFCompileUnit* cu, const DWARFDebugInfoEntry // if (child_requires_parent_class_union_or_struct_to_be_completed(die->Tag())) // { // if (log) -// GetObjectFile()->GetModule()->LogMessage (log.get(), +// GetObjectFile()->GetModule()->LogMessage (log, // "SymbolFileDWARF::ResolveTypeUID (die = 0x%8.8x) %s '%s' resolve parent full type for 0x%8.8x since die is a function", // die->GetOffset(), // DW_TAG_value_to_name(die->Tag()), @@ -2156,10 +2156,10 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_type const dw_tag_t tag = die->Tag(); - LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO|DWARF_LOG_TYPE_COMPLETION)); + Log *log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO|DWARF_LOG_TYPE_COMPLETION)); if (log) { - GetObjectFile()->GetModule()->LogMessageVerboseBacktrace (log.get(), + GetObjectFile()->GetModule()->LogMessageVerboseBacktrace (log, "0x%8.8" PRIx64 ": %s '%s' resolving forward declaration...", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), @@ -2354,7 +2354,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_type { if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (clang_type = %p) caching layout info for record_decl = %p, bit_size = %" PRIu64 ", alignment = %" PRIu64 ", field_offsets[%u], base_offsets[%u], vbase_offsets[%u])", clang_type, record_decl, @@ -2369,7 +2369,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_type llvm::DenseMap <const clang::FieldDecl *, uint64_t>::const_iterator pos, end = layout_info.field_offsets.end(); for (idx = 0, pos = layout_info.field_offsets.begin(); pos != end; ++pos, ++idx) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (clang_type = %p) field[%u] = { bit_offset=%u, name='%s' }", clang_type, idx, @@ -2382,7 +2382,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_type llvm::DenseMap <const clang::CXXRecordDecl *, clang::CharUnits>::const_iterator base_pos, base_end = layout_info.base_offsets.end(); for (idx = 0, base_pos = layout_info.base_offsets.begin(); base_pos != base_end; ++base_pos, ++idx) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (clang_type = %p) base[%u] = { byte_offset=%u, name='%s' }", clang_type, idx, @@ -2394,7 +2394,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (lldb::clang_type_t clang_type llvm::DenseMap <const clang::CXXRecordDecl *, clang::CharUnits>::const_iterator vbase_pos, vbase_end = layout_info.vbase_offsets.end(); for (idx = 0, vbase_pos = layout_info.vbase_offsets.begin(); vbase_pos != vbase_end; ++vbase_pos, ++idx) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (clang_type = %p) vbase[%u] = { byte_offset=%u, name='%s' }", clang_type, idx, @@ -2813,10 +2813,10 @@ SymbolFileDWARF::NamespaceDeclMatchesThisSymbolFile (const ClangNamespaceDecl *n return true; // The ASTs match, return true // The namespace AST was valid, and it does not match... - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) - GetObjectFile()->GetModule()->LogMessage(log.get(), "Valid namespace does not match symbol file"); + GetObjectFile()->GetModule()->LogMessage(log, "Valid namespace does not match symbol file"); return false; } @@ -2830,7 +2830,7 @@ SymbolFileDWARF::DIEIsInNamespace (const ClangNamespaceDecl *namespace_decl, if (namespace_decl == NULL) return true; - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); const DWARFDebugInfoEntry *decl_ctx_die = NULL; clang::DeclContext *die_clang_decl_ctx = GetClangDeclContextContainingDIE (cu, die, &decl_ctx_die); @@ -2843,7 +2843,7 @@ SymbolFileDWARF::DIEIsInNamespace (const ClangNamespaceDecl *namespace_decl, if (decl_ctx_die->Tag() != DW_TAG_namespace) { if (log) - GetObjectFile()->GetModule()->LogMessage(log.get(), "Found a match, but its parent is not a namespace"); + GetObjectFile()->GetModule()->LogMessage(log, "Found a match, but its parent is not a namespace"); return false; } @@ -2864,18 +2864,18 @@ SymbolFileDWARF::DIEIsInNamespace (const ClangNamespaceDecl *namespace_decl, } if (log) - GetObjectFile()->GetModule()->LogMessage(log.get(), "Found a match, but its parent doesn't exist"); + GetObjectFile()->GetModule()->LogMessage(log, "Found a match, but its parent doesn't exist"); return false; } uint32_t SymbolFileDWARF::FindGlobalVariables (const ConstString &name, const lldb_private::ClangNamespaceDecl *namespace_decl, bool append, uint32_t max_matches, VariableList& variables) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindGlobalVariables (name=\"%s\", namespace_decl=%p, append=%u, max_matches=%u, variables)", name.GetCString(), namespace_decl, @@ -2980,7 +2980,7 @@ SymbolFileDWARF::FindGlobalVariables (const ConstString &name, const lldb_privat const uint32_t num_matches = variables.GetSize() - original_size; if (log && num_matches > 0) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindGlobalVariables (name=\"%s\", namespace_decl=%p, append=%u, max_matches=%u, variables) => %u", name.GetCString(), namespace_decl, @@ -2994,11 +2994,11 @@ SymbolFileDWARF::FindGlobalVariables (const ConstString &name, const lldb_privat uint32_t SymbolFileDWARF::FindGlobalVariables(const RegularExpression& regex, bool append, uint32_t max_matches, VariableList& variables) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindGlobalVariables (regex=\"%s\", append=%u, max_matches=%u, variables)", regex.GetText(), append, @@ -3322,11 +3322,11 @@ SymbolFileDWARF::FindFunctions (const ConstString &name, "SymbolFileDWARF::FindFunctions (name = '%s')", name.AsCString()); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindFunctions (name=\"%s\", name_type_mask=0x%x, append=%u, sc_list)", name.GetCString(), name_type_mask, @@ -3607,7 +3607,7 @@ SymbolFileDWARF::FindFunctions (const ConstString &name, if (log && num_matches > 0) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindFunctions (name=\"%s\", name_type_mask=0x%x, append=%u, sc_list) => %u", name.GetCString(), name_type_mask, @@ -3624,11 +3624,11 @@ SymbolFileDWARF::FindFunctions(const RegularExpression& regex, bool include_inli "SymbolFileDWARF::FindFunctions (regex = '%s')", regex.GetText()); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindFunctions (regex=\"%s\", append=%u, sc_list)", regex.GetText(), append); @@ -3675,13 +3675,13 @@ SymbolFileDWARF::FindTypes (const SymbolContext& sc, if (info == NULL) return 0; - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) { if (namespace_decl) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindTypes (sc, name=\"%s\", clang::NamespaceDecl(%p) \"%s\", append=%u, max_matches=%u, type_list)", name.GetCString(), namespace_decl->GetNamespaceDecl(), @@ -3691,7 +3691,7 @@ SymbolFileDWARF::FindTypes (const SymbolContext& sc, } else { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindTypes (sc, name=\"%s\", clang::NamespaceDecl(NULL), append=%u, max_matches=%u, type_list)", name.GetCString(), append, @@ -3766,7 +3766,7 @@ SymbolFileDWARF::FindTypes (const SymbolContext& sc, { if (namespace_decl) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindTypes (sc, name=\"%s\", clang::NamespaceDecl(%p) \"%s\", append=%u, max_matches=%u, type_list) => %u", name.GetCString(), namespace_decl->GetNamespaceDecl(), @@ -3777,7 +3777,7 @@ SymbolFileDWARF::FindTypes (const SymbolContext& sc, } else { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindTypes (sc, name=\"%s\", clang::NamespaceDecl(NULL), append=%u, max_matches=%u, type_list) => %u", name.GetCString(), append, @@ -3796,11 +3796,11 @@ SymbolFileDWARF::FindNamespace (const SymbolContext& sc, const ConstString &name, const lldb_private::ClangNamespaceDecl *parent_namespace_decl) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_LOOKUPS)); if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindNamespace (sc, name=\"%s\")", name.GetCString()); } @@ -3870,7 +3870,7 @@ SymbolFileDWARF::FindNamespace (const SymbolContext& sc, } if (log && namespace_decl.GetNamespaceDecl()) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindNamespace (sc, name=\"%s\") => clang::NamespaceDecl(%p) \"%s\"", name.GetCString(), namespace_decl.GetNamespaceDecl(), @@ -4324,12 +4324,12 @@ SymbolFileDWARF::ResolveNamespaceDIE (DWARFCompileUnit *dwarf_cu, const DWARFDeb const char *namespace_name = die->GetAttributeValueAsString(this, dwarf_cu, DW_AT_name, NULL); clang::DeclContext *containing_decl_ctx = GetClangDeclContextContainingDIE (dwarf_cu, die, NULL); namespace_decl = GetClangASTContext().GetUniqueNamespaceDeclaration (namespace_name, containing_decl_ctx); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); if (log) { if (namespace_name) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "ASTContext => %p: 0x%8.8" PRIx64 ": DW_TAG_namespace with DW_AT_name(\"%s\") => clang::NamespaceDecl *%p (original = %p)", GetClangASTContext().getASTContext(), MakeUserID(die->GetOffset()), @@ -4339,7 +4339,7 @@ SymbolFileDWARF::ResolveNamespaceDIE (DWARFCompileUnit *dwarf_cu, const DWARFDeb } else { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "ASTContext => %p: 0x%8.8" PRIx64 ": DW_TAG_namespace (anonymous) => clang::NamespaceDecl *%p (original = %p)", GetClangASTContext().getASTContext(), MakeUserID(die->GetOffset()), @@ -4372,9 +4372,9 @@ SymbolFileDWARF::GetClangDeclContextForDIE (const SymbolContext &sc, DWARFCompil if (die_offset != DW_INVALID_OFFSET) return GetClangDeclContextForDIEOffset (sc, die_offset); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); if (log) - GetObjectFile()->GetModule()->LogMessage(log.get(), "SymbolFileDWARF::GetClangDeclContextForDIE (die = 0x%8.8x) %s '%s'", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), die->GetName(this, cu)); + GetObjectFile()->GetModule()->LogMessage(log, "SymbolFileDWARF::GetClangDeclContextForDIE (die = 0x%8.8x) %s '%s'", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), die->GetName(this, cu)); // This is the DIE we want. Parse it, then query our map. bool assert_not_being_parsed = true; ResolveTypeUID (cu, die, assert_not_being_parsed); @@ -4769,11 +4769,11 @@ SymbolFileDWARF::FindDefinitionTypeForDIE (DWARFCompileUnit* cu, std::string qualified_name; - LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_TYPE_COMPLETION|DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_TYPE_COMPLETION|DWARF_LOG_LOOKUPS)); if (log) { die->GetQualifiedName(this, cu, qualified_name); - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindDefinitionTypeForDIE(die=0x%8.8x (%s), name='%s')", die->GetOffset(), qualified_name.c_str(), @@ -4795,13 +4795,13 @@ SymbolFileDWARF::FindDefinitionTypeForDIE (DWARFCompileUnit* cu, const uint32_t qualified_name_hash = MappedHash::HashStringUsingDJB (qualified_name.c_str()); if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(),"FindByNameAndTagAndQualifiedNameHash()"); + GetObjectFile()->GetModule()->LogMessage (log,"FindByNameAndTagAndQualifiedNameHash()"); m_apple_types_ap->FindByNameAndTagAndQualifiedNameHash (type_name.GetCString(), die->Tag(), qualified_name_hash, die_offsets); } else if (has_tag > 1) { if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(),"FindByNameAndTag()"); + GetObjectFile()->GetModule()->LogMessage (log,"FindByNameAndTag()"); m_apple_types_ap->FindByNameAndTag (type_name.GetCString(), die->Tag(), die_offsets); } else @@ -4876,7 +4876,7 @@ SymbolFileDWARF::FindDefinitionTypeForDIE (DWARFCompileUnit* cu, { std::string qualified_name; type_die->GetQualifiedName(this, cu, qualified_name); - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindDefinitionTypeForDIE(die=0x%8.8x, name='%s') trying die=0x%8.8x (%s)", die->GetOffset(), type_name.GetCString(), @@ -4909,7 +4909,7 @@ SymbolFileDWARF::FindDefinitionTypeForDIE (DWARFCompileUnit* cu, { std::string qualified_name; type_die->GetQualifiedName(this, cu, qualified_name); - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindDefinitionTypeForDIE(die=0x%8.8x, name='%s') ignoring die=0x%8.8x (%s)", die->GetOffset(), type_name.GetCString(), @@ -4945,10 +4945,10 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext & if (type_name) { - LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_TYPE_COMPLETION|DWARF_LOG_LOOKUPS)); + Log *log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_TYPE_COMPLETION|DWARF_LOG_LOOKUPS)); if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=%s, qualified-name='%s')", DW_TAG_value_to_name(dwarf_decl_ctx[0].tag), dwarf_decl_ctx.GetQualifiedName()); @@ -4967,13 +4967,13 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext & const char *qualified_name = dwarf_decl_ctx.GetQualifiedName(); const uint32_t qualified_name_hash = MappedHash::HashStringUsingDJB (qualified_name); if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(),"FindByNameAndTagAndQualifiedNameHash()"); + GetObjectFile()->GetModule()->LogMessage (log,"FindByNameAndTagAndQualifiedNameHash()"); m_apple_types_ap->FindByNameAndTagAndQualifiedNameHash (type_name.GetCString(), tag, qualified_name_hash, die_offsets); } else if (has_tag) { if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(),"FindByNameAndTag()"); + GetObjectFile()->GetModule()->LogMessage (log,"FindByNameAndTag()"); m_apple_types_ap->FindByNameAndTag (type_name.GetCString(), tag, die_offsets); } else @@ -5045,7 +5045,7 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext & if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=%s, qualified-name='%s') trying die=0x%8.8x (%s)", DW_TAG_value_to_name(dwarf_decl_ctx[0].tag), dwarf_decl_ctx.GetQualifiedName(), @@ -5070,7 +5070,7 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext & { std::string qualified_name; type_die->GetQualifiedName(this, type_cu, qualified_name); - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(tag=%s, qualified-name='%s') ignoring die=0x%8.8x (%s)", DW_TAG_value_to_name(dwarf_decl_ctx[0].tag), dwarf_decl_ctx.GetQualifiedName(), @@ -5166,7 +5166,7 @@ SymbolFileDWARF::CopyUniqueClassMethodTypes (SymbolFileDWARF *src_symfile, } const uint32_t src_size = src_name_to_die.GetSize (); const uint32_t dst_size = dst_name_to_die.GetSize (); - LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO | DWARF_LOG_TYPE_COMPLETION)); + Log *log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO | DWARF_LOG_TYPE_COMPLETION)); // Is everything kosher so we can go through the members at top speed? bool fast_path = true; @@ -5399,13 +5399,13 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, AccessType accessibility = eAccessNone; if (die != NULL) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); if (log) { const DWARFDebugInfoEntry *context_die; clang::DeclContext *context = GetClangDeclContextContainingDIE (dwarf_cu, die, &context_die); - GetObjectFile()->GetModule()->LogMessage (log.get(), "SymbolFileDWARF::ParseType (die = 0x%8.8x, decl_ctx = %p (die 0x%8.8x)) %s name = '%s')", + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ParseType (die = 0x%8.8x, decl_ctx = %p (die 0x%8.8x)) %s name = '%s')", die->GetOffset(), context, context_die->GetOffset(), @@ -5414,16 +5414,16 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, #if defined(LLDB_CONFIGURATION_DEBUG) or defined(LLDB_CONFIGURATION_RELEASE) scoped_die_logger.Push (dwarf_cu, die); - g_die_stack.LogDIEs(log.get(), this); + g_die_stack.LogDIEs(log, this); #endif } // -// LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); +// Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); // if (log && dwarf_cu) // { // StreamString s; // die->DumpLocation (this, dwarf_cu, s); -// GetObjectFile()->GetModule()->LogMessage (log.get(), "SymbolFileDwarf::%s %s", __FUNCTION__, s.GetData()); +// GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDwarf::%s %s", __FUNCTION__, s.GetData()); // // } @@ -5554,7 +5554,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, if (type_name_const_str == g_objc_type_name_id) { if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is Objective C 'id' built-in type.", + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is Objective C 'id' built-in type.", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), die->GetName(this, dwarf_cu)); @@ -5567,7 +5567,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, else if (type_name_const_str == g_objc_type_name_Class) { if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is Objective C 'Class' built-in type.", + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is Objective C 'Class' built-in type.", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), die->GetName(this, dwarf_cu)); @@ -5579,7 +5579,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, else if (type_name_const_str == g_objc_type_name_selector) { if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is Objective C 'selector' built-in type.", + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is Objective C 'selector' built-in type.", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), die->GetName(this, dwarf_cu)); @@ -5602,7 +5602,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, if (!strcmp(struct_name, "objc_object")) { if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is 'objc_object*', which we overrode to 'id'.", + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' is 'objc_object*', which we overrode to 'id'.", die->GetOffset(), DW_TAG_value_to_name(die->Tag()), die->GetName(this, dwarf_cu)); @@ -5811,7 +5811,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, { if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF(%p) - 0x%8.8x: %s type \"%s\" is an incomplete objc type, complete type is 0x%8.8" PRIx64, this, die->GetOffset(), @@ -5839,7 +5839,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, // DWARF. If this fails, we need to look elsewhere... if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF(%p) - 0x%8.8x: %s type \"%s\" is a forward declaration, trying to find complete type", this, die->GetOffset(), @@ -5865,7 +5865,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, { if (log) { - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF(%p) - 0x%8.8x: %s type \"%s\" is a forward declaration, complete type is 0x%8.8" PRIx64, this, die->GetOffset(), @@ -7682,7 +7682,7 @@ SymbolFileDWARF::LayoutRecordType (const clang::RecordDecl *record_decl, llvm::DenseMap <const clang::CXXRecordDecl *, clang::CharUnits> &base_offsets, llvm::DenseMap <const clang::CXXRecordDecl *, clang::CharUnits> &vbase_offsets) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO)); RecordDeclToLayoutMap::iterator pos = m_record_decl_to_layout_map.find (record_decl); bool success = false; base_offsets.clear(); @@ -7705,7 +7705,7 @@ SymbolFileDWARF::LayoutRecordType (const clang::RecordDecl *record_decl, } if (log) - GetObjectFile()->GetModule()->LogMessage (log.get(), + GetObjectFile()->GetModule()->LogMessage (log, "SymbolFileDWARF::LayoutRecordType (record_decl = %p, bit_size = %" PRIu64 ", alignment = %" PRIu64 ", field_offsets[%u],base_offsets[%u], vbase_offsets[%u]) success = %i", record_decl, bit_size, diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index 521e4fe57b8..096b5fc0717 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -55,7 +55,7 @@ SymbolFileDWARFDebugMap::CompileUnitInfo::GetFileRangeMap(SymbolFileDWARFDebugMa ObjectFile *oso_objfile = oso_module->GetObjectFile(); - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_MAP)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_MAP)); if (log) { ConstString object_name (oso_module->GetObjectName()); @@ -330,7 +330,7 @@ SymbolFileDWARFDebugMap::InitOSO() Symtab* symtab = m_obj_file->GetSymtab(); if (symtab) { - LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_MAP)); + Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_MAP)); std::vector<uint32_t> oso_indexes; // When a mach-o symbol is encoded, the n_type field is encoded in bits diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp index 8f9217231f4..55eb7037192 100644 --- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp +++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp @@ -59,7 +59,7 @@ UnwindAssemblyInstEmulation::GetNonCallSiteUnwindPlanFromAssembly (AddressRange& exe_ctx, range)); - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (disasm_sp) { @@ -397,7 +397,7 @@ UnwindAssemblyInstEmulation::ReadMemory (EmulateInstruction *instruction, void *dst, size_t dst_len) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log && log->GetVerbose ()) { @@ -438,7 +438,7 @@ UnwindAssemblyInstEmulation::WriteMemory (EmulateInstruction *instruction, instruction->GetArchitecture ().GetByteOrder(), instruction->GetArchitecture ().GetAddressByteSize()); - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log && log->GetVerbose ()) { @@ -545,7 +545,7 @@ UnwindAssemblyInstEmulation::ReadRegister (EmulateInstruction *instruction, { bool synthetic = GetRegisterValue (*reg_info, reg_value); - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log && log->GetVerbose ()) { @@ -575,7 +575,7 @@ UnwindAssemblyInstEmulation::WriteRegister (EmulateInstruction *instruction, const RegisterInfo *reg_info, const RegisterValue ®_value) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log && log->GetVerbose ()) { diff --git a/lldb/source/Symbol/Block.cpp b/lldb/source/Symbol/Block.cpp index 42ade8c9ab3..f410bd62de3 100644 --- a/lldb/source/Symbol/Block.cpp +++ b/lldb/source/Symbol/Block.cpp @@ -395,7 +395,7 @@ Block::AddRange (const Range& range) Block *parent_block = GetParent (); if (parent_block && !parent_block->Contains(range)) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); if (log) { ModuleSP module_sp (m_parent_scope->CalculateSymbolContextModule()); diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index c04aa562979..ed8d98da075 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -596,7 +596,7 @@ public: return new NullDiagnosticConsumer (); } private: - LogSP m_log; + Log * m_log; }; DiagnosticConsumer * diff --git a/lldb/source/Symbol/ClangASTImporter.cpp b/lldb/source/Symbol/ClangASTImporter.cpp index 57e5b216f62..d3499b99342 100644 --- a/lldb/source/Symbol/ClangASTImporter.cpp +++ b/lldb/source/Symbol/ClangASTImporter.cpp @@ -24,7 +24,7 @@ using namespace clang; ClangASTMetrics::Counters ClangASTMetrics::global_counters = { 0, 0, 0, 0, 0, 0 }; ClangASTMetrics::Counters ClangASTMetrics::local_counters = { 0, 0, 0, 0, 0, 0 }; -void ClangASTMetrics::DumpCounters (lldb::LogSP log, ClangASTMetrics::Counters &counters) +void ClangASTMetrics::DumpCounters (Log *log, ClangASTMetrics::Counters &counters) { log->Printf(" Number of visible Decl queries by name : %" PRIu64, counters.m_visible_query_count); log->Printf(" Number of lexical Decl queries : %" PRIu64, counters.m_lexical_query_count); @@ -34,7 +34,7 @@ void ClangASTMetrics::DumpCounters (lldb::LogSP log, ClangASTMetrics::Counters & log->Printf(" Number of records laid out : %" PRIu64, counters.m_record_layout_count); } -void ClangASTMetrics::DumpCounters (lldb::LogSP log) +void ClangASTMetrics::DumpCounters (Log *log) { if (!log) return; @@ -82,7 +82,7 @@ ClangASTImporter::CopyDecl (clang::ASTContext *dst_ast, if (!result) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { @@ -151,7 +151,7 @@ ClangASTImporter::DeportDecl (clang::ASTContext *dst_ctx, clang::ASTContext *src_ctx, clang::Decl *decl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf(" [ClangASTImporter] DeportDecl called on (%sDecl*)%p from (ASTContext*)%p to (ASTContex*)%p", @@ -199,7 +199,7 @@ ClangASTImporter::DeportDecl (clang::ASTContext *dst_ctx, void ClangASTImporter::CompleteDecl (clang::Decl *decl) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf(" [ClangASTImporter] CompleteDecl called on (%sDecl*)%p", @@ -283,8 +283,6 @@ bool ClangASTImporter::CompleteObjCInterfaceDecl (clang::ObjCInterfaceDecl *interface_decl) { ClangASTMetrics::RegisterDeclCompletion(); - - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); DeclOrigin decl_origin = GetDeclOrigin(interface_decl); @@ -431,7 +429,7 @@ ClangASTImporter::BuildNamespaceMap(const clang::NamespaceDecl *decl) void ClangASTImporter::ForgetDestination (clang::ASTContext *dst_ast) { - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf(" [ClangASTImporter] Forgetting destination (ASTContext*)%p", dst_ast); @@ -444,7 +442,7 @@ ClangASTImporter::ForgetSource (clang::ASTContext *dst_ast, clang::ASTContext *s { ASTContextMetadataSP md = MaybeGetContextMetadata (dst_ast); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf(" [ClangASTImporter] Forgetting source->dest (ASTContext*)%p->(ASTContext*)%p", src_ast, dst_ast); @@ -536,7 +534,7 @@ clang::Decl { ClangASTMetrics::RegisterClangImport(); - lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) { diff --git a/lldb/source/Symbol/DWARFCallFrameInfo.cpp b/lldb/source/Symbol/DWARFCallFrameInfo.cpp index bc03567fb9e..003b945a5ac 100644 --- a/lldb/source/Symbol/DWARFCallFrameInfo.cpp +++ b/lldb/source/Symbol/DWARFCallFrameInfo.cpp @@ -303,9 +303,9 @@ DWARFCallFrameInfo::GetCFIData() { if (m_cfi_data_initialized == false) { - LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND)); if (log) - m_objfile.GetModule()->LogMessage(log.get(), "Reading EH frame info"); + m_objfile.GetModule()->LogMessage(log, "Reading EH frame info"); m_objfile.ReadSectionData (m_section_sp.get(), m_cfi_data); m_cfi_data_initialized = true; } diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp index 4ad515b94d8..5451f6941f7 100644 --- a/lldb/source/Symbol/ObjectFile.cpp +++ b/lldb/source/Symbol/ObjectFile.cpp @@ -208,7 +208,7 @@ ObjectFile::ObjectFile (const lldb::ModuleSP &module_sp, m_file = *file_spec_ptr; if (data_sp) m_data.SetData (data_sp, data_offset, length); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) { const ConstString object_name (module_sp->GetObjectName()); @@ -261,7 +261,7 @@ ObjectFile::ObjectFile (const lldb::ModuleSP &module_sp, { if (header_data_sp) m_data.SetData (header_data_sp, 0, header_data_sp->GetByteSize()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) { const ConstString object_name (module_sp->GetObjectName()); @@ -280,7 +280,7 @@ ObjectFile::ObjectFile (const lldb::ModuleSP &module_sp, ObjectFile::~ObjectFile() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p ObjectFile::~ObjectFile ()\n", this); } @@ -541,7 +541,7 @@ ObjectFile::ClearSymtab () if (module_sp) { lldb_private::Mutex::Locker locker(module_sp->GetMutex()); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) { log->Printf ("%p ObjectFile::ClearSymtab () symtab = %p", diff --git a/lldb/source/Symbol/SymbolContext.cpp b/lldb/source/Symbol/SymbolContext.cpp index b4b777b52ff..97fe9061a21 100644 --- a/lldb/source/Symbol/SymbolContext.cpp +++ b/lldb/source/Symbol/SymbolContext.cpp @@ -493,7 +493,7 @@ SymbolContext::GetParentOfInlinedScope (const Address &curr_frame_pc, } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); if (log) { diff --git a/lldb/source/Target/Memory.cpp b/lldb/source/Target/Memory.cpp index 1e3bfc1450d..ae8d034f77b 100644 --- a/lldb/source/Target/Memory.cpp +++ b/lldb/source/Target/Memory.cpp @@ -225,7 +225,7 @@ AllocatedBlock::ReserveBlock (uint32_t size) if (size <= m_byte_size) { const uint32_t needed_chunks = CalculateChunksNeededForSize (size); - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); if (m_offset_to_chunk_size.empty()) { @@ -324,7 +324,7 @@ AllocatedBlock::ReserveBlock (uint32_t size) // return m_addr + m_chunk_size * first_chunk_idx; // } } - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); if (log) log->Printf ("AllocatedBlock::ReserveBlock (size = %u (0x%x)) => 0x%16.16" PRIx64, size, size, (uint64_t)addr); return addr; @@ -341,7 +341,7 @@ AllocatedBlock::FreeBlock (addr_t addr) m_offset_to_chunk_size.erase (pos); success = true; } - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); if (log) log->Printf ("AllocatedBlock::FreeBlock (addr = 0x%16.16" PRIx64 ") => %i", (uint64_t)addr, success); return success; @@ -387,7 +387,7 @@ AllocatedMemoryCache::AllocatePage (uint32_t byte_size, addr_t addr = m_process.DoAllocateMemory(page_byte_size, permissions, error); - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) { log->Printf ("Process::DoAllocateMemory (byte_size = 0x%8.8zx, permissions = %s) => 0x%16.16" PRIx64, @@ -426,7 +426,7 @@ AllocatedMemoryCache::AllocateMemory (size_t byte_size, if (block_sp) addr = block_sp->ReserveBlock (byte_size); } - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("AllocatedMemoryCache::AllocateMemory (byte_size = 0x%8.8zx, permissions = %s) => 0x%16.16" PRIx64, byte_size, GetPermissionsAsCString(permissions), (uint64_t)addr); return addr; @@ -447,7 +447,7 @@ AllocatedMemoryCache::DeallocateMemory (lldb::addr_t addr) break; } } - LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf("AllocatedMemoryCache::DeallocateMemory (addr = 0x%16.16" PRIx64 ") => %i", (uint64_t)addr, success); return success; diff --git a/lldb/source/Target/ObjCLanguageRuntime.cpp b/lldb/source/Target/ObjCLanguageRuntime.cpp index 4877cba50a5..87dfc79289c 100644 --- a/lldb/source/Target/ObjCLanguageRuntime.cpp +++ b/lldb/source/Target/ObjCLanguageRuntime.cpp @@ -57,7 +57,7 @@ ObjCLanguageRuntime::AddClass (ObjCISA isa, const ClassDescriptorSP &descriptor_ void ObjCLanguageRuntime::AddToMethodCache (lldb::addr_t class_addr, lldb::addr_t selector, lldb::addr_t impl_addr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { log->Printf ("Caching: class 0x%" PRIx64 " selector 0x%" PRIx64 " implementation 0x%" PRIx64 ".", class_addr, selector, impl_addr); diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp index 6b197bcffef..dddccad07bf 100644 --- a/lldb/source/Target/Platform.cpp +++ b/lldb/source/Target/Platform.cpp @@ -217,7 +217,7 @@ Platform::Platform (bool is_host) : m_max_uid_name_len (0), m_max_gid_name_len (0) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Platform::Platform()", this); } @@ -230,7 +230,7 @@ Platform::Platform (bool is_host) : //------------------------------------------------------------------ Platform::~Platform() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Platform::~Platform()", this); } diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 96147c36e35..c86bb6574cb 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -1028,7 +1028,7 @@ Process::Process(Target &target, Listener &listener) : { CheckInWithManager (); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Process::Process()", this); @@ -1064,7 +1064,7 @@ Process::Process(Target &target, Listener &listener) : //---------------------------------------------------------------------- Process::~Process() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Process::~Process()", this); StopPrivateStateThread(); @@ -1303,7 +1303,7 @@ Process::RestorePrivateProcessEvents () StateType Process::WaitForStateChangedEvents (const TimeValue *timeout, EventSP &event_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s (timeout = %p, event_sp)...", __FUNCTION__, timeout); @@ -1331,7 +1331,7 @@ Process::WaitForStateChangedEvents (const TimeValue *timeout, EventSP &event_sp) Event * Process::PeekAtStateChangedEvents () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s...", __FUNCTION__); @@ -1359,7 +1359,7 @@ Process::PeekAtStateChangedEvents () StateType Process::WaitForStateChangedEventsPrivate (const TimeValue *timeout, EventSP &event_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s (timeout = %p, event_sp)...", __FUNCTION__, timeout); @@ -1388,7 +1388,7 @@ Process::WaitForStateChangedEventsPrivate (const TimeValue *timeout, EventSP &ev bool Process::WaitForEventsPrivate (const TimeValue *timeout, EventSP &event_sp, bool control_only) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s (timeout = %p, event_sp)...", __FUNCTION__, timeout); @@ -1425,7 +1425,7 @@ Process::GetExitDescription () bool Process::SetExitStatus (int status, const char *cstr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::SetExitStatus (status=%i (0x%8.8x), description=%s%s%s)", status, status, @@ -1465,7 +1465,7 @@ Process::SetProcessExitStatus (void *callback_baton, int exit_status // Exit value of process if signal is zero ) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::SetProcessExitStatus (baton=%p, pid=%" PRIu64 ", exited=%i, signal=%i, exit_status=%i)\n", callback_baton, @@ -1595,7 +1595,7 @@ Process::GetState() void Process::SetPublicState (StateType new_state) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::SetPublicState (%s)", StateAsCString(new_state)); const StateType old_state = m_public_state.GetValue(); @@ -1632,7 +1632,7 @@ Process::SetPublicState (StateType new_state) Error Process::Resume () { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::Resume -- locking run lock"); if (!m_run_lock.WriteTryLock()) @@ -1654,7 +1654,7 @@ Process::GetPrivateState () void Process::SetPrivateState (StateType new_state) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS)); bool state_changed = false; if (log) @@ -2101,7 +2101,7 @@ Process::EnableSoftwareBreakpoint (BreakpointSite *bp_site) { Error error; assert (bp_site != NULL); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); const addr_t bp_addr = bp_site->GetLoadAddress(); if (log) log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64, bp_site->GetID(), (uint64_t)bp_addr); @@ -2178,7 +2178,7 @@ Process::DisableSoftwareBreakpoint (BreakpointSite *bp_site) { Error error; assert (bp_site != NULL); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); addr_t bp_addr = bp_site->GetLoadAddress(); lldb::user_id_t breakID = bp_site->GetID(); if (log) @@ -2609,7 +2609,7 @@ Process::AllocateMemory(size_t size, uint32_t permissions, Error &error) return m_allocated_memory_cache.AllocateMemory(size, permissions, error); #else addr_t allocated_addr = DoAllocateMemory (size, permissions, error); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::AllocateMemory(size=%4zu, permissions=%s) => 0x%16.16" PRIx64 " (m_stop_id = %u m_memory_id = %u)", size, @@ -2661,7 +2661,7 @@ Process::DeallocateMemory (addr_t ptr) #else error = DoDeallocateMemory (ptr); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::DeallocateMemory(addr=0x%16.16" PRIx64 ") => err = %s (m_stop_id = %u, m_memory_id = %u)", ptr, @@ -3155,7 +3155,7 @@ Process::ConnectRemote (Stream *strm, const char *remote_url) Error Process::PrivateResume () { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PROCESS|LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PROCESS|LIBLLDB_LOG_STEP)); if (log) log->Printf("Process::PrivateResume() m_stop_id = %u, public state: %s private state: %s", m_mod_id.GetStopID(), @@ -3273,7 +3273,7 @@ Process::Halt () } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::Halt() failed to stop, state is: %s", StateAsCString(state)); error.SetErrorString ("Did not get stopped event after halt."); @@ -3331,7 +3331,7 @@ Process::Destroy () EventSP exit_event_sp; if (m_public_state.GetValue() == eStateRunning) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Process::Destroy() About to halt."); error = Halt(); @@ -3443,7 +3443,7 @@ Process::ShouldBroadcastEvent (Event *event_ptr) { const StateType state = Process::ProcessEventData::GetStateFromEvent (event_ptr); bool return_value = true; - LogSP log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_EVENTS | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_EVENTS | LIBLLDB_LOG_PROCESS)); switch (state) { @@ -3589,7 +3589,7 @@ Process::ShouldBroadcastEvent (Event *event_ptr) bool Process::StartPrivateStateThread (bool force) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EVENTS)); bool already_running = PrivateStateThreadIsValid (); if (log) @@ -3637,7 +3637,7 @@ Process::StopPrivateStateThread () ControlPrivateStateThread (eBroadcastInternalStateControlStop); else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Went to stop the private state thread, but it was already invalid."); } @@ -3646,7 +3646,7 @@ Process::StopPrivateStateThread () void Process::ControlPrivateStateThread (uint32_t signal) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); assert (signal == eBroadcastInternalStateControlStop || signal == eBroadcastInternalStateControlPause || @@ -3712,7 +3712,7 @@ Process::SendAsyncInterrupt () void Process::HandlePrivateEvent (EventSP &event_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); m_currently_handling_event.SetValue(true, eBroadcastNever); const StateType new_state = Process::ProcessEventData::GetStateFromEvent(event_sp.get()); @@ -3799,7 +3799,7 @@ Process::RunPrivateStateThread () bool control_only = true; m_private_state_control_wait.SetValue (false, eBroadcastNever); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") thread starting...", __FUNCTION__, this, GetID()); @@ -3961,7 +3961,7 @@ Process::ProcessEventData::DoOnRemoval (Event *event_ptr) curr_thread_list = m_process_sp->GetThreadList(); if (curr_thread_list.GetSize() != num_threads) { - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_PROCESS)); if (log) log->Printf("Number of threads changed from %u to %u while processing event.", num_threads, curr_thread_list.GetSize()); break; @@ -3971,7 +3971,7 @@ Process::ProcessEventData::DoOnRemoval (Event *event_ptr) if (thread_sp->GetIndexID() != thread_index_array[idx]) { - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_PROCESS)); if (log) log->Printf("The thread at position %u changed from %u to %u while processing event.", idx, @@ -4218,7 +4218,7 @@ Process::GetAsyncProfileData (char *buf, size_t buf_size, Error &error) size_t bytes_available = m_profile_data.front().size(); if (bytes_available > 0) { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::GetProfileData (buf = %p, size = %" PRIu64 ")", buf, (uint64_t)buf_size); if (bytes_available > buf_size) @@ -4248,7 +4248,7 @@ Process::GetSTDOUT (char *buf, size_t buf_size, Error &error) size_t bytes_available = m_stdout_data.size(); if (bytes_available > 0) { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::GetSTDOUT (buf = %p, size = %" PRIu64 ")", buf, (uint64_t)buf_size); if (bytes_available > buf_size) @@ -4274,7 +4274,7 @@ Process::GetSTDERR (char *buf, size_t buf_size, Error &error) size_t bytes_available = m_stderr_data.size(); if (bytes_available > 0) { - LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::GetSTDERR (buf = %p, size = %" PRIu64 ")", buf, (uint64_t)buf_size); if (bytes_available > buf_size) @@ -4523,7 +4523,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, lldb::StateType old_state; lldb::ThreadPlanSP stopper_base_plan_sp; - lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_PROCESS)); if (Host::GetCurrentThread() == m_private_state_thread) { // Yikes, we are running on the private state thread! So we can't wait for public events on this thread, since diff --git a/lldb/source/Target/SectionLoadList.cpp b/lldb/source/Target/SectionLoadList.cpp index 6a701b35ce9..9b4bdd0838f 100644 --- a/lldb/source/Target/SectionLoadList.cpp +++ b/lldb/source/Target/SectionLoadList.cpp @@ -59,7 +59,7 @@ SectionLoadList::GetSectionLoadAddress (const lldb::SectionSP §ion) const bool SectionLoadList::SetSectionLoadAddress (const lldb::SectionSP §ion, addr_t load_addr, bool warn_multiple) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE)); if (log) { @@ -136,7 +136,7 @@ SectionLoadList::SetSectionUnloaded (const lldb::SectionSP §ion_sp) if (section_sp) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE)); if (log) { @@ -170,7 +170,7 @@ SectionLoadList::SetSectionUnloaded (const lldb::SectionSP §ion_sp) bool SectionLoadList::SetSectionUnloaded (const lldb::SectionSP §ion_sp, addr_t load_addr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE)); if (log) { diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp index 913456d2419..5b290e3ebfa 100644 --- a/lldb/source/Target/StackFrameList.cpp +++ b/lldb/source/Target/StackFrameList.cpp @@ -87,7 +87,7 @@ StackFrameList::GetCurrentInlinedDepth () { m_current_inlined_pc = LLDB_INVALID_ADDRESS; m_current_inlined_depth = UINT32_MAX; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("GetCurrentInlinedDepth: invalidating current inlined depth.\n"); } @@ -109,7 +109,7 @@ StackFrameList::ResetCurrentInlinedDepth () { m_current_inlined_depth = UINT32_MAX; m_current_inlined_pc = LLDB_INVALID_ADDRESS; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("ResetCurrentInlinedDepth: Invalidating current inlined depth.\n"); } @@ -204,7 +204,7 @@ StackFrameList::ResetCurrentInlinedDepth () } m_current_inlined_pc = curr_pc; m_current_inlined_depth = num_inlined_functions + 1; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("ResetCurrentInlinedDepth: setting inlined depth: %d 0x%" PRIx64 ".\n", m_current_inlined_depth, curr_pc); diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp index 322d05ed181..3977d620860 100644 --- a/lldb/source/Target/StopInfo.cpp +++ b/lldb/source/Target/StopInfo.cpp @@ -166,7 +166,7 @@ public: } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s could not find breakpoint site id: %" PRId64 "...", __FUNCTION__, m_value); @@ -285,7 +285,7 @@ protected: return; m_should_perform_action = false; - LogSP log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); + Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); BreakpointSiteSP bp_site_sp (m_thread.GetProcess()->GetBreakpointSiteList().FindByID (m_value)); @@ -476,7 +476,7 @@ protected: { m_should_stop = true; m_should_stop_is_valid = true; - LogSP log_process(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log * log_process(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log_process) log_process->Printf ("Process::%s could not find breakpoint site id: %" PRId64 "...", __FUNCTION__, m_value); @@ -592,7 +592,7 @@ protected: } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) log->Printf ("Process::%s could not find watchpoint location id: %" PRId64 "...", @@ -616,7 +616,7 @@ protected: virtual void PerformAction (Event *event_ptr) { - LogSP log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS); + Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS); // We're going to calculate if we should stop or not in some way during the course of // this code. Also by default we're going to stop, so set that here. m_should_stop = true; @@ -760,7 +760,7 @@ protected: } else { - LogSP log_process(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); + Log * log_process(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log_process) log_process->Printf ("Process::%s could not find watchpoint id: %" PRId64 "...", __FUNCTION__, m_value); diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index b8b6c0c3216..ab8fb865926 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -93,7 +93,7 @@ Target::Target(Debugger &debugger, const ArchSpec &target_arch, const lldb::Plat CheckInWithManager(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Target::Target()", this); if (m_arch.IsValid()) @@ -107,7 +107,7 @@ Target::Target(Debugger &debugger, const ArchSpec &target_arch, const lldb::Plat //---------------------------------------------------------------------- Target::~Target() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Target::~Target()", this); DeleteCurrentProcess (); @@ -495,7 +495,7 @@ Target::CreateBreakpoint (SearchFilterSP &filter_sp, BreakpointResolverSP &resol else m_breakpoint_list.Add (bp_sp, true); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) { StreamString s; @@ -540,7 +540,7 @@ CheckIfWatchpointsExhausted(Target *target, Error &error) WatchpointSP Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const ClangASTType *type, uint32_t kind, Error &error) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf("Target::%s (addr = 0x%8.8" PRIx64 " size = %" PRIu64 " type = %u)\n", __FUNCTION__, addr, (uint64_t)size, kind); @@ -620,7 +620,7 @@ Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const ClangASTType *typ void Target::RemoveAllBreakpoints (bool internal_also) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Target::%s (internal_also = %s)\n", __FUNCTION__, internal_also ? "yes" : "no"); @@ -634,7 +634,7 @@ Target::RemoveAllBreakpoints (bool internal_also) void Target::DisableAllBreakpoints (bool internal_also) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Target::%s (internal_also = %s)\n", __FUNCTION__, internal_also ? "yes" : "no"); @@ -646,7 +646,7 @@ Target::DisableAllBreakpoints (bool internal_also) void Target::EnableAllBreakpoints (bool internal_also) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Target::%s (internal_also = %s)\n", __FUNCTION__, internal_also ? "yes" : "no"); @@ -658,7 +658,7 @@ Target::EnableAllBreakpoints (bool internal_also) bool Target::RemoveBreakpointByID (break_id_t break_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Target::%s (break_id = %i, internal = %s)\n", __FUNCTION__, break_id, LLDB_BREAK_ID_IS_INTERNAL (break_id) ? "yes" : "no"); @@ -683,7 +683,7 @@ Target::RemoveBreakpointByID (break_id_t break_id) bool Target::DisableBreakpointByID (break_id_t break_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Target::%s (break_id = %i, internal = %s)\n", __FUNCTION__, break_id, LLDB_BREAK_ID_IS_INTERNAL (break_id) ? "yes" : "no"); @@ -704,7 +704,7 @@ Target::DisableBreakpointByID (break_id_t break_id) bool Target::EnableBreakpointByID (break_id_t break_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); if (log) log->Printf ("Target::%s (break_id = %i, internal = %s)\n", __FUNCTION__, @@ -734,7 +734,7 @@ Target::EnableBreakpointByID (break_id_t break_id) bool Target::RemoveAllWatchpoints (bool end_to_end) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s\n", __FUNCTION__); @@ -768,7 +768,7 @@ Target::RemoveAllWatchpoints (bool end_to_end) bool Target::DisableAllWatchpoints (bool end_to_end) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s\n", __FUNCTION__); @@ -801,7 +801,7 @@ Target::DisableAllWatchpoints (bool end_to_end) bool Target::EnableAllWatchpoints (bool end_to_end) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s\n", __FUNCTION__); @@ -833,7 +833,7 @@ Target::EnableAllWatchpoints (bool end_to_end) bool Target::ClearAllWatchpointHitCounts () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s\n", __FUNCTION__); @@ -854,7 +854,7 @@ Target::ClearAllWatchpointHitCounts () bool Target::IgnoreAllWatchpoints (uint32_t ignore_count) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s\n", __FUNCTION__); @@ -877,7 +877,7 @@ Target::IgnoreAllWatchpoints (uint32_t ignore_count) bool Target::DisableWatchpointByID (lldb::watch_id_t watch_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s (watch_id = %i)\n", __FUNCTION__, watch_id); @@ -900,7 +900,7 @@ Target::DisableWatchpointByID (lldb::watch_id_t watch_id) bool Target::EnableWatchpointByID (lldb::watch_id_t watch_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s (watch_id = %i)\n", __FUNCTION__, watch_id); @@ -923,7 +923,7 @@ Target::EnableWatchpointByID (lldb::watch_id_t watch_id) bool Target::RemoveWatchpointByID (lldb::watch_id_t watch_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s (watch_id = %i)\n", __FUNCTION__, watch_id); @@ -939,7 +939,7 @@ Target::RemoveWatchpointByID (lldb::watch_id_t watch_id) bool Target::IgnoreWatchpointByID (lldb::watch_id_t watch_id, uint32_t ignore_count) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) log->Printf ("Target::%s (watch_id = %i)\n", __FUNCTION__, watch_id); @@ -982,7 +982,7 @@ LoadScriptingResourceForModule (const ModuleSP &module_sp, Target *target) void Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TARGET)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TARGET)); m_images.Clear(); m_scratch_ast_context_ap.reset(); m_scratch_ast_source_ap.reset(); @@ -1037,7 +1037,7 @@ Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files) bool Target::SetArchitecture (const ArchSpec &arch_spec) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TARGET)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TARGET)); if (m_arch.IsCompatibleMatch(arch_spec) || !m_arch.IsValid()) { // If we haven't got a valid arch spec, or the architectures are diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index 404354285b4..e1264a12ead 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -259,7 +259,7 @@ Thread::Thread (Process &process, lldb::tid_t tid) : m_destroy_called (false), m_thread_stop_reason_stop_id (0) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Thread::Thread(tid = 0x%4.4" PRIx64 ")", this, GetID()); @@ -270,7 +270,7 @@ Thread::Thread (Process &process, lldb::tid_t tid) : Thread::~Thread() { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) log->Printf ("%p Thread::~Thread(tid = 0x%4.4" PRIx64 ")", this, GetID()); /// If you hit this assert, it means your derived class forgot to call DoDestroy in its destructor. @@ -569,7 +569,7 @@ Thread::ShouldStop (Event* event_ptr) ThreadPlan *current_plan = GetCurrentPlan(); bool should_stop = true; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (GetResumeState () == eStateSuspended) { @@ -793,7 +793,7 @@ Thread::ShouldReportStop (Event* event_ptr) StateType thread_state = GetResumeState (); StateType temp_thread_state = GetTemporaryResumeState(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (thread_state == eStateSuspended || thread_state == eStateInvalid) { @@ -857,7 +857,7 @@ Thread::ShouldReportRun (Event* event_ptr) return eVoteNoOpinion; } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (m_completed_plan_stack.size() > 0) { // Don't use GetCompletedPlan here, since that suppresses private plans. @@ -902,7 +902,7 @@ Thread::PushPlan (ThreadPlanSP &thread_plan_sp) thread_plan_sp->DidPush(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { StreamString s; @@ -917,7 +917,7 @@ Thread::PushPlan (ThreadPlanSP &thread_plan_sp) void Thread::PopPlan () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (m_plan_stack.size() <= 1) return; @@ -1088,7 +1088,7 @@ Thread::DiscardThreadPlansUpToPlan (lldb::ThreadPlanSP &up_to_plan_sp) void Thread::DiscardThreadPlansUpToPlan (ThreadPlan *up_to_plan_ptr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { log->Printf("Discarding thread plans for thread tid = 0x%4.4" PRIx64 ", up to %p", GetID(), up_to_plan_ptr); @@ -1129,7 +1129,7 @@ Thread::DiscardThreadPlansUpToPlan (ThreadPlan *up_to_plan_ptr) void Thread::DiscardThreadPlans(bool force) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { log->Printf("Discarding thread plans for thread (tid = 0x%4.4" PRIx64 ", force %d)", GetID(), force); diff --git a/lldb/source/Target/ThreadList.cpp b/lldb/source/Target/ThreadList.cpp index 0938585cb84..26692934c90 100644 --- a/lldb/source/Target/ThreadList.cpp +++ b/lldb/source/Target/ThreadList.cpp @@ -200,7 +200,7 @@ ThreadList::ShouldStop (Event *event_ptr) { // Running events should never stop, obviously... - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); // The ShouldStop method of the threads can do a whole lot of work, // running breakpoint commands & conditions, etc. So we don't want @@ -276,7 +276,7 @@ ThreadList::ShouldReportStop (Event *event_ptr) m_process->UpdateThreadListIfNeeded(); collection::iterator pos, end = m_threads.end(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("ThreadList::%s %" PRIu64 " threads", __FUNCTION__, (uint64_t)m_threads.size()); @@ -331,7 +331,7 @@ ThreadList::ShouldReportRun (Event *event_ptr) // Run through the threads and ask whether we should report this event. // The rule is NO vote wins over everything, a YES vote wins over no opinion. - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); for (pos = m_threads.begin(); pos != end; ++pos) { @@ -385,7 +385,7 @@ ThreadList::RefreshStateAfterStop () m_process->UpdateThreadListIfNeeded(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("Turning off notification of new threads while single stepping a thread."); @@ -440,14 +440,14 @@ ThreadList::WillResume () if (wants_solo_run) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("Turning on notification of new threads while single stepping a thread."); m_process->StartNoticingNewThreads(); } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) log->Printf ("Turning off notification of new threads while single stepping a thread."); m_process->StopNoticingNewThreads(); diff --git a/lldb/source/Target/ThreadPlan.cpp b/lldb/source/Target/ThreadPlan.cpp index 376a1f3288f..d740879ae1d 100644 --- a/lldb/source/Target/ThreadPlan.cpp +++ b/lldb/source/Target/ThreadPlan.cpp @@ -79,7 +79,7 @@ ThreadPlan::MischiefManaged () Vote ThreadPlan::ShouldReportStop (Event *event_ptr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (m_stop_vote == eVoteNoOpinion) { @@ -133,7 +133,7 @@ ThreadPlan::WillResume (StateType resume_state, bool current_plan) { if (current_plan) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { diff --git a/lldb/source/Target/ThreadPlanBase.cpp b/lldb/source/Target/ThreadPlanBase.cpp index cf1f68fee3c..817393924d1 100644 --- a/lldb/source/Target/ThreadPlanBase.cpp +++ b/lldb/source/Target/ThreadPlanBase.cpp @@ -84,7 +84,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr) m_stop_vote = eVoteYes; m_run_vote = eVoteYes; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); StopInfoSP stop_info_sp = GetPrivateStopReason(); if (stop_info_sp) diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp index 9247bcee6a2..e0c2eaeb86c 100644 --- a/lldb/source/Target/ThreadPlanCallFunction.cpp +++ b/lldb/source/Target/ThreadPlanCallFunction.cpp @@ -57,7 +57,7 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread, TargetSP target_sp (thread.CalculateTarget()); - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP)); SetBreakpoints(); @@ -237,7 +237,7 @@ ThreadPlanCallFunction::~ThreadPlanCallFunction () void ThreadPlanCallFunction::ReportRegisterState (const char *message) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_VERBOSE)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP | LIBLLDB_LOG_VERBOSE)); if (log) { StreamString strm; @@ -265,7 +265,7 @@ ThreadPlanCallFunction::ReportRegisterState (const char *message) void ThreadPlanCallFunction::DoTakedown (bool success) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP)); if (!m_valid) { @@ -348,7 +348,7 @@ ThreadPlanCallFunction::ShouldReportStop(Event *event_ptr) bool ThreadPlanCallFunction::PlanExplainsStop (Event *event_ptr) { - LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP|LIBLLDB_LOG_PROCESS)); + Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP|LIBLLDB_LOG_PROCESS)); m_real_stop_info_sp = GetPrivateStopReason(); // If our subplan knows why we stopped, even if it's done (which would forward the question to us) @@ -524,7 +524,7 @@ ThreadPlanCallFunction::WillStop () bool ThreadPlanCallFunction::MischiefManaged () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (IsPlanComplete()) { diff --git a/lldb/source/Target/ThreadPlanRunToAddress.cpp b/lldb/source/Target/ThreadPlanRunToAddress.cpp index dfbce4d5fd6..56c16542967 100644 --- a/lldb/source/Target/ThreadPlanRunToAddress.cpp +++ b/lldb/source/Target/ThreadPlanRunToAddress.cpp @@ -226,7 +226,7 @@ ThreadPlanRunToAddress::WillStop () bool ThreadPlanRunToAddress::MischiefManaged () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (AtOurAddress()) { diff --git a/lldb/source/Target/ThreadPlanShouldStopHere.cpp b/lldb/source/Target/ThreadPlanShouldStopHere.cpp index 7ae20f517c3..71543ae1341 100644 --- a/lldb/source/Target/ThreadPlanShouldStopHere.cpp +++ b/lldb/source/Target/ThreadPlanShouldStopHere.cpp @@ -51,7 +51,7 @@ ThreadPlanShouldStopHere::InvokeShouldStopHereCallback () if (m_callback) { ThreadPlan *return_plan = m_callback (m_owner, m_flags, m_baton); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { lldb::addr_t current_addr = m_owner->GetThread().GetRegisterContext()->GetPC(0); diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp index 9c09d070a54..36751cda58b 100644 --- a/lldb/source/Target/ThreadPlanStepInRange.cpp +++ b/lldb/source/Target/ThreadPlanStepInRange.cpp @@ -89,7 +89,7 @@ ThreadPlanStepInRange::GetDescription (Stream *s, lldb::DescriptionLevel level) bool ThreadPlanStepInRange::ShouldStop (Event *event_ptr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); m_no_more_plans = false; if (log) @@ -276,7 +276,7 @@ ThreadPlanStepInRange::FrameMatchesAvoidRegexp () if (frame_function_name) { size_t num_matches = 0; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) num_matches = 1; bool return_value = avoid_regexp_to_use->Execute(frame_function_name, num_matches); @@ -305,7 +305,7 @@ ThreadPlanStepInRange::DefaultShouldStopHereCallback (ThreadPlan *current_plan, { bool should_step_out = false; StackFrame *frame = current_plan->GetThread().GetStackFrameAtIndex(0).get(); - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (flags.Test(eAvoidNoDebug)) { @@ -411,7 +411,7 @@ ThreadPlanStepInRange::PlanExplainsStop (Event *event_ptr) case eStopReasonExec: case eStopReasonThreadExiting: { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->PutCString ("ThreadPlanStepInRange got asked if it explains the stop for some reason other than step."); } @@ -433,7 +433,7 @@ ThreadPlanStepInRange::WillResume (lldb::StateType resume_state, bool current_pl bool step_without_resume = m_thread.DecrementCurrentInlinedDepth(); if (step_without_resume) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("ThreadPlanStepInRange::WillResume: returning false, inline_depth: %d", m_thread.GetCurrentInlinedDepth()); diff --git a/lldb/source/Target/ThreadPlanStepInstruction.cpp b/lldb/source/Target/ThreadPlanStepInstruction.cpp index e2cba6147b8..32b9897bcec 100644 --- a/lldb/source/Target/ThreadPlanStepInstruction.cpp +++ b/lldb/source/Target/ThreadPlanStepInstruction.cpp @@ -100,7 +100,7 @@ ThreadPlanStepInstruction::ShouldStop (Event *event_ptr) { if (m_step_over) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); StackID cur_frame_zero_id = m_thread.GetStackFrameAtIndex(0)->GetStackID(); @@ -190,7 +190,7 @@ ThreadPlanStepInstruction::MischiefManaged () { if (IsPlanComplete()) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf("Completed single instruction step plan."); ThreadPlan::MischiefManaged (); diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp index 777539fdb07..46b011cdb40 100644 --- a/lldb/source/Target/ThreadPlanStepOut.cpp +++ b/lldb/source/Target/ThreadPlanStepOut.cpp @@ -378,7 +378,7 @@ ThreadPlanStepOut::MischiefManaged () // reason and we're now stopping for some other reason altogether, then we're done // with this step out operation. - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf("Completed step out plan."); if (m_return_bp_id != LLDB_INVALID_BREAK_ID) @@ -406,7 +406,7 @@ ThreadPlanStepOut::QueueInlinedStepPlan (bool queue_now) if (!immediate_return_from_sp) return false; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { StreamString s; diff --git a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp index 502907c60ca..9f3c4b04fa3 100644 --- a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp +++ b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp @@ -126,7 +126,7 @@ ThreadPlanStepOverBreakpoint::MischiefManaged () } else { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf("Completed step over breakpoint plan."); // Otherwise, re-enable the breakpoint we were stepping over, and we're done. diff --git a/lldb/source/Target/ThreadPlanStepOverRange.cpp b/lldb/source/Target/ThreadPlanStepOverRange.cpp index a00d5cc84ef..85642ad508e 100644 --- a/lldb/source/Target/ThreadPlanStepOverRange.cpp +++ b/lldb/source/Target/ThreadPlanStepOverRange.cpp @@ -68,7 +68,7 @@ ThreadPlanStepOverRange::GetDescription (Stream *s, lldb::DescriptionLevel level bool ThreadPlanStepOverRange::ShouldStop (Event *event_ptr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { @@ -299,7 +299,7 @@ ThreadPlanStepOverRange::PlanExplainsStop (Event *event_ptr) // Note, unlike the step in range plan, we don't mark ourselves complete if we hit an // unexplained breakpoint/crash. - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); StopInfoSP stop_info_sp = GetPrivateStopReason(); if (stop_info_sp) { @@ -344,7 +344,7 @@ ThreadPlanStepOverRange::WillResume (lldb::StateType resume_state, bool current_ bool in_inlined_stack = m_thread.DecrementCurrentInlinedDepth(); if (in_inlined_stack) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("ThreadPlanStepInRange::WillResume: adjusting range to the frame at inlined depth %d.", m_thread.GetCurrentInlinedDepth()); diff --git a/lldb/source/Target/ThreadPlanStepRange.cpp b/lldb/source/Target/ThreadPlanStepRange.cpp index 7f93f3fe8f9..1af567c0f71 100644 --- a/lldb/source/Target/ThreadPlanStepRange.cpp +++ b/lldb/source/Target/ThreadPlanStepRange.cpp @@ -80,7 +80,7 @@ ThreadPlanStepRange::ValidatePlan (Stream *error) Vote ThreadPlanStepRange::ShouldReportStop (Event *event_ptr) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); const Vote vote = IsPlanComplete() ? eVoteYes : eVoteNo; if (log) @@ -119,7 +119,7 @@ ThreadPlanStepRange::DumpRanges(Stream *s) bool ThreadPlanStepRange::InRange () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); bool ret_value = false; lldb::addr_t pc_load_addr = m_thread.GetRegisterContext()->GetPC(); @@ -304,7 +304,7 @@ ThreadPlanStepRange::ClearNextBranchBreakpoint() { if (m_next_branch_bp_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf ("Removing next branch breakpoint: %d.", m_next_branch_bp_sp->GetID()); GetTarget().RemoveBreakpointByID (m_next_branch_bp_sp->GetID()); @@ -318,7 +318,7 @@ ThreadPlanStepRange::SetNextBranchBreakpoint () if (m_next_branch_bp_sp) return true; - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); // Stepping through ranges using breakpoints doesn't work yet, but with this off we fall back to instruction // single stepping. if (!m_use_fast_step) @@ -382,7 +382,7 @@ ThreadPlanStepRange::SetNextBranchBreakpoint () bool ThreadPlanStepRange::NextRangeBreakpointExplainsStop (lldb::StopInfoSP stop_info_sp) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (!m_next_branch_bp_sp) return false; @@ -467,7 +467,7 @@ ThreadPlanStepRange::MischiefManaged () if (done) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf("Completed step through range plan."); ClearNextBranchBreakpoint(); @@ -484,7 +484,7 @@ ThreadPlanStepRange::MischiefManaged () bool ThreadPlanStepRange::IsPlanStale () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); FrameComparison frame_order = CompareCurrentFrameToStartFrame(); if (frame_order == eFrameCompareOlder) diff --git a/lldb/source/Target/ThreadPlanStepThrough.cpp b/lldb/source/Target/ThreadPlanStepThrough.cpp index 28ee856fc08..d6dab171037 100644 --- a/lldb/source/Target/ThreadPlanStepThrough.cpp +++ b/lldb/source/Target/ThreadPlanStepThrough.cpp @@ -63,7 +63,7 @@ ThreadPlanStepThrough::ThreadPlanStepThrough (Thread &thread, StackID &m_stack_i m_backstop_bkpt_id = return_bp->GetID(); return_bp->SetBreakpointKind("step-through-backstop"); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { log->Printf ("Setting backstop breakpoint %d at address: 0x%" PRIx64, m_backstop_bkpt_id, m_backstop_addr); @@ -96,7 +96,7 @@ ThreadPlanStepThrough::LookForPlanToStepThroughFromCurrentPC() m_sub_plan_sp = objc_runtime->GetStepThroughTrampolinePlan (m_thread, m_stop_others); } - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { lldb::addr_t current_address = GetThread().GetRegisterContext()->GetPC(0); @@ -248,7 +248,7 @@ ThreadPlanStepThrough::ClearBackstopBreakpoint () bool ThreadPlanStepThrough::MischiefManaged () { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (!IsPlanComplete()) { @@ -279,7 +279,7 @@ ThreadPlanStepThrough::HitOurBackstopBreakpoint() if (cur_frame_zero_id == m_return_stack_id) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->PutCString ("ThreadPlanStepThrough hit backstop breakpoint."); return true; diff --git a/lldb/source/Target/ThreadPlanStepUntil.cpp b/lldb/source/Target/ThreadPlanStepUntil.cpp index 9a927b54b16..f6e958a88a6 100644 --- a/lldb/source/Target/ThreadPlanStepUntil.cpp +++ b/lldb/source/Target/ThreadPlanStepUntil.cpp @@ -398,7 +398,7 @@ ThreadPlanStepUntil::MischiefManaged () bool done = false; if (IsPlanComplete()) { - LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) log->Printf("Completed step until plan."); diff --git a/lldb/source/lldb-log.cpp b/lldb/source/lldb-log.cpp index 162599068b9..7c78feddf1b 100644 --- a/lldb/source/lldb-log.cpp +++ b/lldb/source/lldb-log.cpp @@ -26,17 +26,21 @@ using namespace lldb_private; // control access to our static g_log_sp by hiding it in a singleton function // that will construct the static g_lob_sp the first time this function is // called. -static LogSP & + +static bool g_log_enabled = false; +static Log * g_log = NULL; +static Log * GetLog () { - static LogSP g_log_sp; - return g_log_sp; + if (!g_log_enabled) + return NULL; + return g_log; } uint32_t lldb_private::GetLogMask () { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log) return log->GetMask().Get(); return 0; @@ -49,15 +53,15 @@ lldb_private::IsLogVerbose () return (mask & LIBLLDB_LOG_VERBOSE); } -LogSP +Log * lldb_private::GetLogIfAllCategoriesSet (uint32_t mask) { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log && mask) { uint32_t log_mask = log->GetMask().Get(); if ((log_mask & mask) != mask) - return LogSP(); + return NULL; } return log; } @@ -65,7 +69,7 @@ lldb_private::GetLogIfAllCategoriesSet (uint32_t mask) void lldb_private::LogIfAllCategoriesSet (uint32_t mask, const char *format, ...) { - LogSP log(GetLogIfAllCategoriesSet (mask)); + Log *log(GetLogIfAllCategoriesSet (mask)); if (log) { va_list args; @@ -78,7 +82,7 @@ lldb_private::LogIfAllCategoriesSet (uint32_t mask, const char *format, ...) void lldb_private::LogIfAnyCategoriesSet (uint32_t mask, const char *format, ...) { - LogSP log(GetLogIfAnyCategoriesSet (mask)); + Log *log(GetLogIfAnyCategoriesSet (mask)); if (log) { va_list args; @@ -88,19 +92,19 @@ lldb_private::LogIfAnyCategoriesSet (uint32_t mask, const char *format, ...) } } -LogSP +Log * lldb_private::GetLogIfAnyCategoriesSet (uint32_t mask) { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log && mask && (mask & log->GetMask().Get())) return log; - return LogSP(); + return NULL; } void lldb_private::DisableLog (const char **categories, Stream *feedback_strm) { - LogSP log(GetLog ()); + Log *log(GetLog ()); if (log) { @@ -147,35 +151,35 @@ lldb_private::DisableLog (const char **categories, Stream *feedback_strm) } } + log->GetMask().Reset (flag_bits); if (flag_bits == 0) - GetLog ().reset(); - else - log->GetMask().Reset (flag_bits); + g_log_enabled = false; } return; } -LogSP +Log * lldb_private::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const char **categories, Stream *feedback_strm) { // Try see if there already is a log - that way we can reuse its settings. // We could reuse the log in toto, but we don't know that the stream is the same. uint32_t flag_bits; - LogSP log(GetLog ()); - if (log) - flag_bits = log->GetMask().Get(); + if (g_log) + flag_bits = g_log->GetMask().Get(); else flag_bits = 0; // Now make a new log with this stream if one was provided if (log_stream_sp) { - log.reset (new Log(log_stream_sp)); - GetLog () = log; + if (g_log) + g_log->SetStream(log_stream_sp); + else + g_log = new Log(log_stream_sp); } - if (log) + if (g_log) { for (size_t i=0; categories[i] != NULL; ++i) { @@ -211,14 +215,15 @@ lldb_private::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const ch { feedback_strm->Printf("error: unrecognized log category '%s'\n", arg); ListLogCategories (feedback_strm); - return log; + return g_log; } } - log->GetMask().Reset(flag_bits); - log->GetOptions().Reset(log_options); + g_log->GetMask().Reset(flag_bits); + g_log->GetOptions().Reset(log_options); } - return log; + g_log_enabled = true; + return g_log; } diff --git a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj index df32896c30e..9137a769eb1 100644 --- a/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj +++ b/lldb/tools/debugserver/debugserver.xcodeproj/project.pbxproj @@ -469,7 +469,9 @@ x86_64, i386, ); + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; @@ -478,6 +480,7 @@ CURRENT_PROJECT_VERSION = 300.99.0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; @@ -495,7 +498,9 @@ armv7s, ); "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; @@ -504,6 +509,7 @@ DEAD_CODE_STRIPPING = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; @@ -525,7 +531,9 @@ x86_64, i386, ); + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; @@ -534,6 +542,7 @@ DEAD_CODE_STRIPPING = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; STRIPFLAGS = "-x"; @@ -709,7 +718,9 @@ x86_64, i386, ); + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; @@ -718,6 +729,7 @@ CURRENT_PROJECT_VERSION = 300.99.0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; diff --git a/lldb/tools/debugserver/debugserver.xcodeproj/xcshareddata/xcschemes/debugserver.xcscheme b/lldb/tools/debugserver/debugserver.xcodeproj/xcshareddata/xcschemes/debugserver.xcscheme index 0b681cc46b0..dafd28f08a0 100644 --- a/lldb/tools/debugserver/debugserver.xcodeproj/xcshareddata/xcschemes/debugserver.xcscheme +++ b/lldb/tools/debugserver/debugserver.xcodeproj/xcshareddata/xcschemes/debugserver.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0450" + LastUpgradeVersion = "0500" version = "1.8"> <BuildAction parallelizeBuildables = "NO" @@ -56,7 +56,6 @@ buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" - enableOpenGLFrameCaptureMode = "0" allowLocationSimulation = "YES"> <BuildableProductRunnable> <BuildableReference diff --git a/lldb/tools/lldb-perf/common/clang/lldb_perf_clang.cpp b/lldb/tools/lldb-perf/common/clang/lldb_perf_clang.cpp index 13f529f9d13..ef9697a1777 100644 --- a/lldb/tools/lldb-perf/common/clang/lldb_perf_clang.cpp +++ b/lldb/tools/lldb-perf/common/clang/lldb_perf_clang.cpp @@ -88,7 +88,7 @@ public: { case 0: { - Xcode::RunCommand(m_debugger,"log enable -f /tmp/packets.txt gdb-remote packets",true); + //Xcode::RunCommand(m_debugger,"log enable -f /tmp/packets.txt gdb-remote packets",true); m_memory_total.Start(); m_time_total.Start(); |
