mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Bug 320839 - If gdb cannot be started for some reason, gdbserver doesn't get killed on target.

Browse source
This commit is contained in:
Marc Khouzam 2011-05-26 17:13:30 +00:00
parent 908bfad797
commit ac5e2040b0
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010 Mentor Graphics Corporation and others. * Copyright (c) 2010, 2011 Mentor Graphics Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,7 +11,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.launch.remote.launching; package org.eclipse.cdt.launch.remote.launching;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate; import org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate;
@ -49,6 +48,7 @@ public class RemoteGdbLaunchDelegate extends GdbLaunchDelegate {
} }
IPath exePath = checkBinaryDetails(config); IPath exePath = checkBinaryDetails(config);
Process remoteShellProcess = null;
if (exePath != null) { if (exePath != null) {
// 1.Download binary if needed // 1.Download binary if needed
String remoteExePath = config.getAttribute( String remoteExePath = config.getAttribute(
@ -77,7 +77,7 @@ public class RemoteGdbLaunchDelegate extends GdbLaunchDelegate {
if (arguments != null && !arguments.equals("")) //$NON-NLS-1$ if (arguments != null && !arguments.equals("")) //$NON-NLS-1$
commandArguments += " " + arguments; //$NON-NLS-1$ commandArguments += " " + arguments; //$NON-NLS-1$
monitor.setTaskName(Messages.RemoteRunLaunchDelegate_9); monitor.setTaskName(Messages.RemoteRunLaunchDelegate_9);
Process remoteShellProcess = RSEHelper.remoteShellExec(config, remoteShellProcess = RSEHelper.remoteShellExec(config,
prelaunchCmd, gdbserverCommand, commandArguments, prelaunchCmd, gdbserverCommand, commandArguments,
new SubProgressMonitor(monitor, 5)); new SubProgressMonitor(monitor, 5));
@ -96,8 +96,19 @@ public class RemoteGdbLaunchDelegate extends GdbLaunchDelegate {
wc.doSave(); wc.doSave();
} }
try{
super.launch(config, mode, launch, monitor); super.launch(config, mode, launch, monitor);
} catch(CoreException ex) {
//launch failed, need to kill gdbserver
if (remoteShellProcess != null) {
remoteShellProcess.destroy();
}
//report failure further
throw ex;
} finally {
monitor.done();
}
} }
protected String getProgramArguments(ILaunchConfiguration config) protected String getProgramArguments(ILaunchConfiguration config)