Skip to content

IEP-1771 Deadlock when terminating a stuck OpenOCD/GDB launch sequence #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sigmaaa wants to merge 4 commits into
base: master
Choose a base branch
from
Open

IEP-1771 Deadlock when terminating a stuck OpenOCD/GDB launch sequence #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0bb645
fix: fixing debug hanging on mac
sigmaaa Jun 19, 2026
97e217e
fix: make a killCommand cross-platform
sigmaaa Jun 19, 2026
6bc76a5
fix: getting the gdbPort from the preferences
sigmaaa Jun 22, 2026
e3046f6
fix: setting attribute for working copy
sigmaaa Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions bundles/com.espressif.idf.debug.gdbjtag.openocd/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,5 @@
after="org.eclipse.debug.ui.commonTab">
</placement>
</tab>
<tab
class="com.espressif.idf.debug.gdbjtag.openocd.ui.TabDebugger"
group="com.espressif.idf.debug.gdbjtag.openocd.launchConfigurationTabGroup"
id="com.espressif.idf.debug.gdbjtag.openocd.ui.debuggertab"
name="Debugger">
<placement
after="org.eclipse.cdt.cdi.launch.mainTab">
</placement>
</tab>
</extension>
</plugin>
2 changes: 2 additions & 0 deletions ...ssif.idf.debug.gdbjtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/Activator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public class Activator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "com.espressif.idf.debug.gdbjtag.openocd"; //$NON-NLS-1$
public static final String GDB_SERVER_LAUNCH_TIMEOUT = "fGdbServerLaunchTimeout"; //$NON-NLS-1$
/** Must match {@code plugin.xml} statusHandler code for {@code OpenocdStatusHandler}. */
public static final int OPENOCD_STARTUP_TIMEOUT_STATUS = 5012;

@Override
protected void initializeDefaultPreferences(IPreferenceStore preferenceStore)
Expand Down
41 changes: 28 additions & 13 deletions ....idf.debug.gdbjtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,9 @@ public static String[] getGdbServerCommandLineArray(ILaunchConfiguration configu
String fmtTelnetPort = useModernSyntax ? "telnet port %d" : "telnet_port %d"; //$NON-NLS-1$ //$NON-NLS-2$
String fmtTclPort = useModernSyntax ? "tcl port %d" : "tcl_port %d"; //$NON-NLS-1$ //$NON-NLS-2$

int port = PortChecker
.getAvailablePort(DefaultPreferences.GDB_SERVER_GDB_PORT_NUMBER_DEFAULT);

ILaunchConfigurationWorkingCopy configurationWorkingCopy = configuration.getWorkingCopy();
configurationWorkingCopy.setAttribute(IGDBJtagConstants.ATTR_PORT_NUMBER, port);
configurationWorkingCopy.doSave();

int port = configuration.getAttribute(IGDBJtagConstants.ATTR_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_GDB_PORT_NUMBER_DEFAULT);

ILaunchTarget activeLaunchTarget = Activator.getService(ILaunchBarManager.class).getActiveLaunchTarget();
if (activeLaunchTarget != null)
{
Expand All @@ -127,16 +123,14 @@ public static String[] getGdbServerCommandLineArray(ILaunchConfiguration configu
lst.add("-c"); //$NON-NLS-1$
lst.add(String.format(fmtGdbPort, port));

port = PortChecker
.getAvailablePort(configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_TELNET_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_TELNET_PORT_NUMBER_DEFAULT));
port = configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_TELNET_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_TELNET_PORT_NUMBER_DEFAULT);

lst.add("-c"); //$NON-NLS-1$
lst.add(String.format(fmtTelnetPort, port));

port = PortChecker.getAvailablePort(
Integer.parseInt(configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_TCL_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_TCL_PORT_NUMBER_DEFAULT)));
port = Integer.parseInt(configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_TCL_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_TCL_PORT_NUMBER_DEFAULT));

lst.add("-c"); //$NON-NLS-1$
lst.add(String.format(fmtTclPort, port));
Expand Down Expand Up @@ -344,6 +338,27 @@ public static boolean getDoStartGdbClient(ILaunchConfiguration config) throws Co
DefaultPreferences.DO_START_GDB_CLIENT_DEFAULT);
}

/**
* Assigns free OpenOCD ports on an in-memory working copy (no {@code doSave()}).
* Must be called once per launch before the server command line is built.
*/
public static void allocateServerPorts(ILaunchConfigurationWorkingCopy configuration) throws CoreException
{
int gdbPort = PortChecker.getAvailablePort(configuration.getAttribute(IGDBJtagConstants.ATTR_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_GDB_PORT_NUMBER_DEFAULT));
configuration.setAttribute(IGDBJtagConstants.ATTR_PORT_NUMBER, gdbPort);
Comment thread
coderabbitai[bot] marked this conversation as resolved.

int telnetPort = PortChecker.getAvailablePort(configuration.getAttribute(
ConfigurationAttributes.GDB_SERVER_TELNET_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_TELNET_PORT_NUMBER_DEFAULT));
configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_TELNET_PORT_NUMBER, telnetPort);

int tclPort = PortChecker.getAvailablePort(Integer.parseInt(configuration.getAttribute(
ConfigurationAttributes.GDB_SERVER_TCL_PORT_NUMBER,
DefaultPreferences.GDB_SERVER_TCL_PORT_NUMBER_DEFAULT)));
configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_TCL_PORT_NUMBER, String.valueOf(tclPort));
}

// ------------------------------------------------------------------------

private static boolean supportsAdapterUsbCommand(String executablePath)
Expand Down
Loading
Loading