mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-16 13:35:22 +02:00
Code Issues Wiki Activity

[205142] Refactored use of execution, frame, and expression contexts in the MI implementation.

Browse source
This commit is contained in:
Pawel Piech 2007-11-17 00:24:49 +00:00
parent 6e8c328c01
commit d0e0286a8d
6 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/MISourceDisplayAdapter.java
View file

@ -288,7 +288,7 @@ public class MISourceDisplayAdapter implements ISourceDisplay
@Override
public void handleOK() {
FramePositioningData clientData = new FramePositioningData();
clientData.fLevel = getData().getLevel();
clientData.fLevel = frameDmc.getLevel();
// Document line numbers are 0-based. While debugger line numbers are 1-based.
clientData.fLine = getData().getLine() - 1;
rm.setData(clientData);

2
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/launch/StackFramesLayoutNode.java
View file

@ -212,7 +212,7 @@ public class StackFramesLayoutNode extends AbstractDMVMLayoutNode {
// Add frame number (if total number of frames in known)
if (fCachedOldFrameVMCs != null) {
label.append(fCachedOldFrameVMCs.length - dmData.getLevel());
label.append(fCachedOldFrameVMCs.length - dmContext.getLevel());
}
// Add the function name

18
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLayoutNode.java
View file

@ -13,6 +13,8 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
import org.eclipse.dd.dsf.concurrent.DsfExecutor;
import org.eclipse.dd.dsf.concurrent.MultiRequestMonitor;
@ -439,19 +441,15 @@ public class VariableLayoutNode extends AbstractExpressionLayoutNode implements
@Override
protected void getElementForExpressionPart(IChildrenUpdate update, String expressionPartText, DataRequestMonitor<Object> rm) {
/*
* Create a valid DMC for this entered expression.
*/
final IFrameDMContext frameDmc = findDmcInPath(update.getElementPath(), IFrameDMContext.class);
final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
IExpressionDMContext expressionDMC = expressionService.createExpression(frameDmc, expressionPartText);
/*
* Now create the valid VMC which wrappers it.
*/
IVMContext vmc = createVMContext(expressionDMC);
rm.setData(vmc);
if (frameDmc != null) {
IExpressionDMContext expressionDMC = expressionService.createExpression(frameDmc, expressionPartText);
rm.setData(createVMContext(expressionDMC));
} else {
rm.setStatus(new Status(IStatus.ERROR, DsfDebugUIPlugin.PLUGIN_ID, IDsfService.INVALID_HANDLE, "Invalid context", null)); //$NON-NLS-1$
}
rm.done();
}

10
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IExpressions.java
View file

@ -51,7 +51,7 @@ public interface IExpressions extends IFormattedValues {
/**
* This is the model data interface that corresponds to IExpressionDMContext.
*/
interface IExpressionDMData extends IDMData {
public interface IExpressionDMData extends IDMData {
// These static fields define the possible return values of method getTypeId().
final static String TYPEID_UNKNOWN = "TYPEID_UNKNOWN";
@ -128,7 +128,7 @@ public interface IExpressions extends IFormattedValues {
* Event indicating that a given expression is changed. If an expression is changed, it's implied that all
* the children of that expression are changed too.
*/
interface IExpressionChangedDMEvent extends IDMEvent<IExpressionDMContext> {}
public interface IExpressionChangedDMEvent extends IDMEvent<IExpressionDMContext> {}
/**
* Retrieves the expression DM data object for the given expression context(<tt>dmc</tt>).
@ -154,15 +154,15 @@ public interface IExpressions extends IFormattedValues {
/**
* Returns the data model context object for the specified expression in the context
* specified by <b>ctx</b>.
* specified by <b>ctx</b>.
*
* @param ctx: Context in which to evaluate the expression. This context could include the
* PC location, stack frame, thread, or just a symbol context.
*
* @param expression: The expression to evaluate.
*
* @return An expression data model context object that must be passed to getModelData() to obtain the
* value of the expression.
* @return An expression data model context object that must be passed to
* getModelData() to obtain the value of the expression.
*/
IExpressionDMContext createExpression(IDMContext ctx, String expression);

23
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRunControl.java
View file

@ -47,22 +47,41 @@ public interface IRunControl extends IDMService
public enum StateChangeReason { UNKNOWN, USER_REQUEST, STEP, BREAKPOINT, EXCEPTION, CONTAINER, WATCHPOINT, SIGNAL, SHAREDLIB, ERROR };
/**
* Events signaling a state changes.
* Indicates that the given thread has suspended.
*/
public interface ISuspendedDMEvent extends IDMEvent<IExecutionDMContext> {
StateChangeReason getReason();
}
/**
* Indicates that the given thread has resumed.
*/
public interface IResumedDMEvent extends IDMEvent<IExecutionDMContext> {
StateChangeReason getReason();
}
/**
* Indicates that the given container has suspended.
*/
public interface IContainerSuspendedDMEvent extends ISuspendedDMEvent {
IExecutionDMContext getTriggeringContext();
/**
* Returns the context which triggered the resume, which could be
* <code>null</code> if not known.
*/
IExecutionDMContext getTriggeringContext();
}
/**
* Indicates that the given container has resumed.
*/
public interface IContainerResumedDMEvent extends IResumedDMEvent {
/**
* Returns the context which triggered the resume, which could be
* <code>null</code> if not known.
*/
IExecutionDMContext getTriggeringContext();
}
/**
* Indicates that a new execution context (thread) was started. The DMC
* for the event is the container of the new exec context.

5
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IStack.java
View file

@ -27,13 +27,14 @@ public interface IStack extends IDMService {
* frame data, this context is used by other services that require a stack
* frame for evaluation.
*/
public interface IFrameDMContext extends IDMContext {}
public interface IFrameDMContext extends IDMContext {
int getLevel();
}
/**
* Stack frame information.
*/
public interface IFrameDMData extends IDMData {
int getLevel();
IAddress getAddress();
String getFile();
String getFunction();