Bug 511243 - MI async mode shall not be activated for all cases when

using GDB 7.12

This solution makes the following changes:

* With GDB 7.12, use async mode as long as the Full GDB console is
supported or if the launch is configured for Non stop mode

* with GDB 7.12, don't always use MI to interrupt the service, use the
CLI when the async mode is off

Change-Id: I92c466e028b400f9054298739cd80efac18bd03a

1 files changed, 24 insertions, 21 deletions

diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_12.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_12.java
index f6b05b76138..d97d74d96c5 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_12.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_12.java
@@ -15,6 +15,7 @@ import java.util.Map;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.RequestMonitorWithProgress;
+import org.eclipse.cdt.dsf.gdb.service.IGDBBackend;
 import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
 import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
 import org.eclipse.cdt.dsf.service.DsfServicesTracker;
@@ -51,27 +52,29 @@ public class GDBJtagDSFFinalLaunchSequence_7_12 extends GDBJtagDSFFinalLaunchSeq
 
 	@Execute
 	public void stepSetTargetAsync(RequestMonitor rm) {
-		DsfServicesTracker tracker = new DsfServicesTracker(Activator.getBundleContext(),
-				getSession().getId());
-		IMICommandControl commandControl = tracker.getService(IMICommandControl.class);
-		tracker.dispose();
+        // Processing this request after sourcing the gdbinit file to make sure the user
+        // cannot change this behavior
+        DsfServicesTracker tracker = new DsfServicesTracker(Activator.getBundleContext(),
+                getSession().getId());
+        IMICommandControl commandControl = tracker.getService(IMICommandControl.class);
+        IGDBBackend gdbBackEnd = tracker.getService(IGDBBackend.class);
+        tracker.dispose();
 
-		if (commandControl != null) {
-			// Use target async when interfacing with GDB 7.12 or higher
-			// this will allow us to use the new enhanced GDB Full CLI console
-			commandControl.queueCommand(
-					commandControl.getCommandFactory().createMIGDBSetTargetAsync(commandControl.getContext(), true),
-					new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
-						@Override
-						protected void handleError() {
-							// We should only be calling this for GDB >= 7.12,
-							// but just in case, accept errors for older GDBs
-							rm.done();
-						}
-					});
-		} else {
-			// Should never happen but accept errors in this case
-			rm.done();
-		}
+        if (commandControl != null && gdbBackEnd != null) {
+            // Use target async when interfacing with the full GDB console (i.e. minimum GDB version 7.12)
+            // otherwise explicitly set it to off.
+            commandControl.queueCommand(
+                    commandControl.getCommandFactory().createMIGDBSetTargetAsync(commandControl.getContext(), gdbBackEnd.isFullGdbConsoleSupported()),
+                    new DataRequestMonitor<MIInfo>(getExecutor(), rm) {
+                        @Override
+                        protected void handleError() {
+                            // Accept errors for older GDBs
+                            rm.done();
+                        }
+                    });
+        } else {
+            // Should not happen
+            rm.done();
+        }
 	}
 }