fix(process): Debug Launch to return true for disconnect and terminate

espressif · Nov 20, 2024 · 9fde565 · 9fde565
1 parent ea0c653
commit 9fde565
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 15 deletions.
diff --git a/...sif.idf.debug.gdbjtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/dsf/Launch.java b/...sif.idf.debug.gdbjtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/dsf/Launch.java
@@ -264,23 +264,23 @@ public Process call() throws CoreException
 	public void terminate() throws DebugException
 	{
 		super.terminate();
-		for(IProcess process : getProcesses())
-		{
-			if (process != null)
-			{
-				try
-				{
-					process.terminate();	
-				}
-				catch (Exception e)
-				{
-					e.printStackTrace();
-				}
-
-			}
-		}
+
+		LaunchProcessDictionary.getInstance().killAllProcessesInLaunch(getLaunchConfiguration().getName());
 	}
 
+	@Override
+	public boolean canDisconnect()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean canTerminate()
+	{
+		return true;
+	}
+
+
 	@Override
 	public IProcess[] getProcesses()
 	{

diff --git a/...jtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/dsf/LaunchProcessDictionary.java b/...jtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/dsf/LaunchProcessDictionary.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IProcess;
 
 public class LaunchProcessDictionary
@@ -48,5 +49,25 @@ public IProcess getProcessFromDictionary(String launchName, String procName)
 
 		return processDictionary.get(launchName).get(procName);
 	}
+
+	public void killAllProcessesInLaunch(String launchName)
+	{
+		if(!processDictionary.containsKey(launchName))
+		{
+			return;
+		}
+
+		for (IProcess process : processDictionary.get(launchName).values())
+		{
+			try
+			{
+				process.terminate();
+			}
+			catch (DebugException e)
+			{
+				e.printStackTrace();
+			}
+		}
+	}
 
 }