diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java index 64193d74e70..23474d8c35d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java @@ -62,7 +62,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { */ protected Combo fTracepointModeCombo; protected static final String TP_FAST_ONLY = LaunchUIMessages.getString("GDBDebuggerPage.tracepoint_mode_fast"); //$NON-NLS-1$ - protected static final String TP_SLOW_ONLY = LaunchUIMessages.getString("GDBDebuggerPage.tracepoint_mode_slow"); //$NON-NLS-1$ + protected static final String TP_NORMAL_ONLY = LaunchUIMessages.getString("GDBDebuggerPage.tracepoint_mode_normal"); //$NON-NLS-1$ protected static final String TP_AUTOMATIC = LaunchUIMessages.getString("GDBDebuggerPage.tracepoint_mode_auto"); //$NON-NLS-1$ private IMILaunchConfigurationComponent fSolibBlock; @@ -168,15 +168,15 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { String tracepointMode = getStringAttr(config, IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_TRACEPOINT_MODE, IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_MODE_DEFAULT); - if (tracepointMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_SLOW_ONLY)) { - fTracepointModeCombo.setText(TP_SLOW_ONLY); + if (tracepointMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_NORMAL_ONLY)) { + fTracepointModeCombo.setText(TP_NORMAL_ONLY); } else if (tracepointMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_ONLY)) { fTracepointModeCombo.setText(TP_FAST_ONLY); - } else if (tracepointMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_SLOW)) { + } else if (tracepointMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_NORMAL)) { fTracepointModeCombo.setText(TP_AUTOMATIC); } else { assert false : "Unknown Tracepoint Mode: " + tracepointMode; //$NON-NLS-1$ - fTracepointModeCombo.setText(TP_SLOW_ONLY); + fTracepointModeCombo.setText(TP_NORMAL_ONLY); } } } @@ -184,12 +184,12 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { protected String getSelectedTracepointMode() { if (fTracepointModeCombo != null) { int selectedIndex = fTracepointModeCombo.getSelectionIndex(); - if (fTracepointModeCombo.getItem(selectedIndex).equals(TP_SLOW_ONLY)) { - return IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_SLOW_ONLY; + if (fTracepointModeCombo.getItem(selectedIndex).equals(TP_NORMAL_ONLY)) { + return IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_NORMAL_ONLY; } else if (fTracepointModeCombo.getItem(selectedIndex).equals(TP_FAST_ONLY)) { return IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_ONLY; } else if (fTracepointModeCombo.getItem(selectedIndex).equals(TP_AUTOMATIC)) { - return IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_SLOW; + return IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_NORMAL; } else { assert false : "Unknown Tracepoint mode: " + fTracepointModeCombo.getItem(selectedIndex); //$NON-NLS-1$ } @@ -379,7 +379,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { fTracepointModeCombo = new Combo(parent, SWT.READ_ONLY | SWT.DROP_DOWN); fTracepointModeCombo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 2, 1)); - fTracepointModeCombo.add(TP_SLOW_ONLY); + fTracepointModeCombo.add(TP_NORMAL_ONLY); fTracepointModeCombo.add(TP_FAST_ONLY); fTracepointModeCombo.add(TP_AUTOMATIC); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties index 4f51027f4a8..19595f385e6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/LaunchUIMessages.properties @@ -28,7 +28,7 @@ GDBDebuggerPage.update_thread_list_on_suspend=Force thread list update on suspen GDBDebuggerPage.Automatically_debug_forked_processes=Automatically debug forked processes (Note: Requires Multi Process GDB) GDBDebuggerPage.tracepoint_mode_label=Tracepoint mode: GDBDebuggerPage.tracepoint_mode_fast=Fast -GDBDebuggerPage.tracepoint_mode_slow=Slow +GDBDebuggerPage.tracepoint_mode_normal=Normal GDBDebuggerPage.tracepoint_mode_auto=Automatic StandardGDBDebuggerPage.0=Debugger executable must be specified. StandardGDBDebuggerPage.1=GDB Debugger Options diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/IGDBLaunchConfigurationConstants.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/IGDBLaunchConfigurationConstants.java index 9807ec2f5ec..0f1cf56d63b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/IGDBLaunchConfigurationConstants.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/IGDBLaunchConfigurationConstants.java @@ -185,10 +185,10 @@ public class IGDBLaunchConfigurationConstants { /** * Possible attribute value for the key is ATTR_DEBUGGER_TRACEPOINT_MODE. - * Indicates that only slow tracepoints should be used. + * Indicates that only normal tracepoints should be used. * @since 4.1 */ - public static final String DEBUGGER_TRACEPOINT_SLOW_ONLY = "TP_SLOW_ONLY"; //$NON-NLS-1$ + public static final String DEBUGGER_TRACEPOINT_NORMAL_ONLY = "TP_NORMAL_ONLY"; //$NON-NLS-1$ /** * Possible attribute value for the key is ATTR_DEBUGGER_TRACEPOINT_MODE. @@ -199,17 +199,17 @@ public class IGDBLaunchConfigurationConstants { /** * Possible attribute value for the key is ATTR_DEBUGGER_TRACEPOINT_MODE. - * Indicates that slow tracepoints should be used whenever a fast tracepoint + * Indicates that normal tracepoints should be used whenever a fast tracepoint * cannot be inserted. * @since 4.1 */ - public static final String DEBUGGER_TRACEPOINT_FAST_THEN_SLOW = "TP_FAST_THEN_SLOW"; //$NON-NLS-1$ + public static final String DEBUGGER_TRACEPOINT_FAST_THEN_NORMAL = "TP_FAST_THEN_NORMAL"; //$NON-NLS-1$ /** * Default attribute value for the key is ATTR_DEBUGGER_TRACEPOINT_MODE. * @since 4.1 */ - public static final String DEBUGGER_TRACEPOINT_MODE_DEFAULT = DEBUGGER_TRACEPOINT_SLOW_ONLY; + public static final String DEBUGGER_TRACEPOINT_MODE_DEFAULT = DEBUGGER_TRACEPOINT_NORMAL_ONLY; /** * The default value of DebugPlugin.ATTR_PROCESS_FACTORY_ID. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java index 1ed6a835f44..088c3591b20 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java @@ -37,7 +37,7 @@ import org.eclipse.debug.core.ILaunch; /** * Breakpoint service for GDB 7.2. * It support MI for tracepoints. - * It also support for fast vs slow tracepoints. + * It also support for fast vs normal tracepoints. * * @since 4.1 */ @@ -45,9 +45,9 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 { private IMICommandControl fConnection; - private enum TracepointMode { FAST_THEN_SLOW, FAST_ONLY, SLOW_ONLY }; + private enum TracepointMode { FAST_THEN_NORMAL, FAST_ONLY, NORMAL_ONLY }; - private TracepointMode fTracepointMode = TracepointMode.SLOW_ONLY; + private TracepointMode fTracepointMode = TracepointMode.NORMAL_ONLY; public GDBBreakpoints_7_2(DsfSession session) { super(session); @@ -100,13 +100,13 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 if (tpMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_ONLY)) { fTracepointMode = TracepointMode.FAST_ONLY; - } else if (tpMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_SLOW_ONLY)) { - fTracepointMode = TracepointMode.SLOW_ONLY; - } else if (tpMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_SLOW)) { - fTracepointMode = TracepointMode.FAST_THEN_SLOW; + } else if (tpMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_NORMAL_ONLY)) { + fTracepointMode = TracepointMode.NORMAL_ONLY; + } else if (tpMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_NORMAL)) { + fTracepointMode = TracepointMode.FAST_THEN_NORMAL; } else { assert false : "Invalid tracepoint mode: " + tpMode; //$NON-NLS-1$ - fTracepointMode = TracepointMode.SLOW_ONLY; + fTracepointMode = TracepointMode.NORMAL_ONLY; } } @@ -178,14 +178,14 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 } /** * Add a tracepoint using MI. We have three settings: - * 1- set only a fast tracepoint but if it fails, set a slow tracepoint + * 1- set only a fast tracepoint but if it fails, set a normal tracepoint * 2- only set a fast tracepoint even if it fails - * 3- only set a slow tracepoint even if a fast tracepoint could have been used + * 3- only set a normal tracepoint even if a fast tracepoint could have been used */ @Override protected void addTracepoint(final IBreakpointsTargetDMContext context, final Map attributes, final DataRequestMonitor drm) { - // Unless we should only set slow tracepoints, we try to set a fast tracepoint. - boolean isFastTracepoint = fTracepointMode != TracepointMode.SLOW_ONLY; + // Unless we should only set normal tracepoints, we try to set a fast tracepoint. + boolean isFastTracepoint = fTracepointMode != TracepointMode.NORMAL_ONLY; sendTracepointCommand(context, attributes, isFastTracepoint, new ImmediateDataRequestMonitor(drm) { @Override @@ -197,12 +197,12 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 @Override protected void handleError() { // Tracepoint failed to be set. - if (fTracepointMode == TracepointMode.FAST_THEN_SLOW) { - // In this case, we failed to set a fast tracepoint, but we should try to set a slow one. + if (fTracepointMode == TracepointMode.FAST_THEN_NORMAL) { + // In this case, we failed to set a fast tracepoint, but we should try to set a normal one. sendTracepointCommand(context, attributes, false, drm); } else { - // We either failed to set a fast tracepoint and we should not try to set a slow one, - // or we failed to set a slow one. Either way, we are done. + // We either failed to set a fast tracepoint and we should not try to set a normal one, + // or we failed to set a normal one. Either way, we are done. drm.setStatus(getStatus()); drm.done(); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java index 6c67e986119..310901feb1c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java @@ -88,7 +88,7 @@ public class MIBreakpoint { boolean isHdw = false; // Indicate if we are dealing with a tracepoint. - // (if its a fast or slow tracepoint can be known through the 'type' field) + // (if its a fast or normal tracepoint can be known through the 'type' field) boolean isTpt = false; /** See {@link #isCatchpoint()} */ @@ -343,8 +343,8 @@ public class MIBreakpoint { /** * Return whether this breakpoint is actually a tracepoint. - * This method will return true for both fast and slow tracepoints. - * To know of fast vs slow tracepoint use {@link getType()} and look + * This method will return true for both fast and normal tracepoints. + * To know of fast vs normal tracepoint use {@link getType()} and look * for "tracepoint" or "fast tracepoint" * * @since 3.0 diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java index ff640bd9fa8..84f60e59ea5 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java @@ -63,9 +63,9 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { setLaunchAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE); - // To test both fast and slow tracepoint we just the FAST_THEN_SLOW setting + // To test both fast and normal tracepoints, we use the FAST_THEN_NORMAL setting setLaunchAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_TRACEPOINT_MODE, - IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_SLOW); + IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_FAST_THEN_NORMAL); } private DsfSession fSession; @@ -631,7 +631,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { MIBreakpointDMData tp = (MIBreakpointDMData) getBreakpoint(fTracepoints[i]); assertTrue("tracepoint "+i+" is not a tracepoint but a " + tp.getBreakpointType(), tp.getBreakpointType().equals(MIBreakpoints.TRACEPOINT)); - assertTrue("tracepoint "+i+" should be a " + (data.isFastTp?"fast":"slow")+" tracepoint but is not", + assertTrue("tracepoint "+i+" should be a " + (data.isFastTp?"fast":"normal")+" tracepoint but is not", tp.getType().equals("fast tracepoint") == data.isFastTp); assertTrue("tracepoint "+i+" mismatch (wrong file name) got " + tp.getFileName(), tp.getFileName().equals(data.sourceFile)); @@ -677,7 +677,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint (will be a slow tracepoint) + // First tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FUNCTION, "*"+METHOD_NAME); @@ -690,7 +690,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Second tracepoint (will be a slow tracepoint) + // Second tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -732,7 +732,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Fifth tracepoint (will be a slow tracepoint) + // Fifth tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -912,7 +912,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -942,7 +942,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -973,7 +973,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1003,7 +1003,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1034,7 +1034,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1064,7 +1064,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1095,7 +1095,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1125,7 +1125,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1156,7 +1156,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1198,7 +1198,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1235,7 +1235,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1271,7 +1271,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1305,7 +1305,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { Map attributes = null; int index = 0; - // First tracepoint will be a slow tracepoint + // First tracepoint will be a normal tracepoint attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE); @@ -1341,7 +1341,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); - // Third tracepoint (will be a slow tracepoint) + // Third tracepoint (will be a normal tracepoint) attributes = new HashMap(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_FILE);