From ace155deba8e83a84a306e83e86cf3439887504b Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 17 Aug 2010 13:56:44 +0000 Subject: [PATCH] Bug 315796: Support for GDB 7.2 where the MI event "=thread-group-created" has been replaced with "=thread-group-started". We need to keep both to support older GDBs. --- .../org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java | 5 +++-- .../mi/service/command/MIRunControlEventProcessor_7_0.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java index 2e97089b936..597123eb7dc 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java @@ -1042,7 +1042,8 @@ public class GDBProcesses_7_0 extends AbstractDsfService } else { fThreadToGroupMap.remove(threadId); } - } else if ("thread-group-created".equals(miEvent) || "thread-group-exited".equals(miEvent)) { //$NON-NLS-1$ //$NON-NLS-2$ + } else if ("thread-group-created".equals(miEvent) || "thread-group-started".equals(miEvent) || //$NON-NLS-1$ //$NON-NLS-2$ + "thread-group-exited".equals(miEvent)) { //$NON-NLS-1$ String groupId = null; @@ -1058,7 +1059,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService } if (groupId != null) { - if ("thread-group-created".equals(miEvent)) { //$NON-NLS-1$ + if ("thread-group-created".equals(miEvent) || "thread-group-started".equals(miEvent)) { //$NON-NLS-1$ //$NON-NLS-2$ fDebuggedProcessesAndNames.put(groupId, ""); //$NON-NLS-1$ // GDB is debugging a new process. Let's fetch its diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java index d7ae38901cd..723f738ee7f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java @@ -212,7 +212,8 @@ public class MIRunControlEventProcessor_7_0 fCommandControl.getSession().dispatchEvent(event, fCommandControl.getProperties()); } - } else if ("thread-group-created".equals(miEvent) || "thread-group-exited".equals(miEvent)) { //$NON-NLS-1$ //$NON-NLS-2$ + } else if ("thread-group-created".equals(miEvent) || "thread-group-started".equals(miEvent) || //$NON-NLS-1$ //$NON-NLS-2$ + "thread-group-exited".equals(miEvent)) { //$NON-NLS-1$ String groupId = null; @@ -232,7 +233,7 @@ public class MIRunControlEventProcessor_7_0 IProcessDMContext procDmc = procService.createProcessContext(fControlDmc, groupId); MIEvent event = null; - if ("thread-group-created".equals(miEvent)) { //$NON-NLS-1$ + if ("thread-group-created".equals(miEvent) || "thread-group-started".equals(miEvent)) { //$NON-NLS-1$ //$NON-NLS-2$ event = new MIThreadGroupCreatedEvent(procDmc, exec.getToken(), groupId); } else if ("thread-group-exited".equals(miEvent)) { //$NON-NLS-1$ event = new MIThreadGroupExitedEvent(procDmc, exec.getToken(), groupId);