maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Removed the "lldb-forward-rtti.h" header file as it was designed to contain 

all RTTI types, and since we don't use RTTI anymore since clang and llvm don't
we don't really need this header file. All shared pointer definitions have
been moved into "lldb-forward.h".

Defined std::tr1::weak_ptr definitions for all of the types that inherit from
enable_shared_from_this() in "lldb-forward.h" in preparation for thread
hardening our public API.

The first in the thread hardening check-ins. First we start with SBThread.
We have issues in our lldb::SB API right now where if you have one object
that is being used by two threads we have a race condition. Consider the
following code:

 1    int
 2    SBThread::SomeFunction()
 3    {
 4        int result = -1;
 5        if (m_opaque_sp)
 6        {
 7            result = m_opaque_sp->DoSomething();
 8        }
 9        return result;
10    }

And now this happens:

Thread 1 enters any SBThread function and checks its m_opaque_sp and is about
to execute the code on line 7 but hasn't yet
Thread 2 gets to run and class sb_thread.Clear() which calls m_opaque_sp.clear()
and clears the contents of the shared pointer member
Thread 1 now crashes when it resumes.

The solution is to use std::tr1::weak_ptr. Now the SBThread class contains a
lldb::ThreadWP (weak pointer to our lldb_private::Thread class) and this 
function would look like:

 1    int
 2    SBThread::SomeFunction()
 3    {
 4        int result = -1;
 5        ThreadSP thread_sp(m_opaque_wp.lock());
 6        if (thread_sp)
 7        {
 8            result = m_opaque_sp->DoSomething();
 9        }
10        return result;
11    }

Now we have a solid thread safe API where we get a local copy of our thread
shared pointer from our weak_ptr and then we are guaranteed it can't go away
during our function.

So lldb::SBThread has been thread hardened, more checkins to follow shortly.

llvm-svn: 149218
This commit is contained in:
Greg Clayton 2012-01-30 02:53:15 +00:00
parent e29b53622a
commit 17a6ad05c1
14 changed files with 319 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/include/lldb/API/SBDefines.h
View File

@ -18,7 +18,6 @@
#include "lldb/lldb-defines.h"
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-forward-rtti.h"
#include "lldb/lldb-types.h"
// Forward Declarations

23
lldb/include/lldb/API/SBThread.h
View File

@ -171,27 +171,6 @@ protected:
friend class SBDebugger;
friend class SBValue;
#ifndef SWIG
lldb_private::Thread *
get ();
const lldb_private::Thread *
operator->() const;
const lldb_private::Thread &
operator*() const;
lldb_private::Thread *
operator->();
lldb_private::Thread &
operator*();
#endif
SBThread (const lldb::ThreadSP& lldb_object_sp);
void
@ -202,7 +181,7 @@ private:
// Classes that inherit from Thread can see and modify these
//------------------------------------------------------------------
lldb::ThreadSP m_opaque_sp;
lldb::ThreadWP m_opaque_wp;
};
} // namespace lldb

1
lldb/include/lldb/Core/DataVisualization.h
View File

@ -23,7 +23,6 @@
// Other libraries and framework includes
// Project includes
#include "lldb/lldb-forward-rtti.h"
#include "lldb/Core/ConstString.h"
#include "lldb/Core/FormatClasses.h"
#include "lldb/Core/FormatManager.h"

99
lldb/include/lldb/lldb-forward-rtti.h
View File

@ -1,99 +0,0 @@
//===-- lldb-forward-rtti.h -------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#ifndef LLDB_lldb_forward_rtti_h_
#define LLDB_lldb_forward_rtti_h_
#if defined(__cplusplus)
#include "lldb/lldb-types.h"
#include <tr1/memory> // for std::tr1::shared_ptr
//----------------------------------------------------------------------
// lldb forward declarations
//----------------------------------------------------------------------
namespace lldb {
typedef std::tr1::shared_ptr<lldb_private::ABI> ABISP;
typedef std::tr1::shared_ptr<lldb_private::Baton> BatonSP;
typedef std::tr1::shared_ptr<lldb_private::Block> BlockSP;
typedef std::tr1::shared_ptr<lldb_private::Breakpoint> BreakpointSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::BreakpointSite> BreakpointSiteSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::BreakpointLocation> BreakpointLocationSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::BreakpointResolver> BreakpointResolverSP;
typedef std::tr1::shared_ptr<lldb_private::Broadcaster> BroadcasterSP;
typedef std::tr1::shared_ptr<lldb_private::ClangExpressionVariable> ClangExpressionVariableSP;
typedef std::tr1::shared_ptr<lldb_private::CommandObject> CommandObjectSP;
typedef std::tr1::shared_ptr<lldb_private::Communication> CommunicationSP;
typedef std::tr1::shared_ptr<lldb_private::Connection> ConnectionSP;
typedef std::tr1::shared_ptr<lldb_private::CompileUnit> CompUnitSP;
typedef std::tr1::shared_ptr<lldb_private::DataBuffer> DataBufferSP;
typedef std::tr1::shared_ptr<lldb_private::DataExtractor> DataExtractorSP;
typedef std::tr1::shared_ptr<lldb_private::Debugger> DebuggerSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::Disassembler> DisassemblerSP;
typedef std::tr1::shared_ptr<lldb_private::DynamicLoader> DynamicLoaderSP;
typedef std::tr1::shared_ptr<lldb_private::Event> EventSP;
typedef std::tr1::shared_ptr<lldb_private::FormatCategory> FormatCategorySP;
typedef std::tr1::shared_ptr<lldb_private::Function> FunctionSP;
typedef std::tr1::shared_ptr<lldb_private::InlineFunctionInfo> InlineFunctionInfoSP;
typedef std::tr1::shared_ptr<lldb_private::InputReader> InputReaderSP;
typedef std::tr1::shared_ptr<lldb_private::InstanceSettings> InstanceSettingsSP;
typedef std::tr1::shared_ptr<lldb_private::Instruction> InstructionSP;
typedef std::tr1::shared_ptr<lldb_private::LanguageRuntime> LanguageRuntimeSP;
typedef std::tr1::shared_ptr<lldb_private::LineTable> LineTableSP;
typedef std::tr1::shared_ptr<lldb_private::Listener> ListenerSP;
typedef std::tr1::shared_ptr<lldb_private::Log> LogSP;
typedef std::tr1::shared_ptr<lldb_private::LogChannel> LogChannelSP;
typedef std::tr1::shared_ptr<lldb_private::Module> ModuleSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::ObjectFile> ObjectFileSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::OptionValue> OptionValueSP;
typedef std::tr1::shared_ptr<lldb_private::Platform> PlatformSP;
typedef std::tr1::shared_ptr<lldb_private::Process> ProcessSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
typedef std::tr1::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
typedef std::tr1::shared_ptr<lldb_private::Section> SectionSP;
typedef std::tr1::shared_ptr<lldb_private::SearchFilter> SearchFilterSP;
#ifndef LLDB_DISABLE_PYTHON
typedef std::tr1::shared_ptr<lldb_private::ScriptSummaryFormat> ScriptFormatSP;
#endif // #ifndef LLDB_DISABLE_PYTHON
typedef std::tr1::shared_ptr<lldb_private::StackFrame> StackFrameSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::StackFrameList> StackFrameListSP;
typedef std::tr1::shared_ptr<lldb_private::StopInfo> StopInfoSP;
typedef std::tr1::shared_ptr<lldb_private::StoppointLocation> StoppointLocationSP;
typedef std::tr1::shared_ptr<lldb_private::Stream> StreamSP;
typedef std::tr1::shared_ptr<lldb_private::StringSummaryFormat> StringSummaryFormatSP;
typedef std::tr1::shared_ptr<lldb_private::SummaryFormat> SummaryFormatSP;
typedef std::tr1::shared_ptr<lldb_private::SymbolFile> SymbolFileSP;
typedef std::tr1::shared_ptr<lldb_private::SymbolFileType> SymbolFileTypeSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::SymbolContextSpecifier> SymbolContextSpecifierSP;
typedef std::tr1::shared_ptr<lldb_private::SyntheticChildren> SyntheticChildrenSP;
typedef std::tr1::shared_ptr<lldb_private::SyntheticChildrenFrontEnd> SyntheticChildrenFrontEndSP;
typedef std::tr1::shared_ptr<lldb_private::Target> TargetSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::Thread> ThreadSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::ThreadPlan> ThreadPlanSP;
typedef std::tr1::shared_ptr<lldb_private::ThreadPlanTracer> ThreadPlanTracerSP;
typedef std::tr1::shared_ptr<lldb_private::Type> TypeSP; // make_shared_from_this
typedef std::tr1::shared_ptr<lldb_private::TypeImpl> TypeImplSP;
typedef std::tr1::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
typedef std::tr1::shared_ptr<lldb_private::UserSettingsController> UserSettingsControllerSP;
typedef std::tr1::shared_ptr<lldb_private::UnwindPlan> UnwindPlanSP;
typedef SharedPtr<lldb_private::ValueObject>::Type ValueObjectSP;
typedef std::tr1::shared_ptr<lldb_private::Value> ValueSP;
typedef std::tr1::shared_ptr<lldb_private::ValueFormat> ValueFormatSP;
typedef std::tr1::shared_ptr<lldb_private::ValueList> ValueListSP;
typedef std::tr1::shared_ptr<lldb_private::Variable> VariableSP;
typedef std::tr1::shared_ptr<lldb_private::VariableList> VariableListSP;
typedef std::tr1::shared_ptr<lldb_private::ValueObjectList> ValueObjectListSP;
typedef std::tr1::shared_ptr<lldb_private::Watchpoint> WatchpointSP;
} // namespace lldb
#endif // #if defined(__cplusplus)
#endif // LLDB_lldb_forward_rtti_h_

95
lldb/include/lldb/lldb-forward.h
View File

@ -12,6 +12,9 @@
#if defined(__cplusplus)
#include <tr1/memory> // for std::tr1::shared_ptr, std::tr1::weak_ptr
#include "lldb/Utility/SharingPtr.h"
//----------------------------------------------------------------------
// lldb forward declarations
//----------------------------------------------------------------------
@ -211,5 +214,97 @@ struct LineEntry;
} // namespace lldb_private
//----------------------------------------------------------------------
// lldb forward declarations
//----------------------------------------------------------------------
namespace lldb {
typedef std::tr1::shared_ptr<lldb_private::ABI> ABISP;
typedef std::tr1::shared_ptr<lldb_private::Baton> BatonSP;
typedef std::tr1::shared_ptr<lldb_private::Block> BlockSP;
typedef std::tr1::shared_ptr<lldb_private::Breakpoint> BreakpointSP;
typedef std::tr1::weak_ptr<lldb_private::Breakpoint> BreakpointWP;
typedef std::tr1::shared_ptr<lldb_private::BreakpointSite> BreakpointSiteSP;
typedef std::tr1::weak_ptr<lldb_private::BreakpointSite> BreakpointSiteWP;
typedef std::tr1::shared_ptr<lldb_private::BreakpointLocation> BreakpointLocationSP;
typedef std::tr1::weak_ptr<lldb_private::BreakpointLocation> BreakpointLocationWP;
typedef std::tr1::shared_ptr<lldb_private::BreakpointResolver> BreakpointResolverSP;
typedef std::tr1::shared_ptr<lldb_private::Broadcaster> BroadcasterSP;
typedef std::tr1::shared_ptr<lldb_private::ClangExpressionVariable> ClangExpressionVariableSP;
typedef std::tr1::shared_ptr<lldb_private::CommandObject> CommandObjectSP;
typedef std::tr1::shared_ptr<lldb_private::Communication> CommunicationSP;
typedef std::tr1::shared_ptr<lldb_private::Connection> ConnectionSP;
typedef std::tr1::shared_ptr<lldb_private::CompileUnit> CompUnitSP;
typedef std::tr1::shared_ptr<lldb_private::DataBuffer> DataBufferSP;
typedef std::tr1::shared_ptr<lldb_private::DataExtractor> DataExtractorSP;
typedef std::tr1::shared_ptr<lldb_private::Debugger> DebuggerSP;
typedef std::tr1::weak_ptr<lldb_private::Debugger> DebuggerWP;
typedef std::tr1::shared_ptr<lldb_private::Disassembler> DisassemblerSP;
typedef std::tr1::shared_ptr<lldb_private::DynamicLoader> DynamicLoaderSP;
typedef std::tr1::shared_ptr<lldb_private::Event> EventSP;
typedef std::tr1::shared_ptr<lldb_private::FormatCategory> FormatCategorySP;
typedef std::tr1::shared_ptr<lldb_private::Function> FunctionSP;
typedef std::tr1::shared_ptr<lldb_private::InlineFunctionInfo> InlineFunctionInfoSP;
typedef std::tr1::shared_ptr<lldb_private::InputReader> InputReaderSP;
typedef std::tr1::shared_ptr<lldb_private::InstanceSettings> InstanceSettingsSP;
typedef std::tr1::shared_ptr<lldb_private::Instruction> InstructionSP;
typedef std::tr1::shared_ptr<lldb_private::LanguageRuntime> LanguageRuntimeSP;
typedef std::tr1::shared_ptr<lldb_private::LineTable> LineTableSP;
typedef std::tr1::shared_ptr<lldb_private::Listener> ListenerSP;
typedef std::tr1::shared_ptr<lldb_private::Log> LogSP;
typedef std::tr1::shared_ptr<lldb_private::LogChannel> LogChannelSP;
typedef std::tr1::shared_ptr<lldb_private::Module> ModuleSP;
typedef std::tr1::weak_ptr<lldb_private::Module> ModuleWP;
typedef std::tr1::shared_ptr<lldb_private::ObjectFile> ObjectFileSP;
typedef std::tr1::weak_ptr<lldb_private::ObjectFile> ObjectFileWP;
typedef std::tr1::shared_ptr<lldb_private::OptionValue> OptionValueSP;
typedef std::tr1::shared_ptr<lldb_private::Platform> PlatformSP;
typedef std::tr1::shared_ptr<lldb_private::Process> ProcessSP;
typedef std::tr1::weak_ptr<lldb_private::Process> ProcessWP;
typedef std::tr1::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
typedef std::tr1::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
typedef std::tr1::shared_ptr<lldb_private::Section> SectionSP;
typedef std::tr1::shared_ptr<lldb_private::SearchFilter> SearchFilterSP;
#ifndef LLDB_DISABLE_PYTHON
typedef std::tr1::shared_ptr<lldb_private::ScriptSummaryFormat> ScriptFormatSP;
#endif // #ifndef LLDB_DISABLE_PYTHON
typedef std::tr1::shared_ptr<lldb_private::StackFrame> StackFrameSP;
typedef std::tr1::weak_ptr<lldb_private::StackFrame> StackFrameWP;
typedef std::tr1::shared_ptr<lldb_private::StackFrameList> StackFrameListSP;
typedef std::tr1::shared_ptr<lldb_private::StopInfo> StopInfoSP;
typedef std::tr1::shared_ptr<lldb_private::StoppointLocation> StoppointLocationSP;
typedef std::tr1::shared_ptr<lldb_private::Stream> StreamSP;
typedef std::tr1::shared_ptr<lldb_private::StringSummaryFormat> StringSummaryFormatSP;
typedef std::tr1::shared_ptr<lldb_private::SummaryFormat> SummaryFormatSP;
typedef std::tr1::shared_ptr<lldb_private::SymbolFile> SymbolFileSP;
typedef std::tr1::shared_ptr<lldb_private::SymbolFileType> SymbolFileTypeSP;
typedef std::tr1::weak_ptr<lldb_private::SymbolFileType> SymbolFileTypeWP;
typedef std::tr1::shared_ptr<lldb_private::SymbolContextSpecifier> SymbolContextSpecifierSP;
typedef std::tr1::shared_ptr<lldb_private::SyntheticChildren> SyntheticChildrenSP;
typedef std::tr1::shared_ptr<lldb_private::SyntheticChildrenFrontEnd> SyntheticChildrenFrontEndSP;
typedef std::tr1::shared_ptr<lldb_private::Target> TargetSP;
typedef std::tr1::weak_ptr<lldb_private::Target> TargetWP;
typedef std::tr1::shared_ptr<lldb_private::Thread> ThreadSP;
typedef std::tr1::weak_ptr<lldb_private::Thread> ThreadWP;
typedef std::tr1::shared_ptr<lldb_private::ThreadPlan> ThreadPlanSP;
typedef std::tr1::shared_ptr<lldb_private::ThreadPlanTracer> ThreadPlanTracerSP;
typedef std::tr1::shared_ptr<lldb_private::Type> TypeSP;
typedef std::tr1::weak_ptr<lldb_private::Type> TypeWP;
typedef std::tr1::shared_ptr<lldb_private::TypeImpl> TypeImplSP;
typedef std::tr1::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
typedef std::tr1::shared_ptr<lldb_private::UserSettingsController> UserSettingsControllerSP;
typedef std::tr1::shared_ptr<lldb_private::UnwindPlan> UnwindPlanSP;
typedef lldb_private::SharingPtr<lldb_private::ValueObject> ValueObjectSP;
typedef std::tr1::shared_ptr<lldb_private::Value> ValueSP;
typedef std::tr1::shared_ptr<lldb_private::ValueFormat> ValueFormatSP;
typedef std::tr1::shared_ptr<lldb_private::ValueList> ValueListSP;
typedef std::tr1::shared_ptr<lldb_private::Variable> VariableSP;
typedef std::tr1::shared_ptr<lldb_private::VariableList> VariableListSP;
typedef std::tr1::shared_ptr<lldb_private::ValueObjectList> ValueObjectListSP;
typedef std::tr1::shared_ptr<lldb_private::Watchpoint> WatchpointSP;
} // namespace lldb
#endif // #if defined(__cplusplus)
#endif // LLDB_lldb_forward_h_

1
lldb/include/lldb/lldb-public.h
View File

@ -13,7 +13,6 @@
#include "lldb/lldb-defines.h"
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-forward-rtti.h"
#include "lldb/lldb-types.h"
#endif // LLDB_lldb_h_

11
lldb/include/lldb/lldb-types.h
View File

@ -12,7 +12,6 @@
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/Utility/SharingPtr.h"
#include <assert.h>
#include <pthread.h>
@ -59,11 +58,11 @@ namespace lldb {
// // Make a typedef to a Foo shared pointer
// typedef lldb::SharePtr<Foo>::Type FooSP;
//
template<typename _Tp>
struct SharedPtr
{
typedef lldb_private::SharingPtr<_Tp> Type;
};
// template<typename _Tp>
// struct SharedPtr
// {
// typedef lldb_private::SharingPtr<_Tp> Type;
// };
// template<typename _Tp>
// struct LoggingSharedPtr
// {

4
lldb/lldb.xcodeproj/project.pbxproj
View File

@ -356,7 +356,6 @@
26DB3E1F1379E7AD0080DC73 /* ABISysV_x86_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DB3E131379E7AD0080DC73 /* ABISysV_x86_64.cpp */; };
26DC6A171337FE8000FF7998 /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
26DC6A1D1337FECA00FF7998 /* lldb-platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */; };
26DE1E6B11616C2E00A093E2 /* lldb-forward-rtti.h in Headers */ = {isa = PBXBuildFile; fileRef = 26DE1E6911616C2E00A093E2 /* lldb-forward-rtti.h */; settings = {ATTRIBUTES = (Public, ); }; };
26DE1E6C11616C2E00A093E2 /* lldb-forward.h in Headers */ = {isa = PBXBuildFile; fileRef = 26DE1E6A11616C2E00A093E2 /* lldb-forward.h */; settings = {ATTRIBUTES = (Public, ); }; };
26DE204111618AB900A093E2 /* SBSymbolContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 26DE204011618AB900A093E2 /* SBSymbolContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
26DE204311618ACA00A093E2 /* SBAddress.h in Headers */ = {isa = PBXBuildFile; fileRef = 26DE204211618ACA00A093E2 /* SBAddress.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -1078,7 +1077,6 @@
26DB3E141379E7AD0080DC73 /* ABISysV_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABISysV_x86_64.h; sourceTree = "<group>"; };
26DC6A101337FE6900FF7998 /* lldb-platform */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "lldb-platform"; sourceTree = BUILT_PRODUCTS_DIR; };
26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-platform.cpp"; path = "tools/lldb-platform/lldb-platform.cpp"; sourceTree = "<group>"; };
26DE1E6911616C2E00A093E2 /* lldb-forward-rtti.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = "lldb-forward-rtti.h"; path = "include/lldb/lldb-forward-rtti.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
26DE1E6A11616C2E00A093E2 /* lldb-forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = "lldb-forward.h"; path = "include/lldb/lldb-forward.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
26DE204011618AB900A093E2 /* SBSymbolContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBSymbolContext.h; path = include/lldb/API/SBSymbolContext.h; sourceTree = "<group>"; };
26DE204211618ACA00A093E2 /* SBAddress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBAddress.h; path = include/lldb/API/SBAddress.h; sourceTree = "<group>"; };
@ -1741,7 +1739,6 @@
26BC7C2510F1B3BC00F91463 /* lldb-defines.h */,
26BC7C2610F1B3BC00F91463 /* lldb-enumerations.h */,
26DE1E6A11616C2E00A093E2 /* lldb-forward.h */,
26DE1E6911616C2E00A093E2 /* lldb-forward-rtti.h */,
26651A14133BEC76005B64B7 /* lldb-public.h */,
26BC7C2910F1B3BC00F91463 /* lldb-types.h */,
26B42C4C1187ABA50079C8C8 /* LLDB.h */,
@ -2823,7 +2820,6 @@
2668020E115FD12C008E1FE4 /* lldb-defines.h in Headers */,
2668020F115FD12C008E1FE4 /* lldb-enumerations.h in Headers */,
26DE1E6C11616C2E00A093E2 /* lldb-forward.h in Headers */,
26DE1E6B11616C2E00A093E2 /* lldb-forward-rtti.h in Headers */,
26680214115FD12C008E1FE4 /* lldb-types.h in Headers */,
26B42C4D1187ABA50079C8C8 /* LLDB.h in Headers */,
26DE204311618ACA00A093E2 /* SBAddress.h in Headers */,

1
lldb/scripts/lldb.swig
View File

@ -88,7 +88,6 @@ o SBLineEntry: Specifies an association with a contiguous range of instructions
%include "lldb/lldb-defines.h"
%include "lldb/lldb-enumerations.h"
%include "lldb/lldb-forward.h"
%include "lldb/lldb-forward-rtti.h"
%include "lldb/lldb-types.h"
/* Forward declaration of SB classes. */

1
lldb/source/API/SBBroadcaster.cpp
View File

@ -9,7 +9,6 @@
#include "lldb/Core/Broadcaster.h"
#include "lldb/Core/Log.h"
#include "lldb/lldb-forward-rtti.h"
#include "lldb/API/SBBroadcaster.h"
#include "lldb/API/SBListener.h"

6
lldb/source/API/SBFrame.cpp
View File

@ -550,10 +550,12 @@ SBFrame::GetThread () const
LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
SBThread sb_thread;
ThreadSP thread_sp;
if (m_opaque_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetThread().GetProcess().GetTarget().GetAPIMutex());
sb_thread.SetThread (m_opaque_sp->GetThread().shared_from_this());
thread_sp = m_opaque_sp->GetThread().shared_from_this();
sb_thread.SetThread (thread_sp);
}
if (log)
@ -561,7 +563,7 @@ SBFrame::GetThread () const
SBStream sstr;
sb_thread.GetDescription (sstr);
log->Printf ("SBFrame(%p)::GetThread () => SBThread(%p): %s", m_opaque_sp.get(),
sb_thread.get(), sstr.GetData());
thread_sp.get(), sstr.GetData());
}
return sb_thread;

22
lldb/source/API/SBProcess.cpp
View File

@ -217,15 +217,17 @@ SBProcess::GetSelectedThread () const
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
SBThread sb_thread;
ThreadSP thread_sp;
if (m_opaque_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
sb_thread.SetThread (m_opaque_sp->GetThreadList().GetSelectedThread());
thread_sp = m_opaque_sp->GetThreadList().GetSelectedThread();
sb_thread.SetThread (thread_sp);
}
if (log)
{
log->Printf ("SBProcess(%p)::GetSelectedThread () => SBThread(%p)", m_opaque_sp.get(), sb_thread.get());
log->Printf ("SBProcess(%p)::GetSelectedThread () => SBThread(%p)", m_opaque_sp.get(), thread_sp.get());
}
return sb_thread;
@ -378,20 +380,22 @@ SBProcess::GetThreadAtIndex (size_t index)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
SBThread thread;
SBThread sb_thread;
ThreadSP thread_sp;
if (m_opaque_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
thread.SetThread (m_opaque_sp->GetThreadList().GetThreadAtIndex(index));
thread_sp = m_opaque_sp->GetThreadList().GetThreadAtIndex(index);
sb_thread.SetThread (thread_sp);
}
if (log)
{
log->Printf ("SBProcess(%p)::GetThreadAtIndex (index=%d) => SBThread(%p)",
m_opaque_sp.get(), (uint32_t) index, thread.get());
m_opaque_sp.get(), (uint32_t) index, thread_sp.get());
}
return thread;
return sb_thread;
}
StateType
@ -651,10 +655,12 @@ SBThread
SBProcess::GetThreadByID (tid_t tid)
{
SBThread sb_thread;
ThreadSP thread_sp;
if (m_opaque_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
sb_thread.SetThread (m_opaque_sp->GetThreadList().FindThreadByID ((tid_t) tid));
thread_sp = m_opaque_sp->GetThreadList().FindThreadByID (tid);
sb_thread.SetThread (thread_sp);
}
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
@ -663,7 +669,7 @@ SBProcess::GetThreadByID (tid_t tid)
log->Printf ("SBProcess(%p)::GetThreadByID (tid=0x%4.4llx) => SBThread (%p)",
m_opaque_sp.get(),
tid,
sb_thread.get());
thread_sp.get());
}
return sb_thread;

384
lldb/source/API/SBThread.cpp
View File

@ -43,17 +43,17 @@ using namespace lldb_private;
// Constructors
//----------------------------------------------------------------------
SBThread::SBThread () :
m_opaque_sp ()
m_opaque_wp ()
{
}
SBThread::SBThread (const ThreadSP& lldb_object_sp) :
m_opaque_sp (lldb_object_sp)
m_opaque_wp (lldb_object_sp)
{
}
SBThread::SBThread (const SBThread &rhs) :
m_opaque_sp (rhs.m_opaque_sp)
m_opaque_wp (rhs.m_opaque_wp)
{
}
@ -65,7 +65,7 @@ const lldb::SBThread &
SBThread::operator = (const SBThread &rhs)
{
if (this != &rhs)
m_opaque_sp = rhs.m_opaque_sp;
m_opaque_wp = rhs.m_opaque_wp;
return *this;
}
@ -79,13 +79,13 @@ SBThread::~SBThread()
bool
SBThread::IsValid() const
{
return m_opaque_sp;
return !m_opaque_wp.expired();
}
void
SBThread::Clear ()
{
m_opaque_sp.reset();
m_opaque_wp.reset();
}
@ -95,16 +95,17 @@ SBThread::GetStopReason()
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
StopReason reason = eStopReasonInvalid;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = m_opaque_sp->GetStopInfo ();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = thread_sp->GetStopInfo ();
if (stop_info_sp)
reason = stop_info_sp->GetStopReason();
}
if (log)
log->Printf ("SBThread(%p)::GetStopReason () => %s", m_opaque_sp.get(),
log->Printf ("SBThread(%p)::GetStopReason () => %s", thread_sp.get(),
Thread::StopReasonAsCString (reason));
return reason;
@ -113,10 +114,11 @@ SBThread::GetStopReason()
size_t
SBThread::GetStopReasonDataCount ()
{
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = m_opaque_sp->GetStopInfo ();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = thread_sp->GetStopInfo ();
if (stop_info_sp)
{
StopReason reason = stop_info_sp->GetStopReason();
@ -132,7 +134,7 @@ SBThread::GetStopReasonDataCount ()
case eStopReasonBreakpoint:
{
break_id_t site_id = stop_info_sp->GetValue();
lldb::BreakpointSiteSP bp_site_sp (m_opaque_sp->GetProcess().GetBreakpointSiteList().FindByID (site_id));
lldb::BreakpointSiteSP bp_site_sp (thread_sp->GetProcess().GetBreakpointSiteList().FindByID (site_id));
if (bp_site_sp)
return bp_site_sp->GetNumberOfOwners () * 2;
else
@ -157,10 +159,11 @@ SBThread::GetStopReasonDataCount ()
uint64_t
SBThread::GetStopReasonDataAtIndex (uint32_t idx)
{
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = m_opaque_sp->GetStopInfo ();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = thread_sp->GetStopInfo ();
if (stop_info_sp)
{
StopReason reason = stop_info_sp->GetStopReason();
@ -176,7 +179,7 @@ SBThread::GetStopReasonDataAtIndex (uint32_t idx)
case eStopReasonBreakpoint:
{
break_id_t site_id = stop_info_sp->GetValue();
lldb::BreakpointSiteSP bp_site_sp (m_opaque_sp->GetProcess().GetBreakpointSiteList().FindByID (site_id));
lldb::BreakpointSiteSP bp_site_sp (thread_sp->GetProcess().GetBreakpointSiteList().FindByID (site_id));
if (bp_site_sp)
{
uint32_t bp_index = idx / 2;
@ -218,10 +221,11 @@ SBThread::GetStopDescription (char *dst, size_t dst_len)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = m_opaque_sp->GetStopInfo ();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = thread_sp->GetStopInfo ();
if (stop_info_sp)
{
const char *stop_desc = stop_info_sp->GetDescription();
@ -229,7 +233,7 @@ SBThread::GetStopDescription (char *dst, size_t dst_len)
{
if (log)
log->Printf ("SBThread(%p)::GetStopDescription (dst, dst_len) => \"%s\"",
m_opaque_sp.get(), stop_desc);
thread_sp.get(), stop_desc);
if (dst)
return ::snprintf (dst, dst_len, "%s", stop_desc);
else
@ -270,7 +274,7 @@ SBThread::GetStopDescription (char *dst, size_t dst_len)
case eStopReasonSignal:
{
stop_desc = m_opaque_sp->GetProcess().GetUnixSignals ().GetSignalAsCString (stop_info_sp->GetValue());
stop_desc = thread_sp->GetProcess().GetUnixSignals ().GetSignalAsCString (stop_info_sp->GetValue());
if (stop_desc == NULL || stop_desc[0] == '\0')
{
static char signal_desc[] = "signal";
@ -296,7 +300,7 @@ SBThread::GetStopDescription (char *dst, size_t dst_len)
{
if (log)
log->Printf ("SBThread(%p)::GetStopDescription (dst, dst_len) => '%s'",
m_opaque_sp.get(), stop_desc);
thread_sp.get(), stop_desc);
if (dst)
return ::snprintf (dst, dst_len, "%s", stop_desc) + 1; // Include the NULL byte
@ -318,10 +322,11 @@ SBValue
SBThread::GetStopReturnValue ()
{
ValueObjectSP return_valobj_sp;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = m_opaque_sp->GetStopInfo ();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
StopInfoSP stop_info_sp = thread_sp->GetStopInfo ();
if (stop_info_sp)
{
return_valobj_sp = StopInfo::GetReturnValueObject (stop_info_sp);
@ -330,7 +335,7 @@ SBThread::GetStopReturnValue ()
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::GetStopReturnValue () => %s", m_opaque_sp.get(),
log->Printf ("SBThread(%p)::GetStopReturnValue () => %s", thread_sp.get(),
return_valobj_sp.get()
? return_valobj_sp->GetValueAsCString()
: "<no return value>");
@ -341,7 +346,7 @@ SBThread::GetStopReturnValue ()
void
SBThread::SetThread (const ThreadSP& lldb_object_sp)
{
m_opaque_sp = lldb_object_sp;
m_opaque_wp = lldb_object_sp;
}
@ -351,11 +356,12 @@ SBThread::GetThreadID () const
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
lldb::tid_t tid = LLDB_INVALID_THREAD_ID;
if (m_opaque_sp)
tid = m_opaque_sp->GetID();
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
tid = thread_sp->GetID();
if (log)
log->Printf ("SBThread(%p)::GetThreadID () => 0x%4.4llx", m_opaque_sp.get(), tid);
log->Printf ("SBThread(%p)::GetThreadID () => 0x%4.4llx", thread_sp.get(), tid);
return tid;
}
@ -363,23 +369,25 @@ SBThread::GetThreadID () const
uint32_t
SBThread::GetIndexID () const
{
if (m_opaque_sp)
return m_opaque_sp->GetIndexID();
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
return thread_sp->GetIndexID();
return LLDB_INVALID_INDEX32;
}
const char *
SBThread::GetName () const
{
const char *name = NULL;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
name = m_opaque_sp->GetName();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
name = thread_sp->GetName();
}
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::GetName () => %s", m_opaque_sp.get(), name ? name : "NULL");
log->Printf ("SBThread(%p)::GetName () => %s", thread_sp.get(), name ? name : "NULL");
return name;
}
@ -388,15 +396,16 @@ const char *
SBThread::GetQueueName () const
{
const char *name = NULL;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
name = m_opaque_sp->GetQueueName();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
name = thread_sp->GetQueueName();
}
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::GetQueueName () => %s", m_opaque_sp.get(), name ? name : "NULL");
log->Printf ("SBThread(%p)::GetQueueName () => %s", thread_sp.get(), name ? name : "NULL");
return name;
}
@ -407,40 +416,42 @@ SBThread::StepOver (lldb::RunMode stop_other_threads)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::StepOver (stop_other_threads='%s')", m_opaque_sp.get(),
Thread::RunModeAsCString (stop_other_threads));
ThreadSP thread_sp(m_opaque_wp.lock());
if (m_opaque_sp)
if (log)
log->Printf ("SBThread(%p)::StepOver (stop_other_threads='%s')", thread_sp.get(),
Thread::RunModeAsCString (stop_other_threads));
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
bool abort_other_plans = true;
StackFrameSP frame_sp(m_opaque_sp->GetStackFrameAtIndex (0));
StackFrameSP frame_sp(thread_sp->GetStackFrameAtIndex (0));
if (frame_sp)
{
if (frame_sp->HasDebugInformation ())
{
SymbolContext sc(frame_sp->GetSymbolContext(eSymbolContextEverything));
m_opaque_sp->QueueThreadPlanForStepRange (abort_other_plans,
eStepTypeOver,
sc.line_entry.range,
sc,
stop_other_threads,
false);
thread_sp->QueueThreadPlanForStepRange (abort_other_plans,
eStepTypeOver,
sc.line_entry.range,
sc,
stop_other_threads,
false);
}
else
{
m_opaque_sp->QueueThreadPlanForStepSingleInstruction (true,
abort_other_plans,
stop_other_threads);
thread_sp->QueueThreadPlanForStepSingleInstruction (true,
abort_other_plans,
stop_other_threads);
}
}
Process &process = m_opaque_sp->GetProcess();
Process &process = thread_sp->GetProcess();
// Why do we need to set the current thread by ID here???
process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
Error error (process.Resume());
if (error.Success())
{
@ -457,38 +468,40 @@ SBThread::StepInto (lldb::RunMode stop_other_threads)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::StepInto (stop_other_threads='%s')", m_opaque_sp.get(),
Thread::RunModeAsCString (stop_other_threads));
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (log)
log->Printf ("SBThread(%p)::StepInto (stop_other_threads='%s')", thread_sp.get(),
Thread::RunModeAsCString (stop_other_threads));
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
bool abort_other_plans = true;
StackFrameSP frame_sp(m_opaque_sp->GetStackFrameAtIndex (0));
StackFrameSP frame_sp(thread_sp->GetStackFrameAtIndex (0));
if (frame_sp && frame_sp->HasDebugInformation ())
{
bool avoid_code_without_debug_info = true;
SymbolContext sc(frame_sp->GetSymbolContext(eSymbolContextEverything));
m_opaque_sp->QueueThreadPlanForStepRange (abort_other_plans,
eStepTypeInto,
sc.line_entry.range,
sc,
stop_other_threads,
avoid_code_without_debug_info);
thread_sp->QueueThreadPlanForStepRange (abort_other_plans,
eStepTypeInto,
sc.line_entry.range,
sc,
stop_other_threads,
avoid_code_without_debug_info);
}
else
{
m_opaque_sp->QueueThreadPlanForStepSingleInstruction (false,
abort_other_plans,
stop_other_threads);
thread_sp->QueueThreadPlanForStepSingleInstruction (false,
abort_other_plans,
stop_other_threads);
}
Process &process = m_opaque_sp->GetProcess();
Process &process = thread_sp->GetProcess();
// Why do we need to set the current thread by ID here???
process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
Error error (process.Resume());
if (error.Success())
{
@ -505,25 +518,27 @@ SBThread::StepOut ()
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::StepOut ()", m_opaque_sp.get());
ThreadSP thread_sp(m_opaque_wp.lock());
if (m_opaque_sp)
if (log)
log->Printf ("SBThread(%p)::StepOut ()", thread_sp.get());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
bool abort_other_plans = true;
bool stop_other_threads = true;
m_opaque_sp->QueueThreadPlanForStepOut (abort_other_plans,
NULL,
false,
stop_other_threads,
eVoteYes,
eVoteNoOpinion,
0);
thread_sp->QueueThreadPlanForStepOut (abort_other_plans,
NULL,
false,
stop_other_threads,
eVoteYes,
eVoteNoOpinion,
0);
Process &process = m_opaque_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
Process &process = thread_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
Error error (process.Resume());
if (error.Success())
{
@ -540,29 +555,31 @@ SBThread::StepOutOfFrame (lldb::SBFrame &sb_frame)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
ThreadSP thread_sp(m_opaque_wp.lock());
if (log)
{
SBStream frame_desc_strm;
sb_frame.GetDescription (frame_desc_strm);
log->Printf ("SBThread(%p)::StepOutOfFrame (frame = SBFrame(%p): %s)", m_opaque_sp.get(), sb_frame.get(), frame_desc_strm.GetData());
log->Printf ("SBThread(%p)::StepOutOfFrame (frame = SBFrame(%p): %s)", thread_sp.get(), sb_frame.get(), frame_desc_strm.GetData());
}
if (m_opaque_sp)
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
bool abort_other_plans = true;
bool stop_other_threads = true;
m_opaque_sp->QueueThreadPlanForStepOut (abort_other_plans,
NULL,
false,
stop_other_threads,
eVoteYes,
eVoteNoOpinion,
sb_frame->GetFrameIndex());
thread_sp->QueueThreadPlanForStepOut (abort_other_plans,
NULL,
false,
stop_other_threads,
eVoteYes,
eVoteNoOpinion,
sb_frame->GetFrameIndex());
Process &process = m_opaque_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
Process &process = thread_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
Error error (process.Resume());
if (error.Success())
{
@ -579,15 +596,17 @@ SBThread::StepInstruction (bool step_over)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::StepInstruction (step_over=%i)", m_opaque_sp.get(), step_over);
ThreadSP thread_sp(m_opaque_wp.lock());
if (m_opaque_sp)
if (log)
log->Printf ("SBThread(%p)::StepInstruction (step_over=%i)", thread_sp.get(), step_over);
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
m_opaque_sp->QueueThreadPlanForStepSingleInstruction (step_over, true, true);
Process &process = m_opaque_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
thread_sp->QueueThreadPlanForStepSingleInstruction (step_over, true, true);
Process &process = thread_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
Error error (process.Resume());
if (error.Success())
{
@ -604,19 +623,21 @@ SBThread::RunToAddress (lldb::addr_t addr)
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
log->Printf ("SBThread(%p)::RunToAddress (addr=0x%llx)", m_opaque_sp.get(), addr);
ThreadSP thread_sp(m_opaque_wp.lock());
if (m_opaque_sp)
if (log)
log->Printf ("SBThread(%p)::RunToAddress (addr=0x%llx)", thread_sp.get(), addr);
if (thread_sp)
{
bool abort_other_plans = true;
bool stop_other_threads = true;
Address target_addr (NULL, addr);
m_opaque_sp->QueueThreadPlanForRunToAddress (abort_other_plans, target_addr, stop_other_threads);
Process &process = m_opaque_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
thread_sp->QueueThreadPlanForRunToAddress (abort_other_plans, target_addr, stop_other_threads);
Process &process = thread_sp->GetProcess();
process.GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
Error error (process.Resume());
if (error.Success())
{
@ -636,22 +657,24 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame,
SBError sb_error;
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
char path[PATH_MAX];
ThreadSP thread_sp(m_opaque_wp.lock());
if (log)
{
SBStream frame_desc_strm;
sb_frame.GetDescription (frame_desc_strm);
sb_file_spec->GetPath (path, sizeof(path));
log->Printf ("SBThread(%p)::StepOverUntil (frame = SBFrame(%p): %s, file+line = %s:%u)",
m_opaque_sp.get(),
thread_sp.get(),
sb_frame.get(),
frame_desc_strm.GetData(),
path, line);
}
if (m_opaque_sp)
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
if (line == 0)
{
@ -664,9 +687,9 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame,
frame_sp = sb_frame.get_sp();
else
{
frame_sp = m_opaque_sp->GetSelectedFrame ();
frame_sp = thread_sp->GetSelectedFrame ();
if (!frame_sp)
frame_sp = m_opaque_sp->GetStackFrameAtIndex (0);
frame_sp = thread_sp->GetStackFrameAtIndex (0);
}
SymbolContext frame_sc;
@ -718,7 +741,7 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame,
const bool stop_other_threads = true;
const bool check_inlines = true;
const bool exact = false;
Target *target = &m_opaque_sp->GetProcess().GetTarget();
Target *target = &thread_sp->GetProcess().GetTarget();
SymbolContextList sc_list;
const uint32_t num_matches = frame_sc.comp_unit->ResolveSymbolContext (step_file_spec,
@ -758,20 +781,20 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame,
}
else
{
m_opaque_sp->QueueThreadPlanForStepUntil (abort_other_plans,
&step_over_until_addrs[0],
step_over_until_addrs.size(),
stop_other_threads,
frame_sp->GetFrameIndex());
thread_sp->QueueThreadPlanForStepUntil (abort_other_plans,
&step_over_until_addrs[0],
step_over_until_addrs.size(),
stop_other_threads,
frame_sp->GetFrameIndex());
m_opaque_sp->GetProcess().GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
sb_error.ref() = m_opaque_sp->GetProcess().Resume();
thread_sp->GetProcess().GetThreadList().SetSelectedThreadByID (thread_sp->GetID());
sb_error.ref() = thread_sp->GetProcess().Resume();
if (sb_error->Success())
{
// If we are doing synchronous mode, then wait for the
// process to stop yet again!
if (m_opaque_sp->GetProcess().GetTarget().GetDebugger().GetAsyncExecution () == false)
m_opaque_sp->GetProcess().WaitForProcessToStop (NULL);
if (thread_sp->GetProcess().GetTarget().GetDebugger().GetAsyncExecution () == false)
thread_sp->GetProcess().WaitForProcessToStop (NULL);
}
}
}
@ -786,9 +809,10 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame,
bool
SBThread::Suspend()
{
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
m_opaque_sp->SetResumeState (eStateSuspended);
thread_sp->SetResumeState (eStateSuspended);
return true;
}
return false;
@ -797,9 +821,10 @@ SBThread::Suspend()
bool
SBThread::Resume ()
{
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
m_opaque_sp->SetResumeState (eStateRunning);
thread_sp->SetResumeState (eStateRunning);
return true;
}
return false;
@ -808,8 +833,9 @@ SBThread::Resume ()
bool
SBThread::IsSuspended()
{
if (m_opaque_sp)
return m_opaque_sp->GetResumeState () == eStateSuspended;
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
return thread_sp->GetResumeState () == eStateSuspended;
return false;
}
@ -818,10 +844,11 @@ SBThread::GetProcess ()
{
SBProcess process;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
// Have to go up to the target so we can get a shared pointer to our process...
process.SetProcess(m_opaque_sp->GetProcess().GetTarget().GetProcessSP());
process.SetProcess(thread_sp->GetProcess().GetTarget().GetProcessSP());
}
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
@ -829,7 +856,7 @@ SBThread::GetProcess ()
{
SBStream frame_desc_strm;
process.GetDescription (frame_desc_strm);
log->Printf ("SBThread(%p)::GetProcess () => SBProcess(%p): %s", m_opaque_sp.get(),
log->Printf ("SBThread(%p)::GetProcess () => SBProcess(%p): %s", thread_sp.get(),
process.get(), frame_desc_strm.GetData());
}
@ -842,14 +869,15 @@ SBThread::GetNumFrames ()
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
uint32_t num_frames = 0;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
num_frames = m_opaque_sp->GetStackFrameCount();
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
num_frames = thread_sp->GetStackFrameCount();
}
if (log)
log->Printf ("SBThread(%p)::GetNumFrames () => %u", m_opaque_sp.get(), num_frames);
log->Printf ("SBThread(%p)::GetNumFrames () => %u", thread_sp.get(), num_frames);
return num_frames;
}
@ -860,10 +888,11 @@ SBThread::GetFrameAtIndex (uint32_t idx)
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
SBFrame sb_frame;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
sb_frame.SetFrame (m_opaque_sp->GetStackFrameAtIndex (idx));
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
sb_frame.SetFrame (thread_sp->GetStackFrameAtIndex (idx));
}
if (log)
@ -871,7 +900,7 @@ SBThread::GetFrameAtIndex (uint32_t idx)
SBStream frame_desc_strm;
sb_frame.GetDescription (frame_desc_strm);
log->Printf ("SBThread(%p)::GetFrameAtIndex (idx=%d) => SBFrame(%p): %s",
m_opaque_sp.get(), idx, sb_frame.get(), frame_desc_strm.GetData());
thread_sp.get(), idx, sb_frame.get(), frame_desc_strm.GetData());
}
return sb_frame;
@ -883,10 +912,11 @@ SBThread::GetSelectedFrame ()
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
SBFrame sb_frame;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
sb_frame.SetFrame (m_opaque_sp->GetSelectedFrame ());
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
sb_frame.SetFrame (thread_sp->GetSelectedFrame ());
}
if (log)
@ -894,7 +924,7 @@ SBThread::GetSelectedFrame ()
SBStream frame_desc_strm;
sb_frame.GetDescription (frame_desc_strm);
log->Printf ("SBThread(%p)::GetSelectedFrame () => SBFrame(%p): %s",
m_opaque_sp.get(), sb_frame.get(), frame_desc_strm.GetData());
thread_sp.get(), sb_frame.get(), frame_desc_strm.GetData());
}
return sb_frame;
@ -906,13 +936,14 @@ SBThread::SetSelectedFrame (uint32_t idx)
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
SBFrame sb_frame;
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
Mutex::Locker api_locker (m_opaque_sp->GetProcess().GetTarget().GetAPIMutex());
lldb::StackFrameSP frame_sp (m_opaque_sp->GetStackFrameAtIndex (idx));
Mutex::Locker api_locker (thread_sp->GetProcess().GetTarget().GetAPIMutex());
lldb::StackFrameSP frame_sp (thread_sp->GetStackFrameAtIndex (idx));
if (frame_sp)
{
m_opaque_sp->SetSelectedFrame (frame_sp.get());
thread_sp->SetSelectedFrame (frame_sp.get());
sb_frame.SetFrame (frame_sp);
}
}
@ -922,7 +953,7 @@ SBThread::SetSelectedFrame (uint32_t idx)
SBStream frame_desc_strm;
sb_frame.GetDescription (frame_desc_strm);
log->Printf ("SBThread(%p)::SetSelectedFrame (idx=%u) => SBFrame(%p): %s",
m_opaque_sp.get(), idx, sb_frame.get(), frame_desc_strm.GetData());
thread_sp.get(), idx, sb_frame.get(), frame_desc_strm.GetData());
}
return sb_frame;
}
@ -931,43 +962,13 @@ SBThread::SetSelectedFrame (uint32_t idx)
bool
SBThread::operator == (const SBThread &rhs) const
{
return m_opaque_sp.get() == rhs.m_opaque_sp.get();
return m_opaque_wp.lock().get() == rhs.m_opaque_wp.lock().get();
}
bool
SBThread::operator != (const SBThread &rhs) const
{
return m_opaque_sp.get() != rhs.m_opaque_sp.get();
}
lldb_private::Thread *
SBThread::get ()
{
return m_opaque_sp.get();
}
const lldb_private::Thread *
SBThread::operator->() const
{
return m_opaque_sp.get();
}
const lldb_private::Thread &
SBThread::operator*() const
{
return *m_opaque_sp;
}
lldb_private::Thread *
SBThread::operator->()
{
return m_opaque_sp.get();
}
lldb_private::Thread &
SBThread::operator*()
{
return *m_opaque_sp;
return m_opaque_wp.lock().get() != rhs.m_opaque_wp.lock().get();
}
bool
@ -975,9 +976,10 @@ SBThread::GetDescription (SBStream &description) const
{
Stream &strm = description.ref();
if (m_opaque_sp)
ThreadSP thread_sp(m_opaque_wp.lock());
if (thread_sp)
{
strm.Printf("SBThread: tid = 0x%4.4llx", m_opaque_sp->GetID());
strm.Printf("SBThread: tid = 0x%4.4llx", thread_sp->GetID());
}
else
strm.PutCString ("No value");

12
lldb/source/API/SBValue.cpp
View File

@ -878,23 +878,25 @@ SBValue::GetProcess()
lldb::SBThread
SBValue::GetThread()
{
SBThread result;
SBThread sb_thread;
ThreadSP thread_sp;
if (m_opaque_sp)
{
if (m_opaque_sp->GetExecutionContextScope())
{
result = SBThread(m_opaque_sp->GetExecutionContextScope()->CalculateThread()->shared_from_this());
thread_sp = m_opaque_sp->GetExecutionContextScope()->CalculateThread()->shared_from_this();
sb_thread.SetThread(thread_sp);
}
}
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log)
{
if (result.get() == NULL)
if (thread_sp.get() == NULL)
log->Printf ("SBValue(%p)::GetThread () => NULL", m_opaque_sp.get());
else
log->Printf ("SBValue(%p)::GetThread () => %p", m_opaque_sp.get(), result.get());
log->Printf ("SBValue(%p)::GetThread () => %p", m_opaque_sp.get(), thread_sp.get());
}
return result;
return sb_thread;
}
lldb::SBFrame