Create constant for initial GDB inferior 'i1'

Change-Id: Ie1c0f52b11ac60735365987c89468917e311bf82

3 files changed, 12 insertions, 3 deletions

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java
index 7459b09b7e1..9e3491bb244 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java
@@ -115,7 +115,7 @@ public class DebugNewProcessSequence_7_2 extends DebugNewProcessSequence {
 			// 1- post-mortem and non-attach remote sessions don't support creating a new process
 			// 2- commands that were part of the .gdbinit file will affect the initial process, which is what the user expects,
 			//    but would not affect a new process we created instead.
-			setContainerContext(fProcService.createContainerContextFromGroupId(fGdbControl.getContext(), "i1")); //$NON-NLS-1$
+			setContainerContext(fProcService.createContainerContextFromGroupId(fGdbControl.getContext(), GDBProcesses_7_2.INITIAL_THREAD_GROUP_ID));
 			rm.done();
 			return;
 		}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
index 5d9dbc4e73a..f8a052ad295 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java
@@ -131,6 +131,14 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat
 		}
 	}
 
+	/** 
+	 * The first thread-group id used by GDB.
+	 * GDB starts up with certain things already setup, and we need
+	 * to prepare some things using this id.
+	 * @since 5.1
+	 */
+	public static final String INITIAL_THREAD_GROUP_ID = "i1"; //$NON-NLS-1$
+	
 	/**
      * The id of the single thread to be used during event visualization. 
      * @since 4.1 
@@ -307,7 +315,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat
 		                    	if (isInitialProcess()) {
 		                    		// If it is the first inferior, GDB has already created it for us
 		                    		// We really should get the id from GDB instead of hard-coding it
-		        					fContainerDmc = createContainerContext(procCtx, "i1"); //$NON-NLS-1$
+		        					fContainerDmc = createContainerContext(procCtx, INITIAL_THREAD_GROUP_ID);
 		                    		rm.done();
 		                    		return;
 		                    	}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_2.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_2.java
index 9e1cac22a61..6a9fa355d19 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_2.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence_7_2.java
@@ -18,6 +18,7 @@ import java.util.Map;
 
 import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.RequestMonitorWithProgress;
+import org.eclipse.cdt.dsf.gdb.service.GDBProcesses_7_2;
 import org.eclipse.cdt.dsf.gdb.service.IGDBProcesses;
 import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl;
 import org.eclipse.cdt.dsf.service.DsfServicesTracker;
@@ -67,7 +68,7 @@ public class GDBJtagDSFFinalLaunchSequence_7_2 extends GDBJtagDSFFinalLaunchSequ
 			rm.done();
 			return;
 		}
-        setContainerContext(procService.createContainerContextFromGroupId(gdbControl.getContext(), "i1")); //$NON-NLS-1$
+        setContainerContext(procService.createContainerContextFromGroupId(gdbControl.getContext(), GDBProcesses_7_2.INITIAL_THREAD_GROUP_ID));
 		rm.done();
 	}
 }