Skip to content

Commit

Permalink
how to do it correctly.
Browse files Browse the repository at this point in the history 
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@167656 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
@jimingham
jimingham committed Nov 10, 2012
1 parent 80ce49c commit 79f7143
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 116 deletions.
44 changes: 24 additions & 20 deletions include/lldb/Target/StopInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
// Other libraries and framework includes
// Project includes
#include "lldb/lldb-public.h"
#include "lldb/Target/Process.h"

namespace lldb_private {

class StopInfo
{
friend class Process;
friend Process::ProcessEventData;
friend class ThreadPlanBase;

public:
//------------------------------------------------------------------
// Constructors and Destructors
Expand Down Expand Up @@ -65,25 +68,7 @@ class StopInfo

virtual lldb::StopReason
GetStopReason () const = 0;

// Perform any action that is associated with this stop. This is done as the
// Event is removed from the event queue.
virtual void
PerformAction (Event *event_ptr)
{
}

// Stop the thread by default. Subclasses can override this to allow
// the thread to continue if desired. The ShouldStop method should not do anything
// that might run code. If you need to run code when deciding whether to stop
// at this StopInfo, that must be done in the PerformAction. The PerformAction will
// always get called before the ShouldStop.
virtual bool
ShouldStop (Event *event_ptr)
{
return true;
}


// ShouldStopSynchronous will get called before any thread plans are consulted, and if it says we should
// resume the target, then we will just immediately resume. This should not run any code in or resume the
// target.
Expand Down Expand Up @@ -148,6 +133,25 @@ class StopInfo
GetReturnValueObject (lldb::StopInfoSP &stop_info_sp);

protected:
// Perform any action that is associated with this stop. This is done as the
// Event is removed from the event queue. ProcessEventData::DoOnRemoval does the job.
virtual void
PerformAction (Event *event_ptr)
{
}

// Stop the thread by default. Subclasses can override this to allow
// the thread to continue if desired. The ShouldStop method should not do anything
// that might run code. If you need to run code when deciding whether to stop
// at this StopInfo, that must be done in the PerformAction.
// The PerformAction will always get called before the ShouldStop. This is done by the
// ProcessEventData::DoOnRemoval, though the ThreadPlanBase needs to consult this later on.
virtual bool
ShouldStop (Event *event_ptr)
{
return true;
}

//------------------------------------------------------------------
// Classes that inherit from StackID can see and modify these
//------------------------------------------------------------------
Expand Down
191 changes: 95 additions & 96 deletions source/Target/StopInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,62 @@ class StopInfoBreakpoint : public StopInfo
return m_should_stop;
}

virtual bool
ShouldNotify (Event *event_ptr)
{
BreakpointSiteSP bp_site_sp (m_thread.GetProcess()->GetBreakpointSiteList().FindByID (m_value));
if (bp_site_sp)
{
bool all_internal = true;

for (uint32_t i = 0; i < bp_site_sp->GetNumberOfOwners(); i++)
{
if (!bp_site_sp->GetOwnerAtIndex(i)->GetBreakpoint().IsInternal())
{
all_internal = false;
break;
}
}
return all_internal == false;
}
return true;
}

virtual const char *
GetDescription ()
{
if (m_description.empty())
{
BreakpointSiteSP bp_site_sp (m_thread.GetProcess()->GetBreakpointSiteList().FindByID (m_value));
if (bp_site_sp)
{
StreamString strm;
strm.Printf("breakpoint ");
bp_site_sp->GetDescription(&strm, eDescriptionLevelBrief);
m_description.swap (strm.GetString());
}
else
{
StreamString strm;
if (m_break_id != LLDB_INVALID_BREAK_ID)
{
if (m_was_one_shot)
strm.Printf ("one-shot breakpoint %d", m_break_id);
else
strm.Printf ("breakpoint %d which has been deleted.", m_break_id);
}
else if (m_address == LLDB_INVALID_ADDRESS)
strm.Printf("breakpoint site %lli which has been deleted - unknown address", m_value);
else
strm.Printf("breakpoint site %lli which has been deleted - was at 0x%llx", m_value, m_address);

m_description.swap (strm.GetString());
}
}
return m_description.c_str();
}

protected:
bool
ShouldStop (Event *event_ptr)
{
Expand Down Expand Up @@ -346,61 +402,6 @@ class StopInfoBreakpoint : public StopInfo
if (log)
log->Printf ("Process::%s returning from action with m_should_stop: %d.", __FUNCTION__, m_should_stop);
}

virtual bool
ShouldNotify (Event *event_ptr)
{
BreakpointSiteSP bp_site_sp (m_thread.GetProcess()->GetBreakpointSiteList().FindByID (m_value));
if (bp_site_sp)
{
bool all_internal = true;

for (uint32_t i = 0; i < bp_site_sp->GetNumberOfOwners(); i++)
{
if (!bp_site_sp->GetOwnerAtIndex(i)->GetBreakpoint().IsInternal())
{
all_internal = false;
break;
}
}
return all_internal == false;
}
return true;
}

virtual const char *
GetDescription ()
{
if (m_description.empty())
{
BreakpointSiteSP bp_site_sp (m_thread.GetProcess()->GetBreakpointSiteList().FindByID (m_value));
if (bp_site_sp)
{
StreamString strm;
strm.Printf("breakpoint ");
bp_site_sp->GetDescription(&strm, eDescriptionLevelBrief);
m_description.swap (strm.GetString());
}
else
{
StreamString strm;
if (m_break_id != LLDB_INVALID_BREAK_ID)
{
if (m_was_one_shot)
strm.Printf ("one-shot breakpoint %d", m_break_id);
else
strm.Printf ("breakpoint %d which has been deleted.", m_break_id);
}
else if (m_address == LLDB_INVALID_ADDRESS)
strm.Printf("breakpoint site %lli which has been deleted - unknown address", m_value);
else
strm.Printf("breakpoint site %lli which has been deleted - was at 0x%llx", m_value, m_address);

m_description.swap (strm.GetString());
}
}
return m_description.c_str();
}

private:
std::string m_description;
Expand All @@ -423,6 +424,32 @@ class StopInfoBreakpoint : public StopInfo
class StopInfoWatchpoint : public StopInfo
{
public:
// Make sure watchpoint is properly disabled and subsequently enabled while performing watchpoint actions.
class WatchpointSentry {
public:
WatchpointSentry(Process *p, Watchpoint *w):
process(p),
watchpoint(w)
{
if (process && watchpoint)
{
watchpoint->TurnOnEphemeralMode();
process->DisableWatchpoint(watchpoint);
}
}
~WatchpointSentry()
{
if (process && watchpoint)
{
if (!watchpoint->IsDisabledDuringEphemeralMode())
process->EnableWatchpoint(watchpoint);
watchpoint->TurnOffEphemeralMode();
}
}
private:
Process *process;
Watchpoint *watchpoint;
};

StopInfoWatchpoint (Thread &thread, break_id_t watch_id) :
StopInfo(thread, watch_id),
Expand All @@ -442,6 +469,19 @@ class StopInfoWatchpoint : public StopInfo
return eStopReasonWatchpoint;
}

virtual const char *
GetDescription ()
{
if (m_description.empty())
{
StreamString strm;
strm.Printf("watchpoint %lli", m_value);
m_description.swap (strm.GetString());
}
return m_description.c_str();
}

protected:
virtual bool
ShouldStop (Event *event_ptr)
{
Expand Down Expand Up @@ -478,35 +518,6 @@ class StopInfoWatchpoint : public StopInfo
return m_should_stop;
}

// Make sure watchpoint is properly disabled and subsequently enabled while performing watchpoint actions.
class WatchpointSentry {
public:
WatchpointSentry(Process *p, Watchpoint *w):
process(p),
watchpoint(w)
{
if (process && watchpoint)
{
watchpoint->TurnOnEphemeralMode();
process->DisableWatchpoint(watchpoint);
}
}
~WatchpointSentry()
{
if (process && watchpoint)
{
if (!watchpoint->IsDisabledDuringEphemeralMode())
process->EnableWatchpoint(watchpoint);
watchpoint->TurnOffEphemeralMode();
}
}
private:
Process *process;
Watchpoint *watchpoint;
};

// Perform any action that is associated with this stop. This is done as the
// Event is removed from the event queue.
virtual void
PerformAction (Event *event_ptr)
{
Expand Down Expand Up @@ -662,18 +673,6 @@ class StopInfoWatchpoint : public StopInfo

}

virtual const char *
GetDescription ()
{
if (m_description.empty())
{
StreamString strm;
strm.Printf("watchpoint %lli", m_value);
m_description.swap (strm.GetString());
}
return m_description.c_str();
}

private:
std::string m_description;
bool m_should_stop;
Expand Down

0 comments on commit 79f7143

Please sign in to comment.