mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 246740: Restart action does not work when the program is running

Browse source
This commit is contained in:
Marc Khouzam 2011-05-09 01:43:13 +00:00
parent 5ae69e168a
commit f83c63c05f
2 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
View file

@ -437,6 +437,15 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
/** @since 4.0 */ /** @since 4.0 */
public void restart(IContainerDMContext containerDmc, Map<String, Object> attributes, DataRequestMonitor<IContainerDMContext> rm) { public void restart(IContainerDMContext containerDmc, Map<String, Object> attributes, DataRequestMonitor<IContainerDMContext> rm) {
// Before performing the restart, check if the process is properly suspended.
// Don't need to worry about non-stop before GDB 7.0, so we can simply
// interrupt the backend, if needed
// Bug 246740
IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
if (runControl != null && !runControl.isTargetAcceptingCommands()) {
fBackend.interrupt();
}
startOrRestart(containerDmc, attributes, true, rm); startOrRestart(containerDmc, attributes, true, rm);
} }

31
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
View file

@ -38,6 +38,7 @@ import org.eclipse.cdt.dsf.debug.service.ICachingService;
import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext; import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext;
import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext; import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
import org.eclipse.cdt.dsf.debug.service.IProcesses; import org.eclipse.cdt.dsf.debug.service.IProcesses;
import org.eclipse.cdt.dsf.debug.service.IRunControl;
import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerResumedDMEvent; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerResumedDMEvent;
import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerSuspendedDMEvent; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerSuspendedDMEvent;
@ -1244,8 +1245,25 @@ public class GDBProcesses_7_0 extends AbstractDsfService
} }
/** @since 4.0 */ /** @since 4.0 */
public void restart(IContainerDMContext containerDmc, Map<String, Object> attributes, DataRequestMonitor<IContainerDMContext> rm) { public void restart(final IContainerDMContext containerDmc, final Map<String, Object> attributes, final DataRequestMonitor<IContainerDMContext> rm) {
fProcRestarting = true; fProcRestarting = true;
// Before performing the restart, check if the process is properly suspended.
// For such a case, we usually use IMIRunControl.isTargetAcceptingCommands().
// However, in non-stop, although the target is accepting command, a restart
// won't work because it needs to be able to set breakpoints. So, to allow
// for breakpoints to be set, we make sure process is actually suspended.
//
// The other way to make this work is to have the restart code set the breakpoints
// using the breakpoint service, instead of sending the breakpoint command directly.
// This required more changes than suspending the process, so it was not done
// just yet.
// Bug 246740
// This request monitor actually performs the restart
RequestMonitor restartRm = new RequestMonitor(ImmediateExecutor.getInstance(), rm) {
@Override
protected void handleSuccess() {
startOrRestart(containerDmc, attributes, true, new DataRequestMonitor<IContainerDMContext>(ImmediateExecutor.getInstance(), rm) { startOrRestart(containerDmc, attributes, true, new DataRequestMonitor<IContainerDMContext>(ImmediateExecutor.getInstance(), rm) {
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
@ -1256,6 +1274,17 @@ public class GDBProcesses_7_0 extends AbstractDsfService
super.handleCompleted(); super.handleCompleted();
}; };
}); });
};
};
IRunControl runControl = getServicesTracker().getService(IRunControl.class);
if (runControl != null && !runControl.isSuspended(containerDmc)) {
// The process is running. Let's suspended it before doing the restart
runControl.suspend(containerDmc, restartRm);
} else {
// The process is already suspended, we can just trigger the restart
restartRm.done();
}
} }
/** @since 4.0 */ /** @since 4.0 */