MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

increase responsiveness in remote debugging - increased priority for variables update

Browse Source
This commit is contained in:
Egor.Ushakov
2014-06-26 20:10:47 +04:00
parent a7fe9de63c
commit 5203032f4d
3 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
+10
View File
@@ -103,6 +103,11 @@ public class JavaExecutionStack extends XExecutionStack {
}
else {
myDebugProcess.getManagerThread().invokeAndWait(new DebuggerCommandImpl() {
@Override
public Priority getPriority() {
return Priority.HIGH;
}
@Override
protected void action() throws Exception {
myTopFrame = calcTopFrame();
@@ -117,6 +122,11 @@ public class JavaExecutionStack extends XExecutionStack {
public void computeStackFrames(final int firstFrameIndex, final XStackFrameContainer container) {
final AtomicInteger skipCounter = new AtomicInteger(firstFrameIndex);
myDebugProcess.getManagerThread().schedule(new DebuggerContextCommandImpl(myDebugProcess.getDebuggerContext()) {
@Override
public Priority getPriority() {
return Priority.NORMAL;
}
@Override
public void threadAction() {
if (!myThreadProxy.isCollected() && myDebugProcess.getSuspendManager().isSuspended(myThreadProxy)) {
java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
+5
View File
@@ -150,6 +150,11 @@ public class JavaStackFrame extends XStackFrame {
return;
}
myDebugProcess.getManagerThread().schedule(new DebuggerContextCommandImpl(myDebugProcess.getDebuggerContext()) {
@Override
public Priority getPriority() {
return Priority.NORMAL;
}
@Override
public void threadAction() {
XValueChildrenList children = new XValueChildrenList();
java/debugger/impl/src/com/intellij/debugger/engine/JavaValue.java
+58 -31
View File
@@ -68,10 +68,6 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider {
private static JavaValue create(JavaValue parent, @NotNull ValueDescriptorImpl valueDescriptor, EvaluationContextImpl evaluationContext, NodeManagerImpl nodeManager, boolean init) {
DebuggerManagerThreadImpl.assertIsManagerThread();
if (init) {
valueDescriptor.setContext(evaluationContext);
valueDescriptor.updateRepresentation(evaluationContext, DescriptorLabelListener.DUMMY_LISTENER);
}
return new JavaValue(parent, valueDescriptor, evaluationContext, nodeManager);
}
@@ -98,42 +94,58 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider {
public void computePresentation(@NotNull final XValueNode node, @NotNull XValuePlace place) {
if (myEvaluationContext.getSuspendContext().isResumed()) return;
myEvaluationContext.getDebugProcess().getManagerThread().schedule(new DebuggerContextCommandImpl(getDebuggerContext()) {
@Override
public Priority getPriority() {
return Priority.NORMAL;
}
@Override
public void threadAction() {
Icon nodeIcon = DebuggerTreeRenderer.getValueIcon(myValueDescriptor);
final String[] strings = splitValue(myValueDescriptor.getValueLabel());
final String value = StringUtil.notNullize(strings[1]);
String type = strings[0];
XValuePresentation presentation;
if (myValueDescriptor.isString()) {
presentation = new TypedStringValuePresentation(StringUtil.unquoteString(value), type);
}
else if (myValueDescriptor.getLastRenderer() instanceof ToStringRenderer) {
presentation = new XRegularValuePresentation(StringUtil.wrapWithDoubleQuote(value), type);
}
else {
presentation = new XRegularValuePresentation(value, type);
}
if (value.length() > XValueNode.MAX_VALUE_LENGTH) {
node.setFullValueEvaluator(new XFullValueEvaluator() {
@Override
public void startEvaluation(@NotNull final XFullValueEvaluationCallback callback) {
myEvaluationContext.getDebugProcess().getManagerThread().schedule(new DebuggerContextCommandImpl(getDebuggerContext()) {
myValueDescriptor.setContext(myEvaluationContext);
myValueDescriptor.updateRepresentation(myEvaluationContext, new DescriptorLabelListener() {
@Override
public void labelChanged() {
Icon nodeIcon = DebuggerTreeRenderer.getValueIcon(myValueDescriptor);
final String[] strings = splitValue(myValueDescriptor.getValueLabel());
final String value = StringUtil.notNullize(strings[1]);
String type = strings[0];
XValuePresentation presentation;
if (myValueDescriptor.isString()) {
presentation = new TypedStringValuePresentation(StringUtil.unquoteString(value), type);
}
else if (myValueDescriptor.getLastRenderer() instanceof ToStringRenderer) {
presentation = new XRegularValuePresentation(StringUtil.wrapWithDoubleQuote(value), type);
}
else {
presentation = new XRegularValuePresentation(value, type);
}
if (value.length() > XValueNode.MAX_VALUE_LENGTH) {
node.setFullValueEvaluator(new XFullValueEvaluator() {
@Override
public void threadAction() {
final String valueAsString = DebuggerUtilsEx.getValueOrErrorAsString(myEvaluationContext, myValueDescriptor.getValue());
DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
public void startEvaluation(@NotNull final XFullValueEvaluationCallback callback) {
myEvaluationContext.getDebugProcess().getManagerThread().schedule(new DebuggerContextCommandImpl(getDebuggerContext()) {
@Override
public void run() {
callback.evaluated(valueAsString);
public Priority getPriority() {
return Priority.NORMAL;
}
@Override
public void threadAction() {
final String valueAsString = DebuggerUtilsEx.getValueOrErrorAsString(myEvaluationContext, myValueDescriptor.getValue());
DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
@Override
public void run() {
callback.evaluated(valueAsString);
}
});
}
});
}
});
}
});
}
node.setPresentation(nodeIcon, presentation, myValueDescriptor.isExpandable());
node.setPresentation(nodeIcon, presentation, myValueDescriptor.isExpandable());
}
});
}
});
}
@@ -173,6 +185,11 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider {
public void computeChildren(@NotNull final XCompositeNode node) {
if (myEvaluationContext.getSuspendContext().isResumed()) return;
myEvaluationContext.getDebugProcess().getManagerThread().schedule(new SuspendContextCommandImpl(myEvaluationContext.getSuspendContext()) {
@Override
public Priority getPriority() {
return Priority.NORMAL;
}
@Override
public void contextAction() throws Exception {
final XValueChildrenList children = new XValueChildrenList();
@@ -278,6 +295,11 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider {
if (myEvaluationContext.getSuspendContext().isResumed()) return;
DebugProcessImpl debugProcess = myEvaluationContext.getDebugProcess();
debugProcess.getManagerThread().schedule(new JumpToObjectAction.NavigateCommand(getDebuggerContext(), myValueDescriptor, debugProcess, null) {
@Override
public Priority getPriority() {
return Priority.HIGH;
}
@Override
protected void doAction(@Nullable final SourcePosition sourcePosition) {
if (sourcePosition != null) {
@@ -307,6 +329,11 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider {
// TODO: change API to allow to calculate it asynchronously
DebugProcessImpl debugProcess = myEvaluationContext.getDebugProcess();
debugProcess.getManagerThread().invokeAndWait(new DebuggerCommandImpl() {
@Override
public Priority getPriority() {
return Priority.HIGH;
}
@Override
protected void action() throws Exception {
evaluationExpression = ApplicationManager.getApplication().runReadAction(new Computable<String>() {