Attachment #186869 for bug #333284

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

Lines 20-25 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java (-1 / +4 lines)
20	import org.eclipse.cdt.dsf.mi.service.IMICommandControl;	20	import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
21	import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;	21	import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
22	import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;	22	import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
		23	import org.eclipse.cdt.dsf.mi.service.INonStopRunControl;
23	import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;	24	import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
24	import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo;	25	import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo;
25	import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;	26	import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
Lines 92-100 Link Here
92	return;	93	return;
93	}	94	}
94		95
		96	boolean nonStopMode = getServicesTracker().getService(INonStopRunControl.class) != null;
		97
95	final IMIContainerDMContext containerDmc = createContainerContext(procCtx, groupId);	98	final IMIContainerDMContext containerDmc = createContainerContext(procCtx, groupId);
96	fCommandControl.queueCommand(	99	fCommandControl.queueCommand(
97	fCommandFactory.createMITargetAttach(containerDmc, ((IMIProcessDMContext)procCtx).getProcId()),	100	fCommandFactory.createMITargetAttach(containerDmc, ((IMIProcessDMContext)procCtx).getProcId(), nonStopMode),
98	new DataRequestMonitor<MIInfo>(getExecutor(), rm) {	101	new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
99	@Override	102	@Override
100	protected void handleSuccess() {	103	protected void handleSuccess() {




import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
import org.eclipse.cdt.dsf.mi.service.INonStopRunControl;
import org.eclipse.cdt.dsf.mi.service.MIBreakpointDMData;
import org.eclipse.cdt.dsf.mi.service.MIBreakpoints;
import org.eclipse.cdt.dsf.mi.service.MIBreakpoints.MIBreakpointDMContext;

 * sync with the service state.
 * @since 1.1
 */
public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunControl, INonStopRunControl, ICachingService
{
	@Immutable
	private static class ExecutionData implements IExecutionDMData2 {

	private void doInitialize(final RequestMonitor rm) {
        register(new String[]{ IRunControl.class.getName(), 
        					   IRunControl2.class.getName(),
        					   IMIRunControl.class.getName(),
        					   INonStopRunControl.class.getName() }, 
        	     new Hashtable<String,String>());
		fConnection = getServicesTracker().getService(ICommandControlService.class);
		fCommandFactory = getServicesTracker().getService(IMICommandControl.class).getCommandFactory();




/*******************************************************************************
 * Copyright (c) 2011 Ericsson and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Ericsson - initial API and implementation
 *******************************************************************************/
package org.eclipse.cdt.dsf.mi.service;


/**
 * Marker interface to indicate we are using non-stop mode
 * 
 * @since 4.0
 */
public interface INonStopRunControl
{
}


Lines 706-711 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java (+5 lines)
706	return new MITargetAttach(ctx, groupId);	706	return new MITargetAttach(ctx, groupId);
707	}	707	}
708		708
		709	/** @since 4.0 */
		710	public ICommand<MIInfo> createMITargetAttach(IMIContainerDMContext ctx, String groupId, boolean asynchronous) {
		711	return new MITargetAttach(ctx, groupId, asynchronous);
		712	}
		713
709	public ICommand<MIInfo> createMITargetDetach(ICommandControlDMContext ctx, String groupId) {	714	public ICommand<MIInfo> createMITargetDetach(ICommandControlDMContext ctx, String groupId) {
710	return new MITargetDetach(ctx, groupId);	715	return new MITargetDetach(ctx, groupId);
711	}	716	}




	 * @since 4.0
	 */
	public MITargetAttach(IMIContainerDMContext ctx, String pid) {
		this(ctx, pid, false);
	}

	/**
	 * @param ctx indicates which inferior should be used when doing the attach
	 * @param id the pid of the process to attach to
	 * 
	 * @since 4.0
	 */
	public MITargetAttach(IMIContainerDMContext ctx, String pid, boolean asynchronous) {
		super(ctx, "-target-attach", new String[] { pid, asynchronous ? "&" : "" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
	}
	
    @Override

Return to bug 333284

Lines 43-49 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java (-1 / +11 lines)
43	* @since 4.0	43	* @since 4.0
44	*/	44	*/
45	public MITargetAttach(IMIContainerDMContext ctx, String pid) {	45	public MITargetAttach(IMIContainerDMContext ctx, String pid) {
46	super(ctx, "-target-attach", new String[] { pid }); //$NON-NLS-1$	46	this(ctx, pid, false);
		47	}
		48
		49	/**
		50	* @param ctx indicates which inferior should be used when doing the attach
		51	* @param id the pid of the process to attach to
		52	*
		53	* @since 4.0
		54	*/
		55	public MITargetAttach(IMIContainerDMContext ctx, String pid, boolean asynchronous) {
		56	super(ctx, "-target-attach", new String[] { pid, asynchronous ? "&" : "" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
47	}	57	}
48		58
49	@Override	59	@Override

Added Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/INonStopRunControl.java (+22 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 Ericsson and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Ericsson - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.cdt.dsf.mi.service;
12
13
14	/**
15	* Marker interface to indicate we are using non-stop mode
16	*
17	* @since 4.0
18	*/
19	public interface INonStopRunControl
20	{
21	}
22