mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Bug 311380: Interrupting target can leave Debug view in awkward state

Browse source
This commit is contained in:
John Cortell 2010-05-03 18:56:21 +00:00
parent 4b0c9bd6ce
commit 99dd5a34ae
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java
View file

@ -363,7 +363,7 @@ public class MIStack extends AbstractDsfService
final MIFrameDMC miFrameDmc = (MIFrameDMC)frameDmc; final MIFrameDMC miFrameDmc = (MIFrameDMC)frameDmc;
IMIExecutionDMContext execDmc = DMContexts.getAncestorOfType(frameDmc, IMIExecutionDMContext.class); final IMIExecutionDMContext execDmc = DMContexts.getAncestorOfType(frameDmc, IMIExecutionDMContext.class);
if (execDmc == null) { if (execDmc == null) {
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_HANDLE, "No execution context found in " + frameDmc, null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_HANDLE, "No execution context found in " + frameDmc, null)); //$NON-NLS-1$
rm.done(); rm.done();
@ -453,6 +453,36 @@ public class MIStack extends AbstractDsfService
rm.setData(new FrameDataFromMIStackFrameListInfo(getData(), idx)); rm.setData(new FrameDataFromMIStackFrameListInfo(getData(), idx));
rm.done(); rm.done();
} }
@Override
protected void handleError() {
// We're seeing gdb in some cases fail when it's
// being asked for the stack depth or stack
// frames, but the same command succeeds if
// the request is limited to one frame. So try
// again with a limit of 1. It's better to show
// just one frame than none at all
if (miFrameDmc.fLevel == 0) {
fMICommandCache.execute(
fCommandFactory.createMIStackListFrames(execDmc, 0, 0),
new DataRequestMonitor<MIStackListFramesInfo>(getExecutor(), rm) {
@Override
protected void handleSuccess() {
// Find the index to the correct MI frame object.
int idx = findFrameIndex(getData().getMIFrames(), miFrameDmc.fLevel);
if (idx == -1) {
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_HANDLE, "Invalid frame " + frameDmc, null)); //$NON-NLS-1$
rm.done();
return;
}
// Create the data object.
rm.setData(new FrameDataFromMIStackFrameListInfo(getData(), idx));
rm.done();
}
});
}
}
}); });
} }
@ -857,7 +887,7 @@ public class MIStack extends AbstractDsfService
}); });
} }
public void getStackDepth(IDMContext dmc, final int maxDepth, final DataRequestMonitor<Integer> rm) { public void getStackDepth(final IDMContext dmc, final int maxDepth, final DataRequestMonitor<Integer> rm) {
final IMIExecutionDMContext execDmc = DMContexts.getAncestorOfType(dmc, IMIExecutionDMContext.class); final IMIExecutionDMContext execDmc = DMContexts.getAncestorOfType(dmc, IMIExecutionDMContext.class);
if (execDmc != null) { if (execDmc != null) {
// Make sure the thread is stopped // Make sure the thread is stopped
@ -909,7 +939,18 @@ public class MIStack extends AbstractDsfService
rm.setData(1); rm.setData(1);
rm.done(); rm.done();
} else { } else {
super.handleError(); // We're seeing gdb in some cases fail when it's
// being asked for the stack depth or stack
// frames, but the same command succeeds if
// the request is limited to one frame. So try
// again with a limit of 1. It's better to show
// just one frame than none at all
if (maxDepth != 1) {
getStackDepth(dmc, 1, rm);
}
else {
super.handleError();
}
} }
} }
}); });