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 237306 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java (-1 / +2 lines)
Lines 30-35 Link Here
30
import org.eclipse.cdt.dsf.datamodel.AbstractDMEvent;
30
import org.eclipse.cdt.dsf.datamodel.AbstractDMEvent;
31
import org.eclipse.cdt.dsf.datamodel.DMContexts;
31
import org.eclipse.cdt.dsf.datamodel.DMContexts;
32
import org.eclipse.cdt.dsf.datamodel.IDMContext;
32
import org.eclipse.cdt.dsf.datamodel.IDMContext;
33
import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
33
import org.eclipse.cdt.dsf.debug.service.ICachingService;
34
import org.eclipse.cdt.dsf.debug.service.ICachingService;
34
import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
35
import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
35
import org.eclipse.cdt.dsf.debug.service.IProcesses;
36
import org.eclipse.cdt.dsf.debug.service.IProcesses;
Lines 166-172 Link Here
166
	 */
167
	 */
167
    @Immutable
168
    @Immutable
168
	private static class MIContainerDMC extends AbstractDMContext
169
	private static class MIContainerDMC extends AbstractDMContext
169
	implements IMIContainerDMContext
170
	implements IMIContainerDMContext, IBreakpointsTargetDMContext
170
	{
171
	{
171
		/**
172
		/**
172
		 * String ID that is used to identify the thread group in the GDB/MI protocol.
173
		 * String ID that is used to identify the thread group in the GDB/MI protocol.
(-)src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java (-1 / +6 lines)
Lines 14-25 Link Here
14
import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
14
import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
15
import org.eclipse.cdt.dsf.datamodel.DMContexts;
15
import org.eclipse.cdt.dsf.datamodel.DMContexts;
16
import org.eclipse.cdt.dsf.datamodel.IDMContext;
16
import org.eclipse.cdt.dsf.datamodel.IDMContext;
17
import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
17
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
18
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
18
import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
19
import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
19
import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl;
20
import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl;
20
import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
21
import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
21
import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
22
import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
22
import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
23
import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
24
import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
23
import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
25
import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
24
import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo;
26
import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo;
25
import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
27
import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
Lines 99-105 Link Here
99
	        							@Override
101
	        							@Override
100
	        							protected void handleSuccess() {
102
	        							protected void handleSuccess() {
101
	        								rm.setData(containerDmc);
103
	        								rm.setData(containerDmc);
102
	        								rm.done();
104
	        								
105
	        								MIBreakpointsManager bpmService = getServicesTracker().getService(MIBreakpointsManager.class);
106
	        								bpmService.startTrackingBreakpoints((IBreakpointsTargetDMContext)containerDmc, rm);
103
	        							}
107
	        							}
104
	        						});
108
	        						});
105
	        			}
109
	        			}
Lines 123-128 Link Here
123
                return;
127
                return;
124
        	}
128
        	}
125
129
130
        	// khouzam should also remove this process from MIBreakpointsManager
126
        	fCommandControl.queueCommand(
131
        	fCommandControl.queueCommand(
127
        			fCommandFactory.createMITargetDetach(controlDmc, containerDmc.getGroupId()),
132
        			fCommandFactory.createMITargetDetach(controlDmc, containerDmc.getGroupId()),
128
    				new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
133
    				new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
(-)src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java (-1 / +1 lines)
Lines 22-28 Link Here
22
 * 
22
 * 
23
 */
23
 */
24
public class GDBControlDMContext extends MIControlDMContext
24
public class GDBControlDMContext extends MIControlDMContext
25
    implements ISymbolDMContext, IBreakpointsTargetDMContext, ISourceLookupDMContext, 
25
    implements ISymbolDMContext, IBreakpointsTargetDMContext/*khouzam should be removed*/, ISourceLookupDMContext, 
26
        ISignalsDMContext, IDisassemblyDMContext, ITraceTargetDMContext 
26
        ISignalsDMContext, IDisassemblyDMContext, ITraceTargetDMContext 
27
{
27
{
28
28
(-)src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java (+6 lines)
Lines 967-972 Link Here
967
		
967
		
968
		@Override
968
		@Override
969
		public void execute(final RequestMonitor rm) {
969
		public void execute(final RequestMonitor rm) {
970
			if (fCtx instanceof IContainerDMContext) {
971
				fContainerDmc = (IContainerDMContext)(fCtx);
972
				fTargetAvailable = isSuspended(fContainerDmc);
973
				rm.done();
974
			} else {
970
			IProcesses processControl = getServicesTracker().getService(IProcesses.class);
975
			IProcesses processControl = getServicesTracker().getService(IProcesses.class);
971
			processControl.getProcessesBeingDebugged(
976
			processControl.getProcessesBeingDebugged(
972
					fCtx,
977
					fCtx,
Lines 987-992 Link Here
987
						}
992
						}
988
					});
993
					});
989
		}
994
		}
995
		}
990
	};
996
	};
991
997
992
	/**
998
	/**
(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java (-1 / +1 lines)
Lines 257-263 Link Here
257
    /**
257
    /**
258
     * @since 4.0
258
     * @since 4.0
259
     */
259
     */
260
    public boolean supportsThreadGroupOption() { return false; }
260
    public boolean supportsThreadGroupOption() { return true; }
261
    
261
    
262
    /**
262
    /**
263
     * Compare commands based on the MI command string that they generate, 
263
     * Compare commands based on the MI command string that they generate, 

Return to bug 237306