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

Switch SBWatchpoint to use a weak_ptr to the underlying object 

llvm-svn: 296470
This commit is contained in:
Pavel Labath 2017-02-28 12:32:45 +00:00
parent 5b8514559e
commit 7a1d34bec0
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/API/SBWatchpoint.h
View File

@ -72,7 +72,7 @@ private:
friend class SBTarget; friend class SBTarget;
friend class SBValue; friend class SBValue;
lldb::WatchpointSP m_opaque_sp; std::weak_ptr<lldb_private::Watchpoint> m_opaque_wp;
}; };
} // namespace lldb } // namespace lldb

3
lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
View File

@ -108,3 +108,6 @@ class SetWatchpointAPITestCase(TestBase):
self.assertTrue( self.assertTrue(
process.GetState() == lldb.eStateExited, process.GetState() == lldb.eStateExited,
PROCESS_EXITED) PROCESS_EXITED)
self.dbg.DeleteTarget(target)
self.assertFalse(watchpoint.IsValid())

24
lldb/source/API/SBWatchpoint.cpp
View File

@ -27,28 +27,24 @@
using namespace lldb; using namespace lldb;
using namespace lldb_private; using namespace lldb_private;
SBWatchpoint::SBWatchpoint() : m_opaque_sp() {} SBWatchpoint::SBWatchpoint() {}
SBWatchpoint::SBWatchpoint(const lldb::WatchpointSP &wp_sp) SBWatchpoint::SBWatchpoint(const lldb::WatchpointSP &wp_sp)
: m_opaque_sp(wp_sp) { : m_opaque_wp(wp_sp) {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API)); Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
if (log) { if (log) {
SBStream sstr; SBStream sstr;
GetDescription(sstr, lldb::eDescriptionLevelBrief); GetDescription(sstr, lldb::eDescriptionLevelBrief);
log->Printf("SBWatchpoint::SBWatchpoint (const lldb::WatchpointSP &wp_sp" LLDB_LOG(log, "watchpoint = {0} ({1})", wp_sp.get(), sstr.GetData());
"=%p) => this.sp = %p (%s)",
static_cast<void *>(wp_sp.get()),
static_cast<void *>(m_opaque_sp.get()), sstr.GetData());
} }
} }
SBWatchpoint::SBWatchpoint(const SBWatchpoint &rhs) SBWatchpoint::SBWatchpoint(const SBWatchpoint &rhs)
: m_opaque_sp(rhs.m_opaque_sp) {} : m_opaque_wp(rhs.m_opaque_wp) {}
const SBWatchpoint &SBWatchpoint::operator=(const SBWatchpoint &rhs) { const SBWatchpoint &SBWatchpoint::operator=(const SBWatchpoint &rhs) {
if (this != &rhs) m_opaque_wp = rhs.m_opaque_wp;
m_opaque_sp = rhs.m_opaque_sp;
return *this; return *this;
} }
@ -74,7 +70,7 @@ watch_id_t SBWatchpoint::GetID() {
return watch_id; return watch_id;
} }
bool SBWatchpoint::IsValid() const { return (bool)m_opaque_sp; } bool SBWatchpoint::IsValid() const { return bool(m_opaque_wp.lock()); }
SBError SBWatchpoint::GetError() { SBError SBWatchpoint::GetError() {
SBError sb_error; SBError sb_error;
@ -223,11 +219,11 @@ bool SBWatchpoint::GetDescription(SBStream &description,
return true; return true;
} }
void SBWatchpoint::Clear() { m_opaque_sp.reset(); } void SBWatchpoint::Clear() { m_opaque_wp.reset(); }
lldb::WatchpointSP SBWatchpoint::GetSP() const { return m_opaque_sp; } lldb::WatchpointSP SBWatchpoint::GetSP() const { return m_opaque_wp.lock(); }
void SBWatchpoint::SetSP(const lldb::WatchpointSP &sp) { m_opaque_sp = sp; } void SBWatchpoint::SetSP(const lldb::WatchpointSP &sp) { m_opaque_wp = sp; }
bool SBWatchpoint::EventIsWatchpointEvent(const lldb::SBEvent &event) { bool SBWatchpoint::EventIsWatchpointEvent(const lldb::SBEvent &event) {
return Watchpoint::WatchpointEventData::GetEventDataFromEvent(event.get()) != return Watchpoint::WatchpointEventData::GetEventDataFromEvent(event.get()) !=
@ -245,7 +241,7 @@ SBWatchpoint::GetWatchpointEventTypeFromEvent(const SBEvent &event) {
SBWatchpoint SBWatchpoint::GetWatchpointFromEvent(const lldb::SBEvent &event) { SBWatchpoint SBWatchpoint::GetWatchpointFromEvent(const lldb::SBEvent &event) {
SBWatchpoint sb_watchpoint; SBWatchpoint sb_watchpoint;
if (event.IsValid()) if (event.IsValid())
sb_watchpoint.m_opaque_sp = sb_watchpoint =
Watchpoint::WatchpointEventData::GetWatchpointFromEvent(event.GetSP()); Watchpoint::WatchpointEventData::GetWatchpointFromEvent(event.GetSP());
return sb_watchpoint; return sb_watchpoint;
} }