From b7fc69bdac95a5b1aea85bf83eacbef5f04fdac9 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 22 Apr 2003 20:56:16 +0000
Subject: [PATCH] Remove the delay of 10 seconds in Target.suspend() and put in
 MIInferior.interrupt()

---
 .../src/org/eclipse/cdt/debug/mi/core/MIInferior.java      | 7 +++++++
 .../org/eclipse/cdt/debug/mi/core/cdi/model/Target.java    | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIInferior.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIInferior.java
index 37169dcd4a6..49e6f59efa8 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIInferior.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIInferior.java
@@ -179,6 +179,13 @@ public class MIInferior extends Process {
 		if (gdb instanceof Spawner) {
 			Spawner gdbSpawner = (Spawner)gdb;
 			gdbSpawner.interrupt();
+			// Allow (5 secs) for the interrupt to propagate.
+			for (int i = 0; isRunning() && i < 5; i++) {
+				try {
+					java.lang.Thread.sleep(1000);
+				} catch (InterruptedException e) {
+				}
+			}
 		} else {
 			// Try the exec-interrupt; this will be for "gdb --async"
 			// CommandFactory factory = session.getCommandFactory();
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
index 1c43185efd5..0ff89b49125 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
@@ -486,12 +486,6 @@ public class Target  implements ICDITarget {
 		MISession mi = session.getMISession();
 		try {
 			mi.getMIInferior().interrupt();
-			for (int i = 0; isRunning() && i < 5; i++) {
-				try {
-					java.lang.Thread.sleep(2000);
-				} catch (InterruptedException e) {
-				}
-			}
 			if (isRunning()) {
 				throw new CDIException("Unable to suspend target");
 			}