Accommodate MinGW GDB thread IDs

Author: jld01

dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb.tests;singleton:=true
 Bundle-Vendor: %providerName
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Fragment-Host: org.eclipse.cdt.dsf.gdb
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit;bundle-version="[4.13.2,5)"

dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThreadTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2014 Freescale and others.
+ * Copyright (c) 2011, 2026 Freescale and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
  * Contributors:
  *     Freescale  - Initial API and Implementation
  *     Alvaro Sanchez-Leon (Ericsson) - Moved from cdt.tests.dsf.gdb (Bug 437562)
+ *     John Dallaway - Accommodate decimal parent ID with hex OS ID (#1421)
  *******************************************************************************/
 package org.eclipse.cdt.dsf.mi.service.command.output;
 
@@ -23,6 +24,7 @@ public class MIThreadTests {
 	public void testOsIdParsing() {
 		assertEquals("7010", MIThread.parseOsId("Thread 0xb7c8ab90 (LWP 7010)"));
 		assertEquals("32942", MIThread.parseOsId("Thread 162.32942"));
+		assertEquals("0x80ae", MIThread.parseOsId("Thread 162.0x80ae")); // for MinGW gdb
 		assertEquals("abc123", MIThread.parseOsId("Thread abc123"));
 		assertEquals("abc123", MIThread.parseOsId("thread abc123"));
 		assertEquals("abc123", MIThread.parseOsId("THREAD abc123"));
@@ -32,5 +34,6 @@ public void testOsIdParsing() {
 	@Test
 	public void testParentIdParsing() {
 		assertEquals("162", MIThread.parseParentId("Thread 162.32942"));
+		assertEquals("162", MIThread.parseParentId("Thread 162.0x80ae")); // for MinGW gdb
 	}
 }

dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIThread.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2014 Ericsson and others.
+ * Copyright (c) 2008, 2026 Ericsson and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -15,6 +15,7 @@
  *     Xavier Raynaud (Kalray) - MIThread can be overridden (Bug 429124)
  *     Alvaro Sanchez-Leon - Bug 451396 - Improve extensibility to process MI "-thread-info" results
  *     Simon Marchi (Ericsson) - Bug 378154 - Have MIThread provide thread name
+ *     John Dallaway - Accommodate decimal parent ID with hex OS ID (#1421)
  *******************************************************************************/
 package org.eclipse.cdt.dsf.mi.service.command.output;
 
@@ -166,7 +167,8 @@ public static MIThread parse(MITuple tuple) {
 	// Note that windows gdbs returns lower case "thread" , so the matcher needs to be case-insensitive.
 	private static Pattern fgOsIdPattern1 = Pattern
 			.compile("([Tt][Hh][Rr][Ee][Aa][Dd]\\s*)(0x[0-9a-fA-F]+|-?\\d+)(\\s*\\([Ll][Ww][Pp]\\s*)(\\d*)", 0); //$NON-NLS-1$
-	private static Pattern fgOsIdPattern2 = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*\\d+\\.(\\d+)", 0); //$NON-NLS-1$
+	private static Pattern fgOsIdPattern2 = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*\\d+\\.(0x[0-9a-fA-F]+|\\d+)", //$NON-NLS-1$
+			0);
 	private static Pattern fgOsIdPattern3 = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*(\\S+)", 0); //$NON-NLS-1$
 	private static Pattern fgOsIdPattern4 = Pattern.compile("[Pp][Rr][Oo][Cc][Ee][Ss][Ss]\\s*(\\S+)", 0); //$NON-NLS-1$
 
@@ -177,7 +179,7 @@ protected static String parseOsId(String str) {
 		// General format:
 		//      "Thread 0xb7c8ab90 (LWP 7010)"
 		//                              ^^^^
-		//      "Thread 162.32942"
+		//      "Thread 162.32942"    => an integer in decimal or 0x hex notation
 		//                  ^^^^^
 		//      "thread abc123"
 		//
@@ -208,7 +210,8 @@ protected static String parseOsId(String str) {
 		return null;
 	}
 
-	private static Pattern fgIdPattern = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*(\\d+)\\.\\d+", 0); //$NON-NLS-1$
+	private static Pattern fgIdPattern = Pattern.compile("[Tt][Hh][Rr][Ee][Aa][Dd]\\s*(\\d+)\\.(0x[0-9a-fA-F]+|\\d+)", //$NON-NLS-1$
+			0);
 
 	/**
 	 * This is used to parse the same ID fed to {@link #parseOsId(String)}. The