Attachment 210439 Details for Bug 370376 – Fix to not add an inferior to the launch for the remote case

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

[patch] Fix to not add an inferior to the launch for the remote case

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

on 2012-02-02 06:20:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2012-02-02 06:20:24 EST

Size: 2.38 KB

patch

obsolete

>From ce342ee755ee0eeae46cf8f3b50e24bb36213043 Thu, 2 Feb 2012 06:15:23 -0500
>From: Marc Khouzam <marc.khouzam@ericsson.com>
>Date: Thu, 2 Feb 2012 06:14:56 -0500
>Subject: [PATCH] Bug 370376: [remote] Remote non-attach should not have a console for the inferior
>
>diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
>index 07f6120..d6b40ea 100644
>--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
>+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
>@@ -505,6 +505,13 @@
> 	 * @since 4.0
> 	 */
> 	protected void createConsole(final IContainerDMContext containerDmc, final boolean restart, final RequestMonitor rm) {
>+    	if (fBackend.getSessionType() == SessionType.REMOTE || fBackend.getIsAttachSession()) {
>+    		// Remote or attach sessions shouldn't have a console, since the inferior is not started
>+    		// by eclipse but by gdbserver
>+    		rm.done();
>+    		return;
>+    	}
>+    	
> 		initializeInputOutput(containerDmc, new ImmediateRequestMonitor(rm) {
> 			@Override
> 			protected void handleSuccess() {
>diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java
>index 7d6b2d0..43634a2 100644
>--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java
>+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java
>@@ -295,6 +295,15 @@
> 	 */
> 	@Execute
> 	public void stepCreateConsole(final RequestMonitor rm) {
>+    	if (fBackend.getSessionType() == SessionType.REMOTE && !fBackend.getIsAttachSession()) {
>+    		// Remote non-attach sessions don't support multi-process and therefore will not
>+    		// start new processes.  Those sessions will only start the one process, which should
>+    		// not have a console, because it's output is handled by GDB server.  Therefore,
>+    		// no need to create an inferior process and add it to the launch
>+    		rm.done();
>+    		return;
>+    	}
>+    	
> 		Process inferiorProcess;
> 		if (fPty == null) {
> 			inferiorProcess = new MIInferiorProcess(fContainerDmc, fBackend.getMIOutputStream());

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 370376: 210439