Attachment 192429 Details for Bug 333284 – Fix

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

[patch] Fix

z.attachInterrupt1.patch (text/plain), 6.11 KB, created by Marc Khouzam

on 2011-04-03 21:23:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2011-04-03 21:23:48 EDT

Size: 6.11 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.44
>diff -u -r1.44 GDBProcesses_7_0.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	2 Apr 2011 01:50:49 -0000	1.44
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	4 Apr 2011 01:10:37 -0000
>@@ -59,6 +59,7 @@
> import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
> import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
> import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
>+import org.eclipse.cdt.dsf.mi.service.IMIRunControl.MIRunMode;
> import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
> import org.eclipse.cdt.dsf.mi.service.MIProcesses;
> import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
>@@ -840,8 +841,16 @@
> 	    				new Step() { 
> 	    					@Override
> 	    					public void execute(RequestMonitor rm) {
>+	    						// For non-stop mode, we do a non-interrupting attach
>+	    						// Bug 333284
>+	    						boolean shouldInterrupt = true;
>+								IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
>+								if (runControl != null && runControl.getRunMode() == MIRunMode.NON_STOP) {
>+									shouldInterrupt = false;
>+								}
>+
> 	    						fCommandControl.queueCommand(
>-	    								fCommandFactory.createMITargetAttach(fContainerDmc, ((IMIProcessDMContext)procCtx).getProcId()),
>+	    								fCommandFactory.createMITargetAttach(fContainerDmc, ((IMIProcessDMContext)procCtx).getProcId(), shouldInterrupt),
> 	    								new DataRequestMonitor<MIInfo>(getExecutor(), rm));
> 	    					}
> 	    				},
>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.8
>diff -u -r1.8 GDBProcesses_7_2.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java	2 Apr 2011 01:50:49 -0000	1.8
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java	4 Apr 2011 01:10:37 -0000
>@@ -27,8 +27,10 @@
> 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.IMIRunControl;
> import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
> import org.eclipse.cdt.dsf.mi.service.MIProcesses;
>+import org.eclipse.cdt.dsf.mi.service.IMIRunControl.MIRunMode;
> 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;
>@@ -179,8 +181,16 @@
> 		                new Step() { 
> 		                    @Override
> 		                    public void execute(RequestMonitor rm) {
>-		    					fCommandControl.queueCommand(
>-		    							fCommandFactory.createMITargetAttach(fContainerDmc, ((IMIProcessDMContext)procCtx).getProcId()),
>+	    						// For non-stop mode, we do a non-interrupting attach
>+	    						// Bug 333284
>+	    						boolean shouldInterrupt = true;
>+								IMIRunControl runControl = getServicesTracker().getService(IMIRunControl.class);
>+								if (runControl != null && runControl.getRunMode() == MIRunMode.NON_STOP) {
>+									shouldInterrupt = false;
>+								}
>+
>+	    						fCommandControl.queueCommand(
>+	    								fCommandFactory.createMITargetAttach(fContainerDmc, ((IMIProcessDMContext)procCtx).getProcId(), shouldInterrupt),
> 		    							new DataRequestMonitor<MIInfo>(ImmediateExecutor.getInstance(), rm));
> 		                    }
> 		                },
>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.24
>diff -u -r1.24 CommandFactory.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	10 Mar 2011 01:51:17 -0000	1.24
>+++ src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	4 Apr 2011 01:10:37 -0000
>@@ -715,6 +715,11 @@
> 		return new MITargetAttach(ctx, groupId);
> 	}
> 
>+	/** @since 4.0 */
>+	public ICommand<MIInfo> createMITargetAttach(IMIContainerDMContext ctx, String groupId, boolean interrupt) {
>+		return new MITargetAttach(ctx, groupId, interrupt);
>+	}
>+
> 	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.4
>diff -u -r1.4 MITargetAttach.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java	22 Jan 2011 11:31:12 -0000	1.4
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetAttach.java	4 Apr 2011 01:10:37 -0000
>@@ -43,6 +43,19 @@
> 	 * @since 4.0
> 	 */
> 	public MITargetAttach(IMIContainerDMContext ctx, String pid) {
>-		super(ctx, "-target-attach", new String[] { pid }); //$NON-NLS-1$
>+		this(ctx, pid, true);
>+	}
>+
>+	/**
>+	 * @param ctx indicates which inferior should be used when doing the attach
>+	 * @param id the pid of the process to attach to
>+	 * @param interrupt indicates if the process should be interrupted once the attach is done
>+	 *                  Leaving the process running is only support with target-async on, which
>+	 *                  we currently only use in non-stop mode
>+	 * 
>+	 * @since 4.0
>+	 */
>+	public MITargetAttach(IMIContainerDMContext ctx, String pid, boolean interrupt) {
>+		super(ctx, "-target-attach", new String[] { pid, interrupt ? "" : "&" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 	}
> }

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 333284: 186869 | 192429