Add option to resume at trigger breakpoints

SougandhS · SougandhS · commit 62b4f942d8f8 · 2025-02-20T15:00:25.000+05:30
This commit introduces an option to resume the virtual machine execution once a trigger breakpoint is hit. This allows trigger breakpoints to act as barriers for other breakpoints, enabling less priority breakpoints to remain active without requiring them to be disabled. Fixes #614
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TriggerPointBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TriggerPointBreakpointsTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2016 IBM Corporation and others.
+ *  Copyright (c) 2016, 2025 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -14,6 +14,7 @@
 package org.eclipse.jdt.debug.tests.breakpoints;
 
 import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.jdt.debug.core.IJavaBreakpoint;
 import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
 import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
 import org.eclipse.jdt.debug.core.IJavaStackFrame;
@@ -69,4 +70,25 @@ public void testTriggerPointBreakpoint() throws Exception {
 			removeAllBreakpoints();
 		}
 	}
+
+	public void testTriggerPointBreakpointWithResume() throws Exception {
+		String typeName = "TriggerPoint_01";
+		IJavaLineBreakpoint bp1 = createLineBreakpoint(20, typeName);
+		IJavaLineBreakpoint bp2 = createLineBreakpoint(21, typeName);
+		bp1.setTriggerPoint(true);
+		bp1.setSuspendPolicy(IJavaBreakpoint.RESUME_THREAD); // Resume mode
+		IJavaThread thread = null;
+		try {
+			thread = launchToLineBreakpoint(typeName, bp2);
+
+			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
+			int lineNumber = frame.getLineNumber();
+			assertEquals("Breakpoint should resume and hit next breakpoint", 21, lineNumber);
+			bp1.delete();
+			bp2.delete();
+		} finally {
+			terminateAndRemove(thread);
+			removeAllBreakpoints();
+		}
+	}
 }
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.java
@@ -178,6 +178,7 @@ public class DebugUIMessages extends NLS {
 	public static String JDIModelPresentation_target_suspended;
 	public static String JDIModelPresentation_thread_filtered;
 	public static String JDIModelPresentation_uncaught_62;
+	public static String JDIModelPresentation_Resume_VM;
 
 	// thread label keys are built programmatically
 
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
@@ -117,6 +117,7 @@ JDIModelPresentation_modification_72=\ [modification]
 JDIModelPresentation_native_method=[native method]
 JDIModelPresentation_not_available=not available
 JDIModelPresentation_Suspend_VM=[Suspend VM]
+JDIModelPresentation_Resume_VM=[Ignored]
 
 ###############################################################################
 # Thread label keys are built programmatically
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -1995,6 +1995,10 @@ protected void appendSuspendPolicy(IJavaBreakpoint breakpoint, StringBuilder buf
 			buffer.append(' ');
 			buffer.append(DebugUIMessages.JDIModelPresentation_Suspend_VM);
 		}
+		if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.RESUME_THREAD) {
+			buffer.append(' ');
+			buffer.append(DebugUIMessages.JDIModelPresentation_Resume_VM);
+		}
 	}
 
 	protected void appendThreadFilter(IJavaBreakpoint breakpoint, StringBuilder buffer) throws CoreException {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others.
+ * Copyright (c) 2009, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -44,6 +44,7 @@ public class StandardJavaBreakpointEditor extends AbstractJavaBreakpointEditor {
 	private Button fHitCountButton;
 	private Text fHitCountText;
 	private Button fSuspendThread;
+	private Button fResumeProgram;
 	private Button fSuspendVM;
 	protected Button fTriggerPointButton;
 
@@ -94,11 +95,12 @@ protected void createTriggerPointButton(Composite parent) {
 		fTriggerPointButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent event) {
+				if (isTriggerPoint()) {
+					fResumeProgram.setSelection(false);
+				}
 				setDirty(PROP_TRIGGER_POINT);
 			}
-
 		});
-
 	}
 
 	protected Control createStandardControls(Composite parent) {
@@ -125,12 +127,15 @@ public void modifyText(ModifyEvent e) {
 				setDirty(PROP_HIT_COUNT);
 			}
 		});
+
 		SWTFactory.createLabel(composite, "", 1); // spacer //$NON-NLS-1$
-		Composite radios = SWTFactory.createComposite(composite, composite.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
+		Composite radios = SWTFactory.createComposite(composite, composite.getFont(), 3, 1, GridData.FILL_HORIZONTAL, 0, 0);
 		fSuspendThread = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_7), 1);
 		fSuspendThread.setLayoutData(new GridData());
 		fSuspendVM = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_8), 1);
 		fSuspendVM.setLayoutData(new GridData());
+		fResumeProgram = SWTFactory.createRadioButton(radios, PropertyPageMessages.BreakpointResume, 1);
+		fResumeProgram.setLayoutData(new GridData());
 		fSuspendThread.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -143,6 +148,13 @@ public void widgetSelected(SelectionEvent e) {
 				setDirty(PROP_SUSPEND_POLICY);
 			}
 		});
+		fResumeProgram.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setDirty(PROP_SUSPEND_POLICY);
+			}
+		});
+
 		composite.addDisposeListener(new DisposeListener() {
 			@Override
 			public void widgetDisposed(DisposeEvent e) {
@@ -189,6 +201,7 @@ protected void setBreakpoint(IJavaBreakpoint breakpoint) throws CoreException {
 		boolean hasHitCount = false;
 		String text = Util.ZERO_LENGTH_STRING;
 		boolean suspendThread = true;
+		boolean resume = false;
 		if (breakpoint != null) {
 			enabled = true;
 			int hitCount = breakpoint.getHitCount();
@@ -197,15 +210,18 @@ protected void setBreakpoint(IJavaBreakpoint breakpoint) throws CoreException {
 				hasHitCount = true;
 			}
 			suspendThread= breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_THREAD;
+			resume = breakpoint.getSuspendPolicy() == IJavaBreakpoint.RESUME_THREAD && isTriggerPoint();
 		}
 		fHitCountButton.setEnabled(enabled);
 		fHitCountButton.setSelection(enabled && hasHitCount);
 		fHitCountText.setEnabled(hasHitCount);
 		fHitCountText.setText(text);
 		fSuspendThread.setEnabled(enabled);
 		fSuspendVM.setEnabled(enabled);
-		fSuspendThread.setSelection(suspendThread);
-		fSuspendVM.setSelection(!suspendThread);
+		fResumeProgram.setEnabled(isTriggerPoint());
+		fResumeProgram.setSelection(resume);
+		fSuspendThread.setSelection(suspendThread && !resume);
+		fSuspendVM.setSelection(!suspendThread && !resume);
 		fTriggerPointButton.setEnabled(enabled);
 		fTriggerPointButton.setSelection(isTriggerPoint());
 		setDirty(false);
@@ -238,6 +254,9 @@ public void doSave() throws CoreException {
 			if(fSuspendVM.getSelection()) {
 				suspendPolicy = IJavaBreakpoint.SUSPEND_VM;
 			}
+			if (fResumeProgram.getSelection() && isTriggerPoint() && fTriggerPointButton.isEnabled()) {
+				suspendPolicy = IJavaBreakpoint.RESUME_THREAD;
+			}
 			fBreakpoint.setSuspendPolicy(suspendPolicy);
 			int hitCount = -1;
 			if (fHitCountButton.getSelection()) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/PropertyPageMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/PropertyPageMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2019 IBM Corporation and others.
+ * Copyright (c) 2003, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -119,4 +119,5 @@ public class PropertyPageMessages extends NLS {
 	public static String VMCapabilitiesPropertyPage_4;
 	public static String VMCapabilitiesPropertyPage_6;
 	public static String VMCapabilitiesPropertyPage_9;
+	public static String BreakpointResume;
 }
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/PropertyPageMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/PropertyPageMessages.properties
@@ -91,3 +91,4 @@ VMCapabilitiesPropertyPage_28=&Hot Code Replace
 VMCapabilitiesPropertyPage_29=&Stepping
 VMCapabilitiesPropertyPage_30=&General
 VMCapabilitiesPropertyPage_31=This page displays optional debug capabilities that may be supported by the selected VM.
+BreakpointResume=Resume
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaBreakpoint.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -47,6 +47,12 @@ public interface IJavaBreakpoint extends IBreakpoint, ITriggerPoint {
 	 */
 	public static final int SUSPEND_THREAD = 2;
 
+	/**
+	 * Suspend policy constant indicating a breakpoint will not suspend the target VM when hit.
+	 *
+	 * @since 3.5
+	 */
+	public static final int RESUME_THREAD = 3;
 	/**
 	 * Returns whether this breakpoint is installed in at least one debug
 	 * target.
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
@@ -1481,6 +1481,13 @@ private boolean handleSuspendForBreakpointInternal(JavaBreakpoint breakpoint) {
 		// poll listeners without holding lock on thread
 		boolean suspend = true;
 		try {
+			try {
+				if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.RESUME_THREAD) {
+					return false; // Won't be suspended
+				}
+			} catch (CoreException e) {
+				logError(e);
+			}
 			suspend = JDIDebugPlugin.getDefault().fireBreakpointHit(this,
 					breakpoint);
 		} finally {

Original file line number	Diff line number	Diff line change
`@@ -1995,6 +1995,10 @@ protected void appendSuspendPolicy(IJavaBreakpoint breakpoint, StringBuilder buf`
`1995`	`1995`	`buffer.append(' ');`
`1996`	`1996`	`buffer.append(DebugUIMessages.JDIModelPresentation_Suspend_VM);`
`1997`	`1997`	`}`
	`1998`	`+ if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.RESUME_THREAD) {`
	`1999`	`+ buffer.append(' ');`
	`2000`	`+ buffer.append(DebugUIMessages.JDIModelPresentation_Resume_VM);`
	`2001`	`+ }`
`1998`	`2002`	`}`
`1999`	`2003`
`2000`	`2004`	`protected void appendThreadFilter(IJavaBreakpoint breakpoint, StringBuilder buffer) throws CoreException {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*******************************************************************************`
`2`		`- * Copyright (c) 2003, 2019 IBM Corporation and others.`
	`2`	`+ * Copyright (c) 2003, 2025 IBM Corporation and others.`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials`
`5`	`5`	`* are made available under the terms of the Eclipse Public License 2.0`
`@@ -119,4 +119,5 @@ public class PropertyPageMessages extends NLS {`
`119`	`119`	`public static String VMCapabilitiesPropertyPage_4;`
`120`	`120`	`public static String VMCapabilitiesPropertyPage_6;`
`121`	`121`	`public static String VMCapabilitiesPropertyPage_9;`
	`122`	`+ public static String BreakpointResume;`
`122`	`123`	`}`