Attachment 182593 Details for Bug 237306 – Call thread-group option

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

[patch] Call thread-group option

patch.txt (text/plain), 23.52 KB, created by Onur Akdemir

on 2010-11-08 02:54:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Onur Akdemir

Created: 2010-11-08 02:54:17 EST

Size: 23.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java,v
>retrieving revision 1.16
>diff -u -r1.16 FinalLaunchSequence.java
>--- src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java	2 Sep 2010 12:34:31 -0000	1.16
>+++ src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java	8 Nov 2010 07:47:04 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.cdt.dsf.datamodel.DataModelInitializedEvent;
> import org.eclipse.cdt.dsf.datamodel.IDMContext;
> import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
>+import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext;
> import org.eclipse.cdt.dsf.debug.service.ISourceLookup.ISourceLookupDMContext;
> import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
> import org.eclipse.cdt.dsf.gdb.actions.IConnect;
>@@ -35,6 +36,7 @@
> import org.eclipse.cdt.dsf.gdb.service.SessionType;
> import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl;
> import org.eclipse.cdt.dsf.mi.service.CSourceLookup;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
> import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
> import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
>@@ -256,9 +258,11 @@
> 		}
> 
> 		final IPath execPath = fGDBBackend.getProgramPath();
>+		final IProcessDMContext procCtx = fProcService.createProcessContext(fCommandControl.getContext(), null);
>+		final IMIContainerDMContext containerCtx = fProcService.createContainerContext(procCtx, null);
> 		if (!noFileCommand && execPath != null && !execPath.isEmpty()) {
> 			fCommandControl.queueCommand(
>-					fCommandFactory.createMIFileExecAndSymbols(fCommandControl.getContext(), 
>+					fCommandFactory.createMIFileExecAndSymbols(containerCtx, 
> 							execPath.toPortableString()), 
> 							new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
> 		} else {
>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.27
>diff -u -r1.27 GDBProcesses_7_0.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	4 Oct 2010 01:59:32 -0000	1.27
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	8 Nov 2010 07:47:05 -0000
>@@ -663,7 +663,10 @@
>     	rm.done();
>     }
>     
>-    private boolean doIsDebuggerAttachSupported() {
>+    /**
>+	 * @since 4.0
>+	 */
>+    protected boolean doIsDebuggerAttachSupported() {
>     	IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
>     	if (backend != null) {
>     		return backend.getIsAttachSession();
>@@ -703,7 +706,10 @@
> 	    }
> 	}
> 
>-    private boolean doCanDetachDebuggerFromProcess() {
>+    /**
>+	 * @since 4.0
>+	 */
>+    protected boolean doCanDetachDebuggerFromProcess() {
>     	IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
>     	if (backend != null) {
>     		return backend.getIsAttachSession() && fCommandControl.isConnected();
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
>===================================================================
>RCS file: src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
>diff -N src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,132 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 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.gdb.service;
>+
>+import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
>+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.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.command.CommandFactory;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIAddInferiorInfo;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
>+import org.eclipse.cdt.dsf.service.DsfSession;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
>+
>+/**
>+ * @since 4.0
>+ */
>+public class GDBProcesses_7_2 extends GDBProcesses_7_1 {
>+
>+    private CommandFactory fCommandFactory;
>+    private IGDBControl fCommandControl;
>+    
>+	public GDBProcesses_7_2(DsfSession session) {
>+		super(session);
>+	}
>+
>+	@Override
>+	public void initialize(final RequestMonitor requestMonitor) {
>+		super.initialize(new RequestMonitor(getExecutor(), requestMonitor) {
>+			@Override
>+			protected void handleSuccess() {
>+				doInitialize(requestMonitor);
>+			}
>+		});
>+	}
>+
>+	/**
>+	 * This method initializes this service after our superclass's initialize()
>+	 * method succeeds.
>+	 * 
>+	 * @param requestMonitor
>+	 *            The call-back object to notify when this service's
>+	 *            initialization is done.
>+	 */
>+	private void doInitialize(RequestMonitor requestMonitor) {
>+		fCommandControl = getServicesTracker().getService(IGDBControl.class);
>+        fCommandFactory = getServicesTracker().getService(IMICommandControl.class).getCommandFactory();
>+        requestMonitor.done();
>+	}
>+
>+	@Override
>+	public void shutdown(RequestMonitor requestMonitor) {
>+		super.shutdown(requestMonitor);
>+	}
>+
>+	@Override
>+    public void attachDebuggerToProcess(final IProcessDMContext procCtx, final DataRequestMonitor<IDMContext> rm) {
>+		if (procCtx instanceof IMIProcessDMContext) {
>+	    	if (!doIsDebuggerAttachSupported()) {
>+	            rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Attach not supported.", null)); //$NON-NLS-1$
>+	            rm.done();    		
>+	    		return;
>+	    	}
>+	    	
>+	    	ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(procCtx, ICommandControlDMContext.class);
>+	        fCommandControl.queueCommand(
>+	        		fCommandFactory.createMIAddInferior(controlDmc),
>+	        		new DataRequestMonitor<MIAddInferiorInfo>(getExecutor(), rm) {
>+	        			@Override
>+	        			protected void handleSuccess() {
>+	        				final String groupId = getData().getGroupId();
>+	        				if (groupId == null || groupId.trim().length() == 0) {
>+     				           rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid gdb group id.", null)); //$NON-NLS-1$
>+    				           rm.done();
>+    				           return;
>+        					}
>+	        				
>+	        				final IMIContainerDMContext containerDmc = createContainerContext(procCtx, groupId);
>+	        				fCommandControl.queueCommand(
>+	        						fCommandFactory.createMITargetAttach(containerDmc, ((IMIProcessDMContext)procCtx).getProcId()),
>+	        						new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
>+	        							@Override
>+	        							protected void handleSuccess() {
>+	        								rm.setData(containerDmc);
>+	        								rm.done();
>+	        							}
>+	        						});
>+	        			}
>+	        		});
>+	    } else {
>+            rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid process context.", null)); //$NON-NLS-1$
>+            rm.done();
>+	    }
>+	}
>+	
>+	@Override
>+    public void detachDebuggerFromProcess(IDMContext dmc, final RequestMonitor rm) {
>+    	
>+		IMIContainerDMContext containerDmc = DMContexts.getAncestorOfType(dmc, IMIContainerDMContext.class);
>+
>+    	if (containerDmc != null) {
>+        	if (!doCanDetachDebuggerFromProcess()) {
>+                rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Detach not supported.", null)); //$NON-NLS-1$
>+                rm.done();
>+                return;
>+        	}
>+
>+        	fCommandControl.queueCommand(
>+        			fCommandFactory.createMITargetDetach(containerDmc),
>+    				new DataRequestMonitor<MIInfo>(getExecutor(), rm));
>+    	} else {
>+            rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid context.", null)); //$NON-NLS-1$
>+            rm.done();
>+	    }
>+	}
>+}
>+
>Index: src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java,v
>retrieving revision 1.14
>diff -u -r1.14 GdbDebugServicesFactory.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java	27 Sep 2010 01:13:38 -0000	1.14
>+++ src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java	8 Nov 2010 07:47:06 -0000
>@@ -139,6 +139,9 @@
> 		
> 	@Override
> 	protected IProcesses createProcessesService(DsfSession session) {
>+		if (GDB_7_2_VERSION.compareTo(fVersion) <= 0) {
>+			return new GDBProcesses_7_2(session);
>+		}
> 		if (GDB_7_1_VERSION.compareTo(fVersion) <= 0) {
> 			return new GDBProcesses_7_1(session);
> 		}
>Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java,v
>retrieving revision 1.23
>diff -u -r1.23 GDBControl_7_0.java
>--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java	4 Oct 2010 01:59:32 -0000	1.23
>+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java	8 Nov 2010 07:47:07 -0000
>@@ -125,7 +125,8 @@
>      * @since 3.0
>      */
>     public GDBControl_7_0(DsfSession session, ILaunchConfiguration config, CommandFactory factory) {
>-    	super(session, true, factory);
>+    	//super(session, true, factory);
>+    	super(session, true, true, factory);
>     }
> 
>     @Override
>Index: src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java,v
>retrieving revision 1.14
>diff -u -r1.14 AbstractMIControl.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java	28 Apr 2010 23:50:49 -0000	1.14
>+++ src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java	8 Nov 2010 07:47:07 -0000
>@@ -40,6 +40,7 @@
> import org.eclipse.cdt.dsf.debug.service.command.IEventListener;
> import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
> import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
> import org.eclipse.cdt.dsf.mi.service.command.commands.MICommand;
> import org.eclipse.cdt.dsf.mi.service.command.commands.RawCommand;
>@@ -86,6 +87,10 @@
>     private int fCurrentStackLevel  = -1;
>     private String fCurrentThreadId = null;
>     
>+    // boolean for --thread-group option which helps to handle multiple inferior behaviour.
>+    // Since GDB.7.1
>+    private boolean fUseThreadGroupOption;
>+    
>     
>     private final BlockingQueue<CommandHandle> fTxCommands = new LinkedBlockingQueue<CommandHandle>();
>     private final Map<Integer, CommandHandle>  fRxCommands = Collections.synchronizedMap(new HashMap<Integer, CommandHandle>());
>@@ -139,6 +144,16 @@
>     }
> 
>     /**
>+	 * @since 4.0
>+	 */
>+    public AbstractMIControl(DsfSession session, boolean useThreadGroupOption, boolean useThreadAndFrameOptions, CommandFactory factory) {
>+        super(session);
>+        fUseThreadGroupOption     = useThreadGroupOption;
>+        fUseThreadAndFrameOptions = useThreadAndFrameOptions;
>+        fCommandFactory = factory;
>+    }
>+    
>+    /**
>      * Set the tracing stream for the MI communication.  If this method is never
>      * called, tracing will be off, by default.
>      * 
>@@ -510,6 +525,13 @@
>         	return null;
>         } 
>         
>+        public String getGroupId() {
>+        	IMIContainerDMContext containerCtx = DMContexts.getAncestorOfType(fCommand.getContext(), IMIContainerDMContext.class);
>+        	if(containerCtx != null)
>+        		return containerCtx.getGroupId();
>+        	return null;
>+        } 
>+        
>         @Override
>         public String toString() {
>             return Integer.toString(fTokenId) + fCommand;
>@@ -567,11 +589,19 @@
>                  */
> 
>                 final String str;
>-				// Not all commands support the --thread/--frame options (e.g., CLI commands)
>-                if (fUseThreadAndFrameOptions && commandHandle.getCommand().supportsThreadAndFrameOptions()) {
>+                
>+				// --thread-group support for multiple process debug
>+                if( fUseThreadGroupOption && commandHandle.getCommand().supportsThreadGroupOption() && 
>+                		fUseThreadAndFrameOptions && commandHandle.getCommand().supportsThreadAndFrameOptions() ){
>+                		// Not all commands support the --thread/--frame options (e.g., CLI commands)
>+                	str = commandHandle.getTokenId() + commandHandle.getCommand().constructCommand(commandHandle.getGroupId(),
>+	                																				   commandHandle.getThreadId(),
>+	                			                                                                       commandHandle.getStackFrameId());
>+                } else if ( fUseThreadAndFrameOptions && commandHandle.getCommand().supportsThreadAndFrameOptions() ){
>+                		
>                 	str = commandHandle.getTokenId() + commandHandle.getCommand().constructCommand(commandHandle.getThreadId(),
>-                			                                                                       commandHandle.getStackFrameId());
>-                } else if (commandHandle.getCommand() instanceof RawCommand) {
>+                            commandHandle.getStackFrameId());
>+                }else if (commandHandle.getCommand() instanceof RawCommand) {
>                 	// RawCommands CANNOT have a token id: GDB would read it as part of the RawCommand!
>                 	str = commandHandle.getCommand().constructCommand();
>                 } else {
>Index: src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java,v
>retrieving revision 1.16
>diff -u -r1.16 CommandFactory.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	2 Sep 2010 12:34:31 -0000	1.16
>+++ src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	8 Nov 2010 07:47:07 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.cdt.dsf.debug.service.command.ICommand;
> import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
> import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl.ITraceTargetDMContext;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
> import org.eclipse.cdt.dsf.mi.service.command.commands.CLIAttach;
> import org.eclipse.cdt.dsf.mi.service.command.commands.CLICatch;
>@@ -511,11 +512,17 @@
> 		return new MIExecUntil(dmc, loc);
> 	}
> 
>-	public ICommand<MIInfo> createMIFileExecAndSymbols(ICommandControlDMContext dmc, String file) {
>+	/**
>+	 * @since 4.0
>+	 */
>+	public ICommand<MIInfo> createMIFileExecAndSymbols(IMIContainerDMContext dmc, String file) {
> 		return new MIFileExecAndSymbols(dmc, file);
> 	}
> 
>-	public ICommand<MIInfo> createMIFileExecAndSymbols(ICommandControlDMContext dmc) {
>+	/**
>+	 * @since 4.0
>+	 */
>+	public ICommand<MIInfo> createMIFileExecAndSymbols(IMIContainerDMContext dmc) {
> 		return new MIFileExecAndSymbols(dmc);
> 	}
> 
>@@ -667,10 +674,24 @@
> 		return new MITargetAttach(ctx, groupId);
> 	}
> 
>+	/**
>+	 * @since 4.0
>+	 */
>+	public ICommand<MIInfo> createMITargetAttach(IMIContainerDMContext ctx, String groupId) {
>+		return new MITargetAttach(ctx, groupId);
>+	}
>+
> 	public ICommand<MIInfo> createMITargetDetach(ICommandControlDMContext ctx, String groupId) {
> 		return new MITargetDetach(ctx, groupId);
> 	}
> 
>+	/**
>+	 * @since 4.0
>+	 */
>+	public ICommand<MIInfo> createMITargetDetach(IMIContainerDMContext ctx) {
>+		return new MITargetDetach(ctx);
>+	}
>+
>     public ICommand<MIInfo> createMITargetSelect(IDMContext ctx, String[] params) {
>         return new MITargetSelect(ctx, params);
>     }
>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.2
>diff -u -r1.2 MICommand.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java	4 Mar 2010 14:00:01 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java	8 Nov 2010 07:47:07 -0000
>@@ -141,8 +141,20 @@
>      * @since 1.1
>      */
>     public String constructCommand(String threadId, int frameId) {
>+    	return constructCommand(null, threadId, frameId);
>+    }
>+
>+    /**
>+     * GDB 7.2 thread-group needed to support multiple behaviour.
>+     * @since 4.0
>+     */
>+    public String constructCommand(String groupId, String threadId, int frameId) {
>         StringBuffer command = new StringBuffer(getOperation());
>-        
>+      
>+        // Add the --thread-group option
>+        if (groupId != null) {
>+       		command.append(" --thread-group " + groupId); //$NON-NLS-1$
>+       	}
>         // Add the --thread option
>         if (threadId != null) {
>         	command.append(" --thread " + threadId); //$NON-NLS-1$
>@@ -164,7 +176,6 @@
>         command.append('\n');
>         return command.toString();
>     }
>-    
> //    /*
> //     * Checks to see if the current command can be coalesced with the 
> //     * supplied command.
>@@ -241,6 +252,11 @@
>      * @since 1.1
>      */
>     public boolean supportsThreadAndFrameOptions() { return true; }
>+
>+    /**
>+     * @since 4.0
>+     */
>+    public boolean supportsThreadGroupOption() { return false; }
>     
>     /**
>      * Compare commands based on the MI command string that they generate, 
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java,v
>retrieving revision 1.4
>diff -u -r1.4 MIFileExecAndSymbols.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java	12 Aug 2010 19:55:15 -0000	1.4
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java	8 Nov 2010 07:47:07 -0000
>@@ -11,7 +11,7 @@
> 
> package org.eclipse.cdt.dsf.mi.service.command.commands;
> 
>-import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
> 
> /**
>@@ -26,16 +26,23 @@
> public class MIFileExecAndSymbols extends MICommand<MIInfo>
> {
>     /**
>-     * @since 1.1
>+     * @since 4.0
>      */
>-    public MIFileExecAndSymbols(ICommandControlDMContext dmc, String file) {
>+    public MIFileExecAndSymbols(IMIContainerDMContext dmc, String file) {
>         super(dmc, "-file-exec-and-symbols", null, new String[] {file}); //$NON-NLS-1$
>     }
>    
>     /**
>-     * @since 1.1
>+     * @since 4.0
>      */
>-    public MIFileExecAndSymbols(ICommandControlDMContext dmc) {
>+    public MIFileExecAndSymbols(IMIContainerDMContext dmc) {
>         super(dmc, "-file-exec-and-symbols"); //$NON-NLS-1$
>     }
>+
>+    @Override
>+    public boolean supportsThreadGroupOption() {
>+    	return true;
>+    }
>+    
>+    
> }
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java,v
>retrieving revision 1.2
>diff -u -r1.2 MITargetAttach.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java	3 Jun 2010 00:09:35 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java	8 Nov 2010 07:47:07 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 Ericsson and others.
>+ * Copyright (c) 2008, 2010 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
>@@ -11,6 +11,7 @@
> package org.eclipse.cdt.dsf.mi.service.command.commands;
> 
> import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
> 
> /**
>@@ -25,4 +26,21 @@
> 	public MITargetAttach(ICommandControlDMContext ctx, String groupId) {
> 		super(ctx, "-target-attach", new String[] {groupId}); //$NON-NLS-1$
> 	}
>+	
>+	/**
>+	 * @since 4.0
>+	 */
>+	/*
>+	public MITargetAttach(IMIContainerDMContext ctx, String pid) {
>+		super(ctx, "-target-attach", new String[] {"--thread-group", ctx.getGroupId()}, new String[] {pid}); //$NON-NLS-1$ //$NON-NLS-2$
>+	}
>+	*/
>+	public MITargetAttach(IMIContainerDMContext ctx, String pid) {
>+		super(ctx, "-target-attach", new String[] {pid}); //$NON-NLS-1$
>+	}
>+	
>+    @Override
>+    public boolean supportsThreadGroupOption() {
>+    	return true;
>+    }
> }
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetDetach.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetDetach.java,v
>retrieving revision 1.2
>diff -u -r1.2 MITargetDetach.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetDetach.java	3 Jun 2010 00:09:35 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetDetach.java	8 Nov 2010 07:47:07 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.cdt.dsf.mi.service.command.commands;
> 
> import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
> 
> /**
>@@ -25,4 +26,11 @@
> 	public MITargetDetach(ICommandControlDMContext ctx, String groupId) {
> 		super(ctx, "-target-detach", new String[] {groupId}); //$NON-NLS-1$
> 	}
>+	
>+	/**
>+	* @since 4.0
>+	*/
>+	public MITargetDetach(IMIContainerDMContext ctx) {
>+		super(ctx, "-target-detach", new String[] {"--thread-group", ctx.getGroupId()}); //$NON-NLS-1$ //$NON-NLS-2$
>+	}
> }

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