Attachment 186869 Details for Bug 333284 – Prototype for a new approach to attaching in non-stop mode

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

[patch] Prototype for a new approach to attaching in non-stop mode

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

on 2011-01-14 21:22:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2011-01-14 21:22:42 EST

Size: 6.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>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	15 Jan 2011 02:15:23 -0000
>@@ -20,6 +20,7 @@
> 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.INonStopRunControl;
> 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;
>@@ -92,9 +93,11 @@
>     				           return;
>         					}
> 	        				
>+	        				boolean nonStopMode = getServicesTracker().getService(INonStopRunControl.class) != null;
>+	        				
> 	        				final IMIContainerDMContext containerDmc = createContainerContext(procCtx, groupId);
> 	        				fCommandControl.queueCommand(
>-	        						fCommandFactory.createMITargetAttach(containerDmc, ((IMIProcessDMContext)procCtx).getProcId()),
>+	        						fCommandFactory.createMITargetAttach(containerDmc, ((IMIProcessDMContext)procCtx).getProcId(), nonStopMode),
> 	        						new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
> 	        							@Override
> 	        							protected void handleSuccess() {
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java,v
>retrieving revision 1.25
>diff -u -r1.25 GDBRunControl_7_0_NS.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java	28 Sep 2010 14:27:53 -0000	1.25
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java	15 Jan 2011 02:15:24 -0000
>@@ -50,6 +50,7 @@
> 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;
>@@ -93,7 +94,7 @@
>  * sync with the service state.
>  * @since 1.1
>  */
>-public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunControl, ICachingService
>+public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunControl, INonStopRunControl, ICachingService
> {
> 	@Immutable
> 	private static class ExecutionData implements IExecutionDMData2 {
>@@ -348,7 +349,8 @@
> 	private void doInitialize(final RequestMonitor rm) {
>         register(new String[]{ IRunControl.class.getName(), 
>         					   IRunControl2.class.getName(),
>-        					   IMIRunControl.class.getName()}, 
>+        					   IMIRunControl.class.getName(),
>+        					   INonStopRunControl.class.getName() }, 
>         	     new Hashtable<String,String>());
> 		fConnection = getServicesTracker().getService(ICommandControlService.class);
> 		fCommandFactory = getServicesTracker().getService(IMICommandControl.class).getCommandFactory();
>Index: src/org/eclipse/cdt/dsf/mi/service/INonStopRunControl.java
>===================================================================
>RCS file: src/org/eclipse/cdt/dsf/mi/service/INonStopRunControl.java
>diff -N src/org/eclipse/cdt/dsf/mi/service/INonStopRunControl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/dsf/mi/service/INonStopRunControl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+/*******************************************************************************
>+ * 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
>+{
>+}
>+
>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.19
>diff -u -r1.19 CommandFactory.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	16 Dec 2010 03:13:31 -0000	1.19
>+++ src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	15 Jan 2011 02:15:24 -0000
>@@ -706,6 +706,11 @@
> 		return new MITargetAttach(ctx, groupId);
> 	}
> 
>+	/** @since 4.0 */
>+	public ICommand<MIInfo> createMITargetAttach(IMIContainerDMContext ctx, String groupId, boolean asynchronous) {
>+		return new MITargetAttach(ctx, groupId, asynchronous);
>+	}
>+
> 	public ICommand<MIInfo> createMITargetDetach(ICommandControlDMContext ctx, String groupId) {
> 		return new MITargetDetach(ctx, groupId);
> 	}
>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.3
>diff -u -r1.3 MITargetAttach.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java	16 Dec 2010 03:13:31 -0000	1.3
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java	15 Jan 2011 02:15:24 -0000
>@@ -43,7 +43,17 @@
> 	 * @since 4.0
> 	 */
> 	public MITargetAttach(IMIContainerDMContext ctx, String pid) {
>-		super(ctx, "-target-attach", new String[] { pid }); //$NON-NLS-1$
>+		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

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 333284: 186869 | 192429