Attachment #190510 for bug #339047

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 339047
Collapse All | Expand All




import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
import org.eclipse.cdt.dsf.mi.service.MIProcesses;
import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess.State;
import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent;
import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo;
import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;

						@Override
						protected void handleSuccess() {
							if (getData() instanceof IMIContainerDMContext) {
								IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
								if (runControl != null && !runControl.isTargetAcceptingCommands()) {
									fBackend.interrupt();
								}





import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
import org.eclipse.cdt.dsf.mi.service.MIProcesses;
import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess.State;
import org.eclipse.cdt.dsf.mi.service.command.events.MIThreadGroupCreatedEvent;
import org.eclipse.cdt.dsf.mi.service.command.events.MIThreadGroupExitedEvent;
import org.eclipse.cdt.dsf.mi.service.command.output.MIConst;

						@Override
						protected void handleSuccess() {
							if (getData() instanceof IMIContainerDMContext) {
								IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
								if (runControl != null && !runControl.isTargetAcceptingCommands()) {
									fBackend.interrupt();
								}


Lines 1481-1486 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java (+6 lines)
1481	return MIRunMode.NON_STOP;	1481	return MIRunMode.NON_STOP;
1482	}	1482	}
1483		1483
		1484	/** @since 4.0 */
		1485	public boolean isTargetAcceptingCommands() {
		1486	// Always accepting commands in non-stop mode
		1487	return true;
		1488	}
		1489
1484	/**	1490	/**
1485	* See bug 196154	1491	* See bug 196154
1486	*	1492	*




import org.eclipse.cdt.dsf.mi.service.IMIBackend;
import org.eclipse.cdt.dsf.mi.service.IMIBackend.BackendStateChangedEvent;
import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
import org.eclipse.cdt.dsf.mi.service.command.AbstractCLIProcess;
import org.eclipse.cdt.dsf.mi.service.command.AbstractMIControl;
import org.eclipse.cdt.dsf.mi.service.command.CLIEventProcessor;
import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess.State;
import org.eclipse.cdt.dsf.mi.service.command.MIRunControlEventProcessor;
import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;

       // Interrupt GDB in case the inferior is running.
       // That way, the inferior will also be killed when we exit GDB.
       //
		IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
		if (runControl != null && !runControl.isTargetAcceptingCommands()) {
           fMIBackend.interrupt();
       }
       




import org.eclipse.cdt.dsf.mi.service.IMIBackend;
import org.eclipse.cdt.dsf.mi.service.IMIBackend.BackendStateChangedEvent;
import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
import org.eclipse.cdt.dsf.mi.service.command.AbstractCLIProcess;
import org.eclipse.cdt.dsf.mi.service.command.AbstractMIControl;
import org.eclipse.cdt.dsf.mi.service.command.CLIEventProcessor_7_0;
import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;
import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess.State;
import org.eclipse.cdt.dsf.mi.service.command.MIRunControlEventProcessor_7_0;
import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
import org.eclipse.cdt.dsf.mi.service.command.output.MIListFeaturesInfo;

    	// Interrupt GDB in case the inferior is running.
    	// That way, the inferior will also be killed when we exit GDB.
    	//
		IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
		if (runControl != null && !runControl.isTargetAcceptingCommands()) {
    		fMIBackend.interrupt();
    	}


Lines 24-29 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java (+7 lines)
24	public interface IMIRunControl extends IRunControl2	24	public interface IMIRunControl extends IRunControl2
25	{	25	{
26	/**	26	/**
		27	* Returns true if the target currently accepting commands.
		28	*
		29	* @since 4.0
		30	*/
		31	public boolean isTargetAcceptingCommands();
		32
		33	/**
27	* Request that the specified steps be executed by first ensuring the target is available	34	* Request that the specified steps be executed by first ensuring the target is available
28	* to receive commands. Once the specified steps are executed, the target should be	35	* to receive commands. Once the specified steps are executed, the target should be
29	* returned to its original availability.	36	* returned to its original availability.

Lines 1250-1253 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java (+10 lines)
1250	public IRunMode getRunMode() {	1250	public IRunMode getRunMode() {
1251	return MIRunMode.ALL_STOP;	1251	return MIRunMode.ALL_STOP;
1252	}	1252	}
		1253
		1254	/** @since 4.0 */
		1255	public boolean isTargetAcceptingCommands() {
		1256	// For all-stop mode:
		1257	// 1- if GDB is not terminated and
		1258	// 2- if execution is suspended and
		1259	// 3- if we didn't just send a resume/stop command, then
		1260	// we know GDB is accepting commands
		1261	return !fTerminated && fSuspended && !fResumePending;
		1262	}
1253	}	1263	}

Return to bug 339047

Lines 43-53 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java (-2 / +3 lines)
43	import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;	43	import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
44	import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;	44	import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
45	import org.eclipse.cdt.dsf.mi.service.IMIProcesses;	45	import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
		46	import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
46	import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;	47	import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
47	import org.eclipse.cdt.dsf.mi.service.MIProcesses;	48	import org.eclipse.cdt.dsf.mi.service.MIProcesses;
48	import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;	49	import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
49	import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;	50	import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;
50	import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess.State;
51	import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent;	51	import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent;
52	import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo;	52	import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo;
53	import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;	53	import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
Lines 370-376 Link Here
370	@Override	370	@Override
371	protected void handleSuccess() {	371	protected void handleSuccess() {
372	if (getData() instanceof IMIContainerDMContext) {	372	if (getData() instanceof IMIContainerDMContext) {
373	if (fGdb.getInferiorProcess().getState() == State.RUNNING) {	373	IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
		374	if (runControl != null && !runControl.isTargetAcceptingCommands()) {
374	fBackend.interrupt();	375	fBackend.interrupt();
375	}	376	}
376		377

Lines 39-51 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java (-2 / +3 lines)
39	import org.eclipse.cdt.dsf.mi.service.IMIBackend;	39	import org.eclipse.cdt.dsf.mi.service.IMIBackend;
40	import org.eclipse.cdt.dsf.mi.service.IMIBackend.BackendStateChangedEvent;	40	import org.eclipse.cdt.dsf.mi.service.IMIBackend.BackendStateChangedEvent;
41	import org.eclipse.cdt.dsf.mi.service.IMICommandControl;	41	import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
		42	import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
42	import org.eclipse.cdt.dsf.mi.service.command.AbstractCLIProcess;	43	import org.eclipse.cdt.dsf.mi.service.command.AbstractCLIProcess;
43	import org.eclipse.cdt.dsf.mi.service.command.AbstractMIControl;	44	import org.eclipse.cdt.dsf.mi.service.command.AbstractMIControl;
44	import org.eclipse.cdt.dsf.mi.service.command.CLIEventProcessor;	45	import org.eclipse.cdt.dsf.mi.service.command.CLIEventProcessor;
45	import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;	46	import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
46	import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext;	47	import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext;
47	import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;	48	import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess;
48	import org.eclipse.cdt.dsf.mi.service.command.MIInferiorProcess.State;
49	import org.eclipse.cdt.dsf.mi.service.command.MIRunControlEventProcessor;	49	import org.eclipse.cdt.dsf.mi.service.command.MIRunControlEventProcessor;
50	import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;	50	import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
51	import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;	51	import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
Lines 179-185 Link Here
179	// Interrupt GDB in case the inferior is running.	179	// Interrupt GDB in case the inferior is running.
180	// That way, the inferior will also be killed when we exit GDB.	180	// That way, the inferior will also be killed when we exit GDB.
181	//	181	//
182	if (fInferiorProcess.getState() == State.RUNNING) {	182	IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
		183	if (runControl != null && !runControl.isTargetAcceptingCommands()) {
183	fMIBackend.interrupt();	184	fMIBackend.interrupt();
184	}	185	}
185		186