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

Bug 434645 - Terminate GDB launch using registered terminate handler

Browse source 
Change-Id: I4c59bacd8edaff4734dbafbf541552e8fa124c03
Reviewed-on: https://git.eclipse.org/r/26727
Tested-by: Hudson CI
Reviewed-by: Marc Khouzam <marc.khouzam@ericsson.com>
This commit is contained in:
Teodor Madan 2014-05-16 16:14:47 +03:00
parent dc63d60efd
commit 8f700b4d91
2 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
View file

@ -478,4 +478,13 @@
plugin="org.eclipse.cdt.dsf.gdb">
</statusHandler>
</extension>
<extension
point="org.eclipse.debug.core.statusHandlers">
<statusHandler
class="org.eclipse.cdt.dsf.gdb.internal.ui.GdbStatusHandler"
code="10004"
id="org.eclipse.cdt.dsf.gdb.ui.statusHandler"
plugin="org.eclipse.cdt.dsf.gdb">
</statusHandler>
</extension>
</plugin>

60
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java
View file

@ -21,6 +21,7 @@ import java.util.concurrent.RejectedExecutionException;
import org.eclipse.cdt.debug.core.model.IConnectHandler;
import org.eclipse.cdt.debug.core.model.IDebugNewExecutableHandler;
import org.eclipse.cdt.debug.internal.core.CRequest;
import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor;
import org.eclipse.cdt.dsf.concurrent.DefaultDsfExecutor;
import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
@ -46,16 +47,16 @@ import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
import org.eclipse.cdt.dsf.service.DsfServicesTracker;
import org.eclipse.cdt.dsf.service.DsfSession;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.debug.core.commands.IDebugCommandRequest;
import org.eclipse.debug.core.commands.ITerminateHandler;
import org.eclipse.debug.core.model.IDisconnect;
import org.eclipse.debug.core.model.ISourceLocator;
@ -193,6 +194,37 @@ public class GdbLaunch extends DsfLaunch
///////////////////////////////////////////////////////////////////////////
// ITerminate
static class TerminateRequest extends CRequest implements IDebugCommandRequest {
Object[] elements;
public TerminateRequest(Object[] objects) {
elements = objects;
}
@Override
public Object[] getElements() {
return elements;
}
@Override
public void done() {
IStatus status = getStatus();
if (status != null && !status.isOK()) {
IStatusHandler statusHandler = DebugPlugin.getDefault().getStatusHandler(status);
if (statusHandler != null) {
try {
statusHandler.handleStatus(status, null);
} catch (CoreException ex) {
GdbPlugin.getDefault().getLog().log(ex.getStatus());
}
} else {
GdbPlugin.getDefault().getLog().log(status);
}
}
}
}
@Override
public boolean canTerminate() {
return fInitialized && super.canTerminate();
@ -205,23 +237,15 @@ public class GdbLaunch extends DsfLaunch
public void terminate() throws DebugException {
// Execute asynchronously to avoid potential deadlocks
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=434645
//
Job job = new Job("Terminate session") { //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
GdbLaunch.super.terminate();
} catch (DebugException e) {
return new MultiStatus(
GdbPlugin.PLUGIN_ID, IStatus.ERROR, new IStatus[]{e.getStatus()}, "Terminate session failed", e); //$NON-NLS-1$
}
return Status.OK_STATUS;
}
};
job.setSystem(true);
job.schedule();
ITerminateHandler handler = (ITerminateHandler) getAdapter(ITerminateHandler.class);
if (handler == null) {
super.terminate();
return;
}
TerminateRequest req = new TerminateRequest(new Object[] {this});
handler.execute(req);
}
// ITerminate