azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper debug names for instrumenters

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-12 10:51:28 +02:00
parent c960dff166
commit 113864fc88
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java
+1
View File
@@ -94,6 +94,7 @@ public class InterceptionInstrumenter implements Instrumenter {
String nameFromAnnotation = annotation.methodName(); String nameFromAnnotation = annotation.methodName();
String methodName = nameFromAnnotation.isEmpty() ? field.getName() : nameFromAnnotation; String methodName = nameFromAnnotation.isEmpty() ? field.getName() : nameFromAnnotation;
MethodInstrumenterImpl instrumenter = new MethodInstrumenterImpl( MethodInstrumenterImpl instrumenter = new MethodInstrumenterImpl(
field.getDeclaringClass().getSimpleName() + "." + field.getName(),
compilePattern(methodName), compilePattern(methodName),
compilePattern(annotation.erasedSignature()), compilePattern(annotation.erasedSignature()),
annotation.allowMultipleMatches(), annotation.allowMultipleMatches(),
compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenterImpl.java
+4 -2
View File
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
class MethodInstrumenterImpl implements MethodInstrumenter { class MethodInstrumenterImpl implements MethodInstrumenter {
private final String debugName;
private final Pattern namePattern; private final Pattern namePattern;
private final Pattern descPattern; private final Pattern descPattern;
private final boolean allowMultipleMatches; private final boolean allowMultipleMatches;
@@ -28,13 +29,14 @@ class MethodInstrumenterImpl implements MethodInstrumenter {
private final boolean logApplications; private final boolean logApplications;
public MethodInstrumenterImpl( public MethodInstrumenterImpl(
Pattern namePattern, String debugName, Pattern namePattern,
Pattern descPattern, Pattern descPattern,
boolean allowMultipleMatches, boolean allowMultipleMatches,
List<MethodData> enterData, List<MethodData> enterData,
List<MethodData> exitData, List<MethodData> exitData,
boolean logApplications boolean logApplications
) { ) {
this.debugName = debugName;
this.namePattern = namePattern; this.namePattern = namePattern;
this.descPattern = descPattern; this.descPattern = descPattern;
this.allowMultipleMatches = allowMultipleMatches; this.allowMultipleMatches = allowMultipleMatches;
@@ -72,6 +74,6 @@ class MethodInstrumenterImpl implements MethodInstrumenter {
@Override @Override
public String toString() { public String toString() {
return namePattern + " " + descPattern + (allowMultipleMatches ? " [multiple]" : ""); return debugName + "[" + namePattern + " " + descPattern + (allowMultipleMatches ? " multiple" : "") + "]";
} }
} }