mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Bug 320044: New breakpoints are got installed in dead process.

Browse source
This commit is contained in:
Ling Wang 2010-07-16 19:12:32 +00:00
parent fa8ceee23e
commit 682b0c44dc
1 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
View file

@ -181,6 +181,12 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
private Map<IBreakpointsTargetDMContext, Map<IBreakpoint, List<TargetBP>>> fPlatformBPs =
new HashMap<IBreakpointsTargetDMContext, Map<IBreakpoint, List<TargetBP>>>();
/**
* BreakpointsTargetDMContext's that are being removed from {@link #fPlatformBPs}.
* See where this is used for more.
*/
private List<IBreakpointsTargetDMContext> fBPTargetDMCsBeingRemoved = new ArrayList<IBreakpoints.IBreakpointsTargetDMContext>();
/**
* Mapping of platform breakpoints to all their attributes (standard ones and
* extended ones) from UI. This will be used to check what attributes have
@ -358,8 +364,8 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
// We need to use a background thread for this operation because we are
// accessing the resources system to retrieve the breakpoint attributes.
// Accessing the resources system potentially requires using global locks.
// Also we will be calling IBreakpointAttributeTranslator which is prohibited
// from being called on the session executor thread.
// Also we will be calling some IBreakpointAttributeTranslator2 methods
// that are prohibited from being called on the session executor thread.
new Job("Install initial breakpoint list.") { //$NON-NLS-1$
{ setSystem(true); }
@ -379,28 +385,51 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
* @param rm Completion callback.
*/
public void stopTrackingBreakpoints(final IBreakpointsTargetDMContext dmc, final RequestMonitor rm) {
// - Remove the target breakpoints for the given execution context
// - Update the maps
// Remove the breakpoints for given DMC from the internal maps.
// - Remove the target breakpoints for the given DMC
// - Remove the given DMC from the internal maps.
//
Map<IBreakpoint, List<TargetBP>> platformBPs = fPlatformBPs.get(dmc);
if (platformBPs == null || platformBPs.size() == 0) {
if (platformBPs == null) {
rm.setStatus(new Status(IStatus.INFO /* NOT error */, getPluginID(), INTERNAL_ERROR, "Breakpoints not installed for given context", null)); //$NON-NLS-1$
rm.done();
return;
}
if (platformBPs.size() == 0) {
fPlatformBPs.remove(dmc); // dmc tracked but no bps installed for it.
rm.done();
return;
}
// The stopTrackingBreakpoints() may be called twice for the same DMC
// on debugger termination (one on process death and one on debugger shutdown).
// This is to prevent double killing.
if (fBPTargetDMCsBeingRemoved.contains(dmc)) { // "stop" is already underway
rm.done();
return;
}
fBPTargetDMCsBeingRemoved.add(dmc);
// Just remove the IBreakpoints installed for the "dmc".
final IBreakpoint[] bps = platformBPs.keySet().toArray(new IBreakpoint[platformBPs.size()]);
new Job("Uninstall target breakpoints list.") { //$NON-NLS-1$
{ setSystem(true); }
// Get the stored breakpoints from the platform BreakpointManager
// and install them on the target
@Override
protected IStatus run(IProgressMonitor monitor) {
doBreakpointsRemoved(bps, dmc, rm);
doBreakpointsRemoved(bps, dmc, new RequestMonitor(getExecutor(), rm){
@Override
protected void handleCompleted() {
// Regardless of success or failure in removing the breakpoints,
// we should stop tracking breakpoints for the "dmc" by removing it
// from the map.
fPlatformBPs.remove(dmc);
fBPTargetDMCsBeingRemoved.remove(dmc);
super.handleCompleted();
}});
return Status.OK_STATUS;
}
}.schedule();
@ -536,8 +565,11 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
* breakpoint, there could be multiple corresponding back-end breakpoints.
*
* @param dmc
* the context for which to remove the breakpoint.
* @param breakpoint
* @param drm
* contains list of Target breakpoints that are removed
* regardless of success or failure in the removal.
*/
private void uninstallBreakpoint(final IBreakpointsTargetDMContext dmc, final IBreakpoint breakpoint,
final DataRequestMonitor<List<TargetBP>> drm)
@ -576,6 +608,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
new RequestMonitor(getExecutor(), countingRm) {
@Override
protected void handleCompleted() {
// Remember result of the removal, success or failure.
bp.setStatus(getStatus());
if (isSuccess()) {
bp.setTargetBreakpoint(null);