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

Bug 237800

Browse source 
Give the MIStack its own cache.
This commit is contained in:
Marc Khouzam 2008-06-19 15:55:26 +00:00
parent d8d51a37b2
commit fe8e5b4dde
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIStack.java
View file

@ -31,6 +31,8 @@ import org.eclipse.dd.dsf.debug.service.IRunControl;
import org.eclipse.dd.dsf.debug.service.IStack; import org.eclipse.dd.dsf.debug.service.IStack;
import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext; import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext;
import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason;
import org.eclipse.dd.dsf.debug.service.command.CommandCache;
import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
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;
@ -116,7 +118,7 @@ public class MIStack extends AbstractDsfService
} }
} }
private MIRunControl fRunControl; private CommandCache fMICommandCache;
private MIStoppedEvent fCachedStoppedEvent; private MIStoppedEvent fCachedStoppedEvent;
public MIStack(DsfSession session) public MIStack(DsfSession session)
@ -142,7 +144,7 @@ public class MIStack extends AbstractDsfService
} }
private void doInitialize(RequestMonitor rm) { private void doInitialize(RequestMonitor rm) {
fRunControl = getServicesTracker().getService(MIRunControl.class); fMICommandCache = new CommandCache(getSession(), getServicesTracker().getService(ICommandControl.class));
getSession().addServiceEventListener(this, null); getSession().addServiceEventListener(this, null);
register(new String[]{IStack.class.getName(), MIStack.class.getName()}, new Hashtable<String,String>()); register(new String[]{IStack.class.getName(), MIStack.class.getName()}, new Hashtable<String,String>());
rm.done(); rm.done();
@ -153,6 +155,7 @@ public class MIStack extends AbstractDsfService
{ {
unregister(); unregister();
getSession().removeServiceEventListener(this); getSession().removeServiceEventListener(this);
fMICommandCache.reset();
super.shutdown(rm); super.shutdown(rm);
} }
@ -195,7 +198,7 @@ public class MIStack extends AbstractDsfService
rm.done(); rm.done();
return; return;
} }
fRunControl.getCache().execute( fMICommandCache.execute(
new MIStackListFrames(execDmc), new MIStackListFrames(execDmc),
new DataRequestMonitor<MIStackListFramesInfo>(getExecutor(), rm) { new DataRequestMonitor<MIStackListFramesInfo>(getExecutor(), rm) {
@Override @Override
@ -330,7 +333,7 @@ public class MIStack extends AbstractDsfService
protected MIFrame getMIFrame() { return fFrameDataCacheInfo.getMIFrames()[fFrameIndex]; } protected MIFrame getMIFrame() { return fFrameDataCacheInfo.getMIFrames()[fFrameIndex]; }
} }
fRunControl.getCache().execute( fMICommandCache.execute(
new MIStackListFrames(execDmc), new MIStackListFrames(execDmc),
new DataRequestMonitor<MIStackListFramesInfo>(getExecutor(), rm) { new DataRequestMonitor<MIStackListFramesInfo>(getExecutor(), rm) {
@Override @Override
@ -374,7 +377,7 @@ public class MIStack extends AbstractDsfService
} }
// If not, retrieve the full list of frame data. // If not, retrieve the full list of frame data.
fRunControl.getCache().execute( fMICommandCache.execute(
new MIStackListArguments(execDmc, true), new MIStackListArguments(execDmc, true),
new DataRequestMonitor<MIStackListArgumentsInfo>(getExecutor(), rm) { new DataRequestMonitor<MIStackListArgumentsInfo>(getExecutor(), rm) {
@Override @Override
@ -454,7 +457,7 @@ public class MIStack extends AbstractDsfService
} }
if (miVariableDmc.fType == MIVariableDMC.Type.ARGUMENT){ if (miVariableDmc.fType == MIVariableDMC.Type.ARGUMENT){
fRunControl.getCache().execute( fMICommandCache.execute(
new MIStackListArguments(execDmc, true), new MIStackListArguments(execDmc, true),
new DataRequestMonitor<MIStackListArgumentsInfo>(getExecutor(), rm) { new DataRequestMonitor<MIStackListArgumentsInfo>(getExecutor(), rm) {
@Override @Override
@ -474,7 +477,7 @@ public class MIStack extends AbstractDsfService
}}); }});
}//if }//if
if (miVariableDmc.fType == MIVariableDMC.Type.LOCAL){ if (miVariableDmc.fType == MIVariableDMC.Type.LOCAL){
fRunControl.getCache().execute( fMICommandCache.execute(
new MIStackListLocals(frameDmc, true), new MIStackListLocals(frameDmc, true),
new DataRequestMonitor<MIStackListLocalsInfo>(getExecutor(), rm) { new DataRequestMonitor<MIStackListLocalsInfo>(getExecutor(), rm) {
@Override @Override
@ -536,7 +539,7 @@ public class MIStack extends AbstractDsfService
} }
}); });
fRunControl.getCache().execute( fMICommandCache.execute(
new MIStackListLocals(frameDmc, true), new MIStackListLocals(frameDmc, true),
new DataRequestMonitor<MIStackListLocalsInfo>(getExecutor(), countingRm) { new DataRequestMonitor<MIStackListLocalsInfo>(getExecutor(), countingRm) {
@Override @Override
@ -555,7 +558,7 @@ public class MIStack extends AbstractDsfService
if (maxDepth > 0) depthCommand = new MIStackInfoDepth(execDmc, maxDepth); if (maxDepth > 0) depthCommand = new MIStackInfoDepth(execDmc, maxDepth);
else depthCommand = new MIStackInfoDepth(execDmc); else depthCommand = new MIStackInfoDepth(execDmc);
fRunControl.getCache().execute( fMICommandCache.execute(
depthCommand, depthCommand,
new DataRequestMonitor<MIStackInfoDepthInfo>(getExecutor(), rm) { new DataRequestMonitor<MIStackInfoDepthInfo>(getExecutor(), rm) {
@Override @Override
@ -569,16 +572,26 @@ public class MIStack extends AbstractDsfService
rm.done(); rm.done();
} }
} }
// IServiceEventListener // IServiceEventListener
@DsfServiceEventHandler public void eventDispatched(IRunControl.IResumedDMEvent e) { @DsfServiceEventHandler
public void eventDispatched(IRunControl.IResumedDMEvent e) {
fMICommandCache.setContextAvailable(e.getDMContext(), false);
if (e.getReason() != StateChangeReason.STEP) { if (e.getReason() != StateChangeReason.STEP) {
fCachedStoppedEvent = null; fCachedStoppedEvent = null;
fMICommandCache.reset();
} }
} }
// @DsfServiceEventHandler public void eventDispatched(MIRunControl.SuspendedEvent e) { @DsfServiceEventHandler
@DsfServiceEventHandler public void eventDispatched(MIRunControl.ContainerSuspendedEvent e) { public void eventDispatched(IRunControl.ISuspendedDMEvent e) {
fCachedStoppedEvent = e.getMIEvent(); fMICommandCache.setContextAvailable(e.getDMContext(), true);
fMICommandCache.reset();
}
@DsfServiceEventHandler
public void eventDispatched(MIRunControl.ContainerSuspendedEvent e) {
fCachedStoppedEvent = e.getMIEvent();
} }
} }