From 781fa19cb6f8f4ea4224646f007e2cf50e519cf6 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Fri, 30 Apr 2010 18:00:26 +0000
Subject: [PATCH] Bug 304096: Handle cases for GDB < 7.0 where interrupting the
 target does not generate a *stopped event.

---
 .../command/MIRunControlEventProcessor.java   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java
index e28d9b37478..6f367c46241 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java
@@ -170,6 +170,44 @@ public class MIRunControlEventProcessor
     			}
     		}
     	}
+    	
+    	// Now check for a oob command result.  This happens on Windows when interrupting GDB.
+    	// In this case, GDB before 7.0 does not always send a *stopped event, so we must do it ourselves
+    	// Bug 304096 (if you have the patience to go through it :-))
+    	MIResultRecord rr = ((MIOutput)output).getMIResultRecord();
+    	if (rr != null) {
+    		int id = rr.getToken();
+    		String state = rr.getResultClass();
+    		if ("error".equals(state)) { //$NON-NLS-1$
+
+    			MIResult[] results = rr.getMIResults();
+    			for (int i = 0; i < results.length; i++) {
+    				String var = results[i].getVariable();
+    				MIValue val = results[i].getMIValue();
+    				if (var.equals("msg")) { //$NON-NLS-1$
+    					if (val instanceof MIConst) {
+    						String message = ((MIConst) val).getString();
+    						if (message.toLowerCase().startsWith("quit")) { //$NON-NLS-1$
+    							IRunControl runControl = fServicesTracker.getService(IRunControl.class);
+    							IMIProcesses procService = fServicesTracker.getService(IMIProcesses.class);
+    							if (runControl != null && procService != null) {
+    								// We don't know which thread stopped so we simply create a container event.
+    								String groupId = MIProcesses.UNIQUE_GROUP_ID;
+    								IProcessDMContext procDmc = procService.createProcessContext(fControlDmc, groupId);
+    								IContainerDMContext processContainerDmc = procService.createContainerContext(procDmc, groupId);
+
+    								if (runControl.isSuspended(processContainerDmc) == false) {
+    									// Create an MISignalEvent because that is what the *stopped event should have been
+    									MIEvent<?> event = MISignalEvent.parse(processContainerDmc, id, rr.getMIResults());
+    									fCommandControl.getSession().dispatchEvent(event, fCommandControl.getProperties());
+    								}
+    							}
+    						}
+    					}
+    				}
+    			}
+    		}
+    	}
     }
 
 	/**