mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

[246773] Moves the class MIRunControlNS to GDBRunControl_7_0_NS which is provisional. This is because we are doing the API freeze and I didn't want to have MIRunControlNS frozen, since this bug will probably remove it.

Browse source
This commit is contained in:
Marc Khouzam 2008-10-08 20:16:33 +00:00
parent cfbfb1b005
commit f0a59c85a5
3 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GDBRunControl_7_0.java
View file

@ -28,7 +28,6 @@ import org.eclipse.dd.dsf.debug.service.IProcesses.IThreadDMContext;
import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.dsf.service.DsfSession;
import org.eclipse.dd.gdb.internal.GdbPlugin; import org.eclipse.dd.gdb.internal.GdbPlugin;
import org.eclipse.dd.gdb.internal.provisional.service.command.IGDBControl; import org.eclipse.dd.gdb.internal.provisional.service.command.IGDBControl;
import org.eclipse.dd.mi.internal.MIPlugin;
import org.eclipse.dd.mi.service.IMIExecutionDMContext; import org.eclipse.dd.mi.service.IMIExecutionDMContext;
import org.eclipse.dd.mi.service.IMIProcesses; import org.eclipse.dd.mi.service.IMIProcesses;
import org.eclipse.dd.mi.service.MIRunControl; import org.eclipse.dd.mi.service.MIRunControl;
@ -108,7 +107,7 @@ public class GDBRunControl_7_0 extends MIRunControl {
IExecutionDMContext[] execDmcs = (IExecutionDMContext[])getData(); IExecutionDMContext[] execDmcs = (IExecutionDMContext[])getData();
rm.setData(execDmcs); rm.setData(execDmcs);
} else { } else {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid contexts", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid contexts", null)); //$NON-NLS-1$
} }
rm.done(); rm.done();
} }

50
plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java → plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GDBRunControl_7_0_NS.java
View file

@ -10,7 +10,7 @@
* Ericsson AB - Modified for handling of multiple threads * Ericsson AB - Modified for handling of multiple threads
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dd.mi.service; package org.eclipse.dd.gdb.internal.provisional.service;
import java.util.HashMap; import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
@ -35,7 +35,11 @@ import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandC
import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.AbstractDsfService;
import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.dsf.service.DsfSession;
import org.eclipse.dd.mi.internal.MIPlugin; import org.eclipse.dd.gdb.internal.GdbPlugin;
import org.eclipse.dd.mi.service.IMIExecutionDMContext;
import org.eclipse.dd.mi.service.IMIProcesses;
import org.eclipse.dd.mi.service.MIRunControl;
import org.eclipse.dd.mi.service.MIStack;
import org.eclipse.dd.mi.service.command.commands.MIExecContinue; import org.eclipse.dd.mi.service.command.commands.MIExecContinue;
import org.eclipse.dd.mi.service.command.commands.MIExecFinish; import org.eclipse.dd.mi.service.command.commands.MIExecFinish;
import org.eclipse.dd.mi.service.command.commands.MIExecInterrupt; import org.eclipse.dd.mi.service.command.commands.MIExecInterrupt;
@ -71,7 +75,7 @@ import org.osgi.framework.BundleContext;
* sync with the service state. * sync with the service state.
* @since 1.1 * @since 1.1
*/ */
public class MIRunControlNS extends AbstractDsfService implements IRunControl, ICachingService public class GDBRunControl_7_0_NS extends AbstractDsfService implements IRunControl, ICachingService
{ {
@Immutable @Immutable
private static class ExecutionData implements IExecutionDMData { private static class ExecutionData implements IExecutionDMData {
@ -203,7 +207,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
// Initialization and shutdown // Initialization and shutdown
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
public MIRunControlNS(DsfSession session) { public GDBRunControl_7_0_NS(DsfSession session) {
super(session); super(session);
} }
@ -237,7 +241,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
@Override @Override
protected BundleContext getBundleContext() { protected BundleContext getBundleContext() {
return MIPlugin.getBundleContext(); return GdbPlugin.getBundleContext();
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -249,7 +253,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
if (dmc instanceof IExecutionDMContext) { if (dmc instanceof IExecutionDMContext) {
getExecutionData((IExecutionDMContext) dmc, (DataRequestMonitor<IExecutionDMData>) rm); getExecutionData((IExecutionDMContext) dmc, (DataRequestMonitor<IExecutionDMData>) rm);
} else { } else {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_HANDLE, "Unknown DMC type", null)); //$NON-NLS-1$
rm.done(); rm.done();
} }
} }
@ -336,14 +340,14 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
} }
// Default case // Default case
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Invalid context type.", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED, "Invalid context type.", null)); //$NON-NLS-1$
rm.done(); rm.done();
} }
private void doSuspendThread(IMIExecutionDMContext context, final RequestMonitor rm) { private void doSuspendThread(IMIExecutionDMContext context, final RequestMonitor rm) {
if (!doCanSuspend(context)) { if (!doCanSuspend(context)) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED,
"Given context: " + context + ", is already suspended.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + ", is already suspended.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
@ -385,7 +389,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
} }
// Default case // Default case
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Invalid context type.", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED, "Invalid context type.", null)); //$NON-NLS-1$
rm.done(); rm.done();
} }
@ -413,14 +417,14 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
} }
// Default case // Default case
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, "Invalid context type.", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED, "Invalid context type.", null)); //$NON-NLS-1$
rm.done(); rm.done();
} }
private void doResumeThread(IMIExecutionDMContext context, final RequestMonitor rm) { private void doResumeThread(IMIExecutionDMContext context, final RequestMonitor rm) {
if (!doCanResume(context)) { if (!doCanResume(context)) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_STATE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_STATE,
"Given context: " + context + ", is already running.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + ", is already running.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
@ -428,7 +432,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
MIThreadRunState threadState = fThreadRunStates.get(context); MIThreadRunState threadState = fThreadRunStates.get(context);
if (threadState == null) { if (threadState == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_STATE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_STATE,
"Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
@ -479,14 +483,14 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
IMIExecutionDMContext dmc = DMContexts.getAncestorOfType(context, IMIExecutionDMContext.class); IMIExecutionDMContext dmc = DMContexts.getAncestorOfType(context, IMIExecutionDMContext.class);
if (dmc == null) { if (dmc == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED,
"Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
} }
if (!doCanResume(context)) { if (!doCanResume(context)) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_STATE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_STATE,
"Cannot resume context", null)); //$NON-NLS-1$ "Cannot resume context", null)); //$NON-NLS-1$
rm.done(); rm.done();
return; return;
@ -494,7 +498,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
MIThreadRunState threadState = fThreadRunStates.get(context); MIThreadRunState threadState = fThreadRunStates.get(context);
if (threadState == null) { if (threadState == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_STATE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_STATE,
"Given context: " + context + " can't be found.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + " can't be found.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
@ -525,7 +529,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
fConnection.queueCommand(new MIExecFinish(topFrameDmc), fConnection.queueCommand(new MIExecFinish(topFrameDmc),
new DataRequestMonitor<MIInfo>(getExecutor(), rm)); new DataRequestMonitor<MIInfo>(getExecutor(), rm));
} else { } else {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED,
"Cannot create context for command, stack service not available.", null)); //$NON-NLS-1$ "Cannot create context for command, stack service not available.", null)); //$NON-NLS-1$
rm.done(); rm.done();
} }
@ -539,7 +543,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
new DataRequestMonitor<MIInfo>(getExecutor(), rm)); new DataRequestMonitor<MIInfo>(getExecutor(), rm));
break; break;
default: default:
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID,
INTERNAL_ERROR, "Given step type not supported", null)); //$NON-NLS-1$ INTERNAL_ERROR, "Given step type not supported", null)); //$NON-NLS-1$
rm.done(); rm.done();
} }
@ -557,14 +561,14 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
IMIExecutionDMContext dmc = DMContexts.getAncestorOfType(context, IMIExecutionDMContext.class); IMIExecutionDMContext dmc = DMContexts.getAncestorOfType(context, IMIExecutionDMContext.class);
if (dmc == null) { if (dmc == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, NOT_SUPPORTED, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, NOT_SUPPORTED,
"Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
} }
if (!doCanResume(context)) { if (!doCanResume(context)) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_STATE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_STATE,
"Cannot resume context", null)); //$NON-NLS-1$ "Cannot resume context", null)); //$NON-NLS-1$
rm.done(); rm.done();
return; return;
@ -572,7 +576,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
MIThreadRunState threadState = fThreadRunStates.get(context); MIThreadRunState threadState = fThreadRunStates.get(context);
if (threadState == null) { if (threadState == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_STATE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_STATE,
"Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + context + " is not an MI execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
@ -597,7 +601,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
if (getData() instanceof IExecutionDMContext[]) { if (getData() instanceof IExecutionDMContext[]) {
rm.setData((IExecutionDMContext[])getData()); rm.setData((IExecutionDMContext[])getData());
} else { } else {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid contexts", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INTERNAL_ERROR, "Invalid contexts", null)); //$NON-NLS-1$
} }
rm.done(); rm.done();
} }
@ -607,7 +611,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
public void getExecutionData(IExecutionDMContext dmc, DataRequestMonitor<IExecutionDMData> rm) { public void getExecutionData(IExecutionDMContext dmc, DataRequestMonitor<IExecutionDMData> rm) {
MIThreadRunState threadState = fThreadRunStates.get(dmc); MIThreadRunState threadState = fThreadRunStates.get(dmc);
if (threadState == null) { if (threadState == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID,INVALID_HANDLE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID,INVALID_HANDLE,
"Given context: " + dmc + " is not a recognized execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + dmc + " is not a recognized execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$
rm.done(); rm.done();
return; return;
@ -616,7 +620,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I
if (dmc instanceof IMIExecutionDMContext) { if (dmc instanceof IMIExecutionDMContext) {
rm.setData(new ExecutionData(threadState.fSuspended ? threadState.fStateChangeReason : null)); rm.setData(new ExecutionData(threadState.fSuspended ? threadState.fStateChangeReason : null));
} else { } else {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_HANDLE, rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, INVALID_HANDLE,
"Given context: " + dmc + " is not a recognized execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$ "Given context: " + dmc + " is not a recognized execution context.", null)); //$NON-NLS-1$ //$NON-NLS-2$
} }
rm.done(); rm.done();

3
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GdbDebugServicesFactoryNS.java
View file

@ -12,7 +12,6 @@ package org.eclipse.dd.gdb.internal.provisional.service;
import org.eclipse.dd.dsf.debug.service.IRunControl; import org.eclipse.dd.dsf.debug.service.IRunControl;
import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.dsf.service.DsfSession;
import org.eclipse.dd.mi.service.MIRunControlNS;
public class GdbDebugServicesFactoryNS extends GdbDebugServicesFactory { public class GdbDebugServicesFactoryNS extends GdbDebugServicesFactory {
@ -22,6 +21,6 @@ public class GdbDebugServicesFactoryNS extends GdbDebugServicesFactory {
@Override @Override
protected IRunControl createRunControlService(DsfSession session) { protected IRunControl createRunControlService(DsfSession session) {
return new MIRunControlNS(session); return new GDBRunControl_7_0_NS(session);
} }
} }