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

debugger agent: cache storage method

Browse Source
This commit is contained in:
Egor.Ushakov
2017-09-26 15:41:57 +03:00
parent fcecbe8d79
commit 4c4ddfdf3d
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/debugger-impl.iml
-1
View File
@@ -22,7 +22,6 @@
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="jps-builders" />
<orderEntry type="module" module-name="debugger-agent-storage" />
</component>
<component name="copyright">
<Base>
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+1 -2
View File
@@ -54,7 +54,6 @@ import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.rt.debugger.agent.CaptureStorage;
import com.intellij.util.EventDispatcher;
import com.intellij.util.Function;
import com.intellij.util.PathUtil;
@@ -471,7 +470,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
ApplicationManager.getApplication().runReadAction(() -> {
JavaSdkUtil.addRtJar(parameters.getClassPath());
if (Registry.is("debugger.capture.points.agent")) {
String path = PathUtil.getJarPathForClass(CaptureStorage.class);
String path = PathUtil.getJarPathForClass(DebuggerManagerImpl.class);
//TODO: for now works only in debug mode
String agent = "-javaagent:" +
FileUtil.toSystemDependentName(PathUtil.getParentPath(PathUtil.getParentPath(path))) +
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/StackCapturingLineBreakpoint.java
+37 -22
View File
@@ -35,11 +35,11 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.rt.debugger.agent.CaptureStorage;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.util.containers.ContainerUtil;
import com.sun.jdi.*;
@@ -291,30 +291,45 @@ public class StackCapturingLineBreakpoint extends WildcardMethodBreakpoint {
return null;
}
private static final Key<Pair<ClassType, Method>> CAPTURE_STORAGE_METHOD = Key.create("CAPTURE_STORAGE_METHOD");
public static final Pair<ClassType, Method> NO_CAPTURE_AGENT = Pair.empty();
private static List<StackFrameItem> getProcessCapturedStack(Value key, EvaluationContextImpl evaluationContext)
throws EvaluateException {
if (Registry.is("debugger.capture.points.agent")) {
DebugProcessImpl process = evaluationContext.getDebugProcess();
// TODO: cache class & method
ClassType captureClass = (ClassType)process.findClass(evaluationContext, CaptureStorage.class.getName(), null);
Method getRelatedStackMethod = captureClass.methodsByName("getRelatedStack").get(0);
Value resArray = process.invokeMethod(evaluationContext, captureClass, getRelatedStackMethod, Collections.singletonList(key), true);
if (resArray instanceof ArrayReference) {
List<Value> values = ((ArrayReference)resArray).getValues();
List<StackFrameItem> res = new ArrayList<>(values.size());
for (Value value : values) {
if (value == null) {
res.add(null);
}
else {
List<Value> values1 = ((ArrayReference)value).getValues();
res.add(new ProcessStackFrameItem(getStringRefValue((StringReference)values1.get(0)),
getStringRefValue((StringReference)values1.get(2)),
Integer.parseInt(((StringReference)values1.get(3)).value())));
}
}
return res;
DebugProcessImpl process = evaluationContext.getDebugProcess();
Pair<ClassType, Method> methodPair = process.getUserData(CAPTURE_STORAGE_METHOD);
if (methodPair == NO_CAPTURE_AGENT) {
return null;
}
if (methodPair == null) {
try {
ClassType captureClass = (ClassType)process.findClass(evaluationContext, "com.intellij.rt.debugger.agent.CaptureStorage", null);
Method getRelatedStackMethod = captureClass.methodsByName("getRelatedStack").get(0);
methodPair = Pair.create(captureClass, getRelatedStackMethod);
}
catch (EvaluateException e) {
methodPair = NO_CAPTURE_AGENT;
LOG.debug("Error loading debug agent", e);
}
putProcessUserData(CAPTURE_STORAGE_METHOD, methodPair, process);
}
Value resArray = process.invokeMethod(evaluationContext, methodPair.first, methodPair.second, Collections.singletonList(key), true);
if (resArray instanceof ArrayReference) {
List<Value> values = ((ArrayReference)resArray).getValues();
List<StackFrameItem> res = new ArrayList<>(values.size());
for (Value value : values) {
if (value == null) {
res.add(null);
}
else {
List<Value> values1 = ((ArrayReference)value).getValues();
res.add(new ProcessStackFrameItem(getStringRefValue((StringReference)values1.get(0)),
getStringRefValue((StringReference)values1.get(2)),
Integer.parseInt(((StringReference)values1.get(3)).value())));
}
}
return res;
}
return null;
}