Attachment 185691 Details for Bug 237306 – Setting breakpoint prototype

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

[patch] Setting breakpoint prototype

zpatch.txt (text/plain), 6.06 KB, created by Marc Khouzam

on 2010-12-22 06:16:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-12-22 06:16:47 EST

Size: 6.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java,v
>retrieving revision 1.30
>diff -u -r1.30 GDBProcesses_7_0.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	16 Dec 2010 20:35:59 -0000	1.30
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	22 Dec 2010 11:13:14 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.cdt.dsf.datamodel.AbstractDMEvent;
> import org.eclipse.cdt.dsf.datamodel.DMContexts;
> import org.eclipse.cdt.dsf.datamodel.IDMContext;
>+import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
> import org.eclipse.cdt.dsf.debug.service.ICachingService;
> import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
> import org.eclipse.cdt.dsf.debug.service.IProcesses;
>@@ -166,7 +167,7 @@
> 	 */
>     @Immutable
> 	private static class MIContainerDMC extends AbstractDMContext
>-	implements IMIContainerDMContext
>+	implements IMIContainerDMContext, IBreakpointsTargetDMContext
> 	{
> 		/**
> 		 * String ID that is used to identify the thread group in the GDB/MI protocol.
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java,v
>retrieving revision 1.1
>diff -u -r1.1 GDBProcesses_7_2.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java	16 Dec 2010 03:13:31 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java	22 Dec 2010 11:13:14 -0000
>@@ -14,12 +14,14 @@
> import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
> import org.eclipse.cdt.dsf.datamodel.DMContexts;
> import org.eclipse.cdt.dsf.datamodel.IDMContext;
>+import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
> import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
> import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
> import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl;
> import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
> import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
>+import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
> import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
>@@ -99,7 +101,9 @@
> 	        							@Override
> 	        							protected void handleSuccess() {
> 	        								rm.setData(containerDmc);
>-	        								rm.done();
>+	        								
>+	        								MIBreakpointsManager bpmService = getServicesTracker().getService(MIBreakpointsManager.class);
>+	        								bpmService.startTrackingBreakpoints((IBreakpointsTargetDMContext)containerDmc, rm);
> 	        							}
> 	        						});
> 	        			}
>@@ -123,6 +127,7 @@
>                 return;
>         	}
> 
>+        	// khouzam should also remove this process from MIBreakpointsManager
>         	fCommandControl.queueCommand(
>         			fCommandFactory.createMITargetDetach(controlDmc, containerDmc.getGroupId()),
>     				new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
>Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java,v
>retrieving revision 1.3
>diff -u -r1.3 GDBControlDMContext.java
>--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java	29 Jan 2010 14:37:01 -0000	1.3
>+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControlDMContext.java	22 Dec 2010 11:13:14 -0000
>@@ -22,7 +22,7 @@
>  * 
>  */
> public class GDBControlDMContext extends MIControlDMContext
>-    implements ISymbolDMContext, IBreakpointsTargetDMContext, ISourceLookupDMContext, 
>+    implements ISymbolDMContext, IBreakpointsTargetDMContext/*khouzam should be removed*/, ISourceLookupDMContext, 
>         ISignalsDMContext, IDisassemblyDMContext, ITraceTargetDMContext 
> {
> 
>Index: src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java,v
>retrieving revision 1.29
>diff -u -r1.29 MIRunControl.java
>--- src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java	27 Sep 2010 16:21:33 -0000	1.29
>+++ src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java	22 Dec 2010 11:13:15 -0000
>@@ -967,6 +967,11 @@
> 		
> 		@Override
> 		public void execute(final RequestMonitor rm) {
>+			if (fCtx instanceof IContainerDMContext) {
>+				fContainerDmc = (IContainerDMContext)(fCtx);
>+				fTargetAvailable = isSuspended(fContainerDmc);
>+				rm.done();
>+			} else {
> 			IProcesses processControl = getServicesTracker().getService(IProcesses.class);
> 			processControl.getProcessesBeingDebugged(
> 					fCtx,
>@@ -987,6 +992,7 @@
> 						}
> 					});
> 		}
>+		}
> 	};
> 
> 	/**
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java,v
>retrieving revision 1.3
>diff -u -r1.3 MICommand.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java	16 Dec 2010 03:13:31 -0000	1.3
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java	22 Dec 2010 11:13:15 -0000
>@@ -257,7 +257,7 @@
>     /**
>      * @since 4.0
>      */
>-    public boolean supportsThreadGroupOption() { return false; }
>+    public boolean supportsThreadGroupOption() { return true; }
>     
>     /**
>      * Compare commands based on the MI command string that they generate,

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 237306: 166478 | 167440 | 168092 | 168093 | 168510 | 176501 | 178929 | 179595 | 179596 | 179913 | 182593 | 184318 | 185285 | 185617 | 185691 | 186266 | 187326 | 187357 | 190931 | 190997