diff --git a/benchmarks/runtime-benchmarks/build.gradle b/benchmarks/runtime-benchmarks/build.gradle index 83faf3e0e..934d306c8 100644 --- a/benchmarks/runtime-benchmarks/build.gradle +++ b/benchmarks/runtime-benchmarks/build.gradle @@ -36,7 +36,7 @@ task btracec(type: JavaExec) { args "${buildDir}/classes/java/main/" args '-packext' args 'btclass' - args fileTree(dir: "src/jmh/btrace", include: 'TraceScript.java') + args fileTree(dir: "src/jmh/btrace", include: '*.java') } compileJmhJava.dependsOn btracec jmhClasses.dependsOn btracec @@ -63,6 +63,6 @@ jmh { duplicateClassesStrategy = DuplicatesStrategy.WARN jvmArgsAppend = ["-Djmh.basedir=${project.buildDir.getParent()}", "-Dproject.version=${project.version}"] // jmhVersion = '1.27' - includes = ['org.openjdk.btrace.bench.ClassFilterBenchmark'] + includes = [project.findProperty('jmhInclude') ?: 'org.openjdk.btrace.bench.ClassFilterBenchmark'] verbosity = 'EXTRA' } diff --git a/benchmarks/runtime-benchmarks/src/jmh/btrace/DispatchScript.java b/benchmarks/runtime-benchmarks/src/jmh/btrace/DispatchScript.java new file mode 100644 index 000000000..3cd8e7715 --- /dev/null +++ b/benchmarks/runtime-benchmarks/src/jmh/btrace/DispatchScript.java @@ -0,0 +1,20 @@ +import org.openjdk.btrace.core.annotations.BTrace; +import org.openjdk.btrace.core.annotations.Duration; +import org.openjdk.btrace.core.annotations.Kind; +import org.openjdk.btrace.core.annotations.Location; +import org.openjdk.btrace.core.annotations.OnMethod; +import org.openjdk.btrace.core.annotations.ProbeClassName; +import org.openjdk.btrace.core.annotations.ProbeMethodName; + +@BTrace +public class DispatchScript { + @OnMethod(clazz = "org.openjdk.btrace.bench.DispatchTarget", method = "noArgs") + public static void onEntry(@ProbeClassName String pcn, @ProbeMethodName String pmn) {} + + @OnMethod( + clazz = "org.openjdk.btrace.bench.DispatchTarget", + method = "withReturn", + location = @Location(Kind.RETURN)) + public static void onReturn( + @ProbeClassName String pcn, @ProbeMethodName String pmn, @Duration long dur) {} +} diff --git a/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/DispatchBenchmark.java b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/DispatchBenchmark.java new file mode 100644 index 000000000..35864df81 --- /dev/null +++ b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/DispatchBenchmark.java @@ -0,0 +1,333 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package org.openjdk.btrace.bench; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import org.openjdk.btrace.core.BTraceRuntimeBridge; +import org.openjdk.btrace.core.DebugSupport; +import org.openjdk.btrace.core.SharedSettings; +import org.openjdk.btrace.core.extensions.ExtensionContext; +import org.openjdk.btrace.core.handlers.ErrorHandler; +import org.openjdk.btrace.core.handlers.EventHandler; +import org.openjdk.btrace.core.handlers.ExitHandler; +import org.openjdk.btrace.core.handlers.LowMemoryHandler; +import org.openjdk.btrace.core.handlers.TimerHandler; +import org.openjdk.btrace.instr.BTraceProbe; +import org.openjdk.btrace.instr.BTraceProbeFactory; +import org.openjdk.btrace.instr.BTraceTransformer; +import org.openjdk.btrace.instr.HandlerRepositoryImpl; +import org.openjdk.btrace.runtime.BTraceRuntimeAccess; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; + +/** + * Measures the actual overhead of INVOKEDYNAMIC handler dispatch in real BTrace-instrumented code. + * + *

Setup uses the real {@link BTraceTransformer} pipeline to instrument {@link DispatchTarget} + * with the compiled {@code DispatchScript.btclass} probe. The benchmark compares calling the + * original (uninstrumented) methods against the instrumented versions that dispatch through + * INVOKEDYNAMIC → ConstantCallSite → probe handler. + */ +@State(Scope.Thread) +@OutputTimeUnit(TimeUnit.NANOSECONDS) +@Fork(2) +@BenchmarkMode(Mode.AverageTime) +public class DispatchBenchmark { + + private Workload original; + private Workload instrumented; + + @Setup(Level.Trial) + public void setup() throws Exception { + SharedSettings settings = SharedSettings.GLOBAL; + settings.setTrusted(true); + + BTraceProbeFactory factory = new BTraceProbeFactory(settings); + + // Load compiled BTrace script (.btclass packaged by btracec task) + byte[] scriptBytes; + try (InputStream is = getClass().getClassLoader().getResourceAsStream("DispatchScript.btclass")) { + if (is == null) { + throw new IllegalStateException( + "DispatchScript.btclass not found on classpath. Run btracec task first."); + } + scriptBytes = readAllBytes(is); + } + + // Create probe from compiled script + BTraceProbe probe = factory.createProbe(scriptBytes); + + // Get the probe class bytecode (with AnyType→Object transformation) + byte[] probeBytes = probe.getFullBytecode(); + String probeClassName = probe.getClassName(false); + + // Read the original target class bytecode from classpath + String targetResource = + DispatchTarget.class.getName().replace('.', '/') + ".class"; + byte[] targetBytes; + try (InputStream is = getClass().getClassLoader().getResourceAsStream(targetResource)) { + if (is == null) { + throw new IllegalStateException("DispatchTarget.class not found on classpath."); + } + targetBytes = readAllBytes(is); + } + + // Install a no-op BTraceRuntimeAccess delegate so the probe class + // gets a non-null BTraceRuntimeBridge. Without this, forClass() returns null + // and the generated error handler NPEs on runtime.handleException(). + BTraceRuntimeAccess.install(new NoOpDelegate()); + + // Set up the classloader for probe and instrumented target. + // Child-first for classes we define; parent-first for everything else + // (BTrace runtime, JMH, java.*, etc.) + InstrumentedClassLoader benchCL = + new InstrumentedClassLoader(getClass().getClassLoader()); + benchCL.addClass(probeClassName, probeBytes); + + // Define the probe class so INVOKEDYNAMIC resolution can find it + Class probeClass = Class.forName(probeClassName, true, benchCL); + + // Set the definedClass field on the probe via reflection + setDefinedClass(probe, probeClass); + + // Register probe in HandlerRepositoryImpl (drives INVOKEDYNAMIC resolution) + HandlerRepositoryImpl.registerProbe(probe); + + // Create transformer and register probe for class matching + BTraceTransformer transformer = new BTraceTransformer(new DebugSupport(settings)); + transformer.register(probe); + + // Transform the target class using the real instrumentation pipeline. + // Pass benchCL (not system CL) to bypass the sensitive-class filter for org/openjdk/btrace/*. + byte[] instrumentedBytes = + transformer.transform( + benchCL, + DispatchTarget.class.getName().replace('.', '/'), + null, + null, + targetBytes); + + if (instrumentedBytes == null) { + throw new IllegalStateException( + "BTraceTransformer did not instrument DispatchTarget. " + + "Check that DispatchScript targets the correct class/methods."); + } + + // Load the instrumented class in the child classloader + benchCL.addClass(DispatchTarget.class.getName(), instrumentedBytes); + Class instrClass = + Class.forName(DispatchTarget.class.getName(), true, benchCL); + + // Create instances + original = new DispatchTarget(); + instrumented = (Workload) instrClass.getConstructor().newInstance(); + } + + // --- Benchmarks: entry handler (empty body, pure dispatch overhead) --- + + @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Benchmark + public void baseline_noArgs() { + original.noArgs(); + } + + @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Benchmark + public void instrumented_noArgs() { + instrumented.noArgs(); + } + + // --- Benchmarks: return handler with @Duration --- + + @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Benchmark + public long baseline_withReturn() { + return original.withReturn(); + } + + @Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS) + @Benchmark + public long instrumented_withReturn() { + return instrumented.withReturn(); + } + + // --- Helpers --- + + private static void setDefinedClass(BTraceProbe probe, Class clz) throws Exception { + // Both BTraceProbeNode and BTraceProbePersisted have a 'definedClass' field + Field field = null; + Class c = probe.getClass(); + while (c != null && field == null) { + try { + field = c.getDeclaredField("definedClass"); + } catch (NoSuchFieldException e) { + c = c.getSuperclass(); + } + } + if (field == null) { + throw new IllegalStateException("Cannot find 'definedClass' field on " + probe.getClass()); + } + field.setAccessible(true); + field.set(probe, clz); + } + + private static byte[] readAllBytes(InputStream is) throws Exception { + byte[] buf = new byte[8192]; + int pos = 0; + int read; + while ((read = is.read(buf, pos, buf.length - pos)) > 0) { + pos += read; + if (pos == buf.length) { + byte[] newBuf = new byte[buf.length * 2]; + System.arraycopy(buf, 0, newBuf, 0, pos); + buf = newBuf; + } + } + byte[] result = new byte[pos]; + System.arraycopy(buf, 0, result, 0, pos); + return result; + } + + /** + * ClassLoader that uses child-first delegation for explicitly added classes, parent-first for + * everything else. This lets the instrumented DispatchTarget coexist with the original while + * sharing the BTrace runtime, JMH, and java.* classes from the parent. + */ + static final class InstrumentedClassLoader extends ClassLoader { + private final Map classes = new HashMap<>(); + + InstrumentedClassLoader(ClassLoader parent) { + super(parent); + } + + void addClass(String name, byte[] bytes) { + classes.put(name, bytes); + } + + @Override + protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { + synchronized (getClassLoadingLock(name)) { + Class c = findLoadedClass(name); + if (c != null) { + return c; + } + byte[] bytes = classes.get(name); + if (bytes != null) { + c = defineClass(name, bytes, 0, bytes.length); + if (resolve) { + resolveClass(c); + } + return c; + } + return super.loadClass(name, resolve); + } + } + } + + /** No-op delegate that satisfies the probe class {@code } contract. */ + static final class NoOpDelegate implements BTraceRuntimeAccess.Delegate { + private static final BTraceRuntimeBridge NOOP_BRIDGE = new NoOpBridge(); + + @Override + public boolean enter(BTraceRuntimeBridge currentRt) { + return true; + } + + @Override + public void leave() {} + + @Override + public BTraceRuntimeBridge forClass( + Class cl, + TimerHandler[] tHandlers, + EventHandler[] evHandlers, + ErrorHandler[] errHandlers, + ExitHandler[] eHandlers, + LowMemoryHandler[] lmHandlers) { + return NOOP_BRIDGE; + } + + @Override + public ThreadLocal newThreadLocal(Object initValue) { + return ThreadLocal.withInitial(() -> initValue); + } + + @Override + public String getClientName(String forClassName) { + return forClassName; + } + + @Override + public ExtensionContext currentContext() { + return null; + } + } + + /** No-op bridge returned by {@link NoOpDelegate#forClass}. */ + static final class NoOpBridge implements BTraceRuntimeBridge { + @Override public void start() {} + @Override public void leave() {} + @Override public void handleException(Throwable th) {} + @Override public boolean isDisabled() { return false; } + @Override public void newPerfCounter(Object value, String name, String desc) {} + @Override public int getPerfInt(String name) { return 0; } + @Override public void putPerfInt(int value, String name) {} + @Override public float getPerfFloat(String name) { return 0f; } + @Override public void putPerfFloat(float value, String name) {} + @Override public long getPerfLong(String name) { return 0L; } + @Override public void putPerfLong(long value, String name) {} + @Override public String getPerfString(String name) { return ""; } + @Override public void putPerfString(String value, String name) {} + } + + public static void main(String[] args) throws Exception { + Options opt = + new OptionsBuilder() + .include(".*" + DispatchBenchmark.class.getSimpleName() + ".*") + .build(); + + new Runner(opt).run(); + } +} diff --git a/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/DispatchTarget.java b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/DispatchTarget.java new file mode 100644 index 000000000..e061e2baa --- /dev/null +++ b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/DispatchTarget.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package org.openjdk.btrace.bench; + +/** Target class for BTrace instrumentation in {@link DispatchBenchmark}. */ +public class DispatchTarget implements Workload { + private long counter; + + @Override + public void noArgs() { + counter++; + } + + @Override + public long withReturn() { + return ++counter; + } +} diff --git a/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/StatsdBenchmark.java b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/StatsdBenchmark.java index 6c8b91902..bc5c1fe2b 100644 --- a/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/StatsdBenchmark.java +++ b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/StatsdBenchmark.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import org.openjdk.btrace.statsd.Statsd; +import org.openjdk.btrace.statsd.StatsdImpl; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -55,15 +56,15 @@ public class StatsdBenchmark { @Setup public void setup() { - c = Statsd.getInstance(); + c = new StatsdImpl(); } @Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS) @Measurement(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS) @Benchmark @Threads(1) - public void testGauge_1() { - c.gauge("g1", 10); + public void testIncrement_1() { + c.increment("counter1"); } public static void main(String[] args) throws Exception { diff --git a/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/Workload.java b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/Workload.java new file mode 100644 index 000000000..afdf7f922 --- /dev/null +++ b/benchmarks/runtime-benchmarks/src/jmh/java/org/openjdk/btrace/bench/Workload.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package org.openjdk.btrace.bench; + +/** + * Interface shared between the original and instrumented {@link DispatchTarget} so that JMH can + * call the same methods through a virtual dispatch without reflection overhead. + */ +public interface Workload { + void noArgs(); + + long withReturn(); +} diff --git a/btrace-agent/src/main/java/org/openjdk/btrace/agent/Client.java b/btrace-agent/src/main/java/org/openjdk/btrace/agent/Client.java index 238b5e6cb..8ba62be4e 100644 --- a/btrace-agent/src/main/java/org/openjdk/btrace/agent/Client.java +++ b/btrace-agent/src/main/java/org/openjdk/btrace/agent/Client.java @@ -52,7 +52,6 @@ import org.openjdk.btrace.instr.ClassCache; import org.openjdk.btrace.instr.ClassFilter; import org.openjdk.btrace.instr.ClassInfo; -import org.openjdk.btrace.instr.HandlerRepositoryImpl; import org.openjdk.btrace.instr.InstrumentUtils; import org.openjdk.btrace.instr.Instrumentor; import org.openjdk.btrace.instr.MethodTrackingContext; @@ -324,7 +323,6 @@ synchronized void onExit(int exitCode) { } finally { runtime.shutdownCmdLine(); CLIENTS.remove(id); - HandlerRepositoryImpl.unregisterProbe(probe); } } } diff --git a/btrace-bootstrap/build.gradle b/btrace-bootstrap/build.gradle index b7eac0577..bebc95fcd 100644 --- a/btrace-bootstrap/build.gradle +++ b/btrace-bootstrap/build.gradle @@ -10,6 +10,10 @@ def bootIncludes = { if (it.path.endsWith('.jar')) { return true } + // Include IndyDispatcher - bootstrap method for all INVOKEDYNAMIC dispatch + if (it.path.startsWith('org/openjdk/btrace/indy/')) { + return true + } if (it.path.startsWith('org/openjdk/btrace/core/')) { if (it.path == 'org/openjdk/btrace/core/Messages.class' || it.path == 'org/openjdk/btrace/core/messages.properties') { @@ -42,9 +46,8 @@ def bootIncludes = { || it.path.startsWith('org/openjdk/btrace/runtime/LinkingFlag')) { return true } - // Include invokedynamic bootstrap classes (they use volatile fields to reach agent implementations) - if (it.path.startsWith('org/openjdk/btrace/runtime/Indy') - || it.path.startsWith('org/openjdk/btrace/runtime/ExtensionIndy')) { + // Include ExtensionIndy bootstrap class (uses volatile field to reach agent implementation) + if (it.path.startsWith('org/openjdk/btrace/runtime/ExtensionIndy')) { return true } // Include Auxiliary class - probe classes are defined via MethodHandles.privateLookupIn(Auxiliary.class) diff --git a/btrace-core/src/main/java/org/openjdk/btrace/core/HandlerRepository.java b/btrace-core/src/main/java/org/openjdk/btrace/core/HandlerRepository.java index e02f28faa..e7c27f448 100644 --- a/btrace-core/src/main/java/org/openjdk/btrace/core/HandlerRepository.java +++ b/btrace-core/src/main/java/org/openjdk/btrace/core/HandlerRepository.java @@ -1,11 +1,59 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + package org.openjdk.btrace.core; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodType; + /** - * A bridge interface between a handler repository implementation and the invoke dynamic bootstrap - * class doing the handler lookup. + * Bridge interface between the bootstrap-resident {@link + * org.openjdk.btrace.indy.IndyDispatcher} and the agent-resident handler + * repository. The implementation lives in the agent classloader and is set on + * {@code IndyDispatcher.repository} during agent initialization. */ -@FunctionalInterface public interface HandlerRepository { - byte[] getProbeHandler( - String callerName, String probeName, String handlerName, String handlerDesc); + /** + * Resolve a probe handler to a {@link MethodHandle}. + * + * @param callerName the internal name of the class containing the INVOKEDYNAMIC call site + * @param probeName the fully qualified probe class name + * @param handlerName the prefixed handler method name + * @param handlerType the method type of the handler + * @return a MethodHandle to the handler, or {@code null} if resolution fails + */ + MethodHandle resolveHandler( + String callerName, String probeName, String handlerName, MethodType handlerType); + + /** + * Resolve a runtime utility method (e.g. {@code MethodTracker.hit}) to a {@link MethodHandle}. + * + * @param owner the internal name of the owning class + * @param name the method name + * @param type the method type + * @return a MethodHandle to the method, or {@code null} if resolution fails + */ + MethodHandle resolveRuntime(String owner, String name, MethodType type); } diff --git a/btrace-core/src/main/java/org/openjdk/btrace/indy/IndyDispatcher.java b/btrace-core/src/main/java/org/openjdk/btrace/indy/IndyDispatcher.java new file mode 100644 index 000000000..18b265c47 --- /dev/null +++ b/btrace-core/src/main/java/org/openjdk/btrace/indy/IndyDispatcher.java @@ -0,0 +1,158 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package org.openjdk.btrace.indy; + +import java.lang.invoke.CallSite; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import org.openjdk.btrace.core.HandlerRepository; +import org.openjdk.btrace.runtime.LinkingFlag; + +/** + * Minimal invokedynamic bootstrap dispatcher for BTrace probe handlers. Resides in the bootstrap + * classloader. All actual handler resolution is delegated to {@link HandlerRepository}, which is set + * by the agent at initialization time. + * + *

Instrumented bytecode emits {@code INVOKEDYNAMIC} instructions targeting the {@link + * #bootstrap} method. On first invocation, the bootstrap resolves a {@link MethodHandle} to the + * probe handler (living in the agent classloader) and returns a {@link ConstantCallSite} so + * subsequent calls go directly through the cached handle. + * + *

This class, together with {@link org.openjdk.btrace.runtime.LinkingFlag}, forms the minimal + * bootstrap footprint required by BTrace. + */ +public final class IndyDispatcher { + private static final MethodHandle NOOP; + + static { + try { + NOOP = + MethodHandles.lookup() + .findStatic(IndyDispatcher.class, "noop", MethodType.methodType(void.class)); + } catch (NoSuchMethodException | IllegalAccessException e) { + throw new ExceptionInInitializerError(e); + } + } + + /** + * Set by {@code HandlerRepositoryImpl} during agent initialization. Bridges the bootstrap + * classloader to the agent classloader where probe handlers are loaded. + */ + public static volatile HandlerRepository repository; + + /** + * Bootstrap method for probe handler dispatch. Called by the JVM when an {@code INVOKEDYNAMIC} + * instruction targeting a probe handler is first executed. + * + * @param caller lookup context provided by the JVM + * @param name the call site name (prefixed handler method name) + * @param type the method type of the call site + * @param probeClassName the fully qualified probe class name + * @return a {@link ConstantCallSite} wrapping the resolved handler, or a no-op fallback + */ + public static CallSite bootstrap( + MethodHandles.Lookup caller, String name, MethodType type, String probeClassName) { + LinkingFlag.guardLinking(); + try { + MethodHandle mh; + try { + mh = repository.resolveHandler(caller.lookupClass().getName(), probeClassName, name, type); + } catch (Throwable t) { + mh = null; + } + if (mh == null) { + mh = MethodHandles.dropArguments(NOOP, 0, type.parameterArray()); + } + return new ConstantCallSite(mh); + } finally { + LinkingFlag.reset(); + } + } + + /** + * Bootstrap method for runtime utility calls (e.g. {@code MethodTracker}). Called by the JVM when + * an {@code INVOKEDYNAMIC} instruction targeting a runtime utility method is first executed. + * + * @param caller lookup context provided by the JVM + * @param name the method name to resolve + * @param type the method type of the call site + * @param owner the internal name of the owning class (e.g. {@code + * "org/openjdk/btrace/instr/MethodTracker"}) + * @return a {@link ConstantCallSite} wrapping the resolved method, or a no-op fallback + */ + public static CallSite runtimeBootstrap( + MethodHandles.Lookup caller, String name, MethodType type, String owner) { + LinkingFlag.guardLinking(); + try { + MethodHandle mh; + try { + mh = repository.resolveRuntime(owner, name, type); + } catch (Throwable t) { + mh = null; + } + if (mh == null) { + mh = buildDefaultHandle(type); + } + return new ConstantCallSite(mh); + } finally { + LinkingFlag.reset(); + } + } + + /** No-op handler used as fallback when handler resolution fails. */ + public static void noop() {} + + private static MethodHandle buildDefaultHandle(MethodType type) { + Class ret = type.returnType(); + MethodHandle base; + if (ret == void.class) { + base = NOOP; + } else if (ret == boolean.class) { + base = MethodHandles.constant(boolean.class, false); + } else if (ret == int.class) { + base = MethodHandles.constant(int.class, 0); + } else if (ret == long.class) { + base = MethodHandles.constant(long.class, 0L); + } else { + // Reference types or other primitives - return null/zero via identity tricks + base = MethodHandles.constant(ret, defaultValue(ret)); + } + return MethodHandles.dropArguments(base, 0, type.parameterArray()); + } + + private static Object defaultValue(Class type) { + if (type == byte.class) return (byte) 0; + if (type == short.class) return (short) 0; + if (type == char.class) return (char) 0; + if (type == float.class) return 0.0f; + if (type == double.class) return 0.0d; + return null; // reference types + } + + private IndyDispatcher() {} +} diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/Assembler.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/Assembler.java index 6f1885b58..5bd0b6105 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/Assembler.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/Assembler.java @@ -24,6 +24,9 @@ */ package org.openjdk.btrace.instr; +import java.lang.invoke.CallSite; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; import org.objectweb.asm.Handle; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; @@ -60,6 +63,7 @@ import static org.objectweb.asm.Opcodes.GETFIELD; import static org.objectweb.asm.Opcodes.GETSTATIC; import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; import static org.objectweb.asm.Opcodes.IALOAD; import static org.objectweb.asm.Opcodes.IASTORE; import static org.objectweb.asm.Opcodes.ICONST_0; @@ -588,6 +592,35 @@ public Assembler invokeStatic(String owner, String method, String desc) { return this; } + private static final String INDY_DISPATCHER_INTERNAL = "org/openjdk/btrace/indy/IndyDispatcher"; + private static final MethodType RUNTIME_BOOTSTRAP_MT = + MethodType.methodType( + CallSite.class, + MethodHandles.Lookup.class, + String.class, + MethodType.class, + String.class); + private static final Handle RUNTIME_BOOTSTRAP_HANDLE = + new Handle( + H_INVOKESTATIC, + INDY_DISPATCHER_INTERNAL, + "runtimeBootstrap", + RUNTIME_BOOTSTRAP_MT.toMethodDescriptorString(), + false); + + /** + * Emit an INVOKEDYNAMIC instruction that routes through IndyDispatcher.runtimeBootstrap to + * resolve a static method in the agent classloader at first invocation. + * + * @param owner the internal name of the target class + * @param method the method name + * @param desc the method descriptor + */ + public Assembler invokeRuntime(String owner, String method, String desc) { + mv.visitInvokeDynamicInsn(method, desc, RUNTIME_BOOTSTRAP_HANDLE, owner); + return this; + } + public Assembler invokeDynamic( String name, String descriptor, Handle bootstrap, Object... bootstrapArguments) { mv.visitInvokeDynamicInsn(name, descriptor, bootstrap, bootstrapArguments); diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbe.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbe.java index fc0408af9..6379cf8ac 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbe.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbe.java @@ -95,6 +95,12 @@ public interface BTraceProbe { void copyHandlers(ClassVisitor copyingVisitor); + /** + * Returns the Class object produced by {@link #register}, or {@code null} if the probe has not + * been registered yet. + */ + Class getDefinedClass(); + void applyArgs(ArgsMap argsMap); BTraceRuntime.Impl getRuntime(); diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeFactory.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeFactory.java index db2286046..0b241c9e3 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeFactory.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeFactory.java @@ -158,7 +158,6 @@ public BTraceProbe createProbe(byte[] code, ArgsMap argsMap) { } applyArgs(bp, argsMap); - HandlerRepositoryImpl.registerProbe(bp); return bp; } @@ -184,7 +183,6 @@ public BTraceProbe createProbe(InputStream code, ArgsMap argsMap) { } applyArgs(bp, argsMap); - HandlerRepositoryImpl.registerProbe(bp); return bp; } } diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeNode.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeNode.java index 55dff3c9b..6b7a39e88 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeNode.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbeNode.java @@ -76,6 +76,7 @@ public final class BTraceProbeNode extends ClassNode implements BTraceProbe { private final BTraceBCPClassLoader bcpResourceClassLoader; private volatile BTraceRuntime.Impl rt = null; + private volatile Class definedClass = null; private BTraceTransformer transformer; private VerifierException verifierException = null; @@ -202,11 +203,13 @@ String translateOwner(String owner) { @Override public Class register(BTraceRuntime.Impl rt, BTraceTransformer t) { - byte[] code = getBytecode(true); + byte[] code = getBytecode(false); if (debug.isDumpClasses()) { debug.dumpClass(name + "_bcp", code); } Class clz = delegate.defineClass(rt, code); + definedClass = clz; + HandlerRepositoryImpl.registerProbe(this); t.register(this); transformer = t; this.rt = rt; @@ -221,9 +224,16 @@ public void unregister() { } transformer.unregister(this); } + HandlerRepositoryImpl.unregisterProbe(this); + definedClass = null; rt = null; } + @Override + public Class getDefinedClass() { + return definedClass; + } + @Override public byte[] getFullBytecode() { return getBytecode(false); @@ -267,6 +277,25 @@ public MethodVisitor visitMethod( return super.visitMethod(access, name, desc, sig, exceptions); } }; + } else { + // Transform AnyType→Object in method descriptors so that the probe class + // methods match the INVOKEDYNAMIC call site descriptors. + cv = + new ClassVisitor(Opcodes.ASM9, cw) { + @Override + public MethodVisitor visitMethod( + int access, String name, String desc, String sig, String[] exceptions) { + if (name.startsWith("<")) { + return super.visitMethod(access, name, desc, sig, exceptions); + } + String newDesc = desc.replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC); + String newSig = + sig != null + ? sig.replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC) + : null; + return super.visitMethod(access, name, newDesc, newSig, exceptions); + } + }; } accept(cv); return cw.toByteArray(); diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbePersisted.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbePersisted.java index 1e0189399..024d57c45 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbePersisted.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/BTraceProbePersisted.java @@ -23,6 +23,7 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; @@ -91,6 +92,7 @@ public class BTraceProbePersisted implements BTraceProbe { private final AtomicBoolean triedVerify = new AtomicBoolean(false); private final Map> calleeMap = new HashMap<>(); private volatile BTraceRuntime.Impl rt = null; + private volatile Class definedClass = null; private BTraceTransformer transformer; private byte[] fullData = null; private byte[] dataHolder = null; @@ -560,11 +562,13 @@ public Iterable onprobes() { @Override public Class register(BTraceRuntime.Impl rt, BTraceTransformer t) { - byte[] code = dataHolder; + byte[] code = transformAnyTypeDescriptors(fullData); if (debug.isDumpClasses()) { debug.dumpClass(delegate.getClassName(true) + "_bcp", code); } Class clz = delegate.defineClass(rt, code); + definedClass = clz; + HandlerRepositoryImpl.registerProbe(this); t.register(this); transformer = t; this.rt = rt; @@ -579,9 +583,16 @@ public void unregister() { } transformer.unregister(this); } + HandlerRepositoryImpl.unregisterProbe(this); + definedClass = null; rt = null; } + @Override + public Class getDefinedClass() { + return definedClass; + } + @Override public boolean willInstrument(Class clz) { return delegate.willInstrument(clz); @@ -661,6 +672,29 @@ public Set getRequiredPermissions() { return delegate.getRequiredPermissions(); } + private static byte[] transformAnyTypeDescriptors(byte[] data) { + ClassReader cr = new ClassReader(data); + ClassWriter cw = new ClassWriter(0); + cr.accept( + new ClassVisitor(ASM9, cw) { + @Override + public MethodVisitor visitMethod( + int access, String name, String desc, String sig, String[] exceptions) { + if (name.startsWith("<")) { + return super.visitMethod(access, name, desc, sig, exceptions); + } + String newDesc = desc.replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC); + String newSig = + sig != null + ? sig.replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC) + : null; + return super.visitMethod(access, name, newDesc, newSig, exceptions); + } + }, + 0); + return cw.toByteArray(); + } + private void upgradeBytecode() { fullData = ProbeUpgradeVisitor_1_2.upgrade(new ClassReader(fullData)); dataHolder = ProbeUpgradeVisitor_1_2.upgrade(new ClassReader(dataHolder)); diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/ClassFilter.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/ClassFilter.java index 368f38d7a..333740412 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/ClassFilter.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/ClassFilter.java @@ -88,6 +88,16 @@ public class ClassFilter { SENSITIVE_CLASSES.add("sun/invoke/"); SENSITIVE_CLASSES.add("org/openjdk/btrace/"); + // JDK 8 internal packages (moved to jdk/internal/ in JDK 9+). + // Used by MethodHandle/invoke machinery during INVOKEDYNAMIC resolution. + try { + Class.forName("java.lang.Module"); + } catch (ClassNotFoundException e) { + // JDK 8 + SENSITIVE_CLASSES.add("sun/misc/"); + SENSITIVE_CLASSES.add("sun/reflect/"); + } + // Method-level exclusions for Thread: ThreadLocal accessor/mutator methods create infinite // recursion on JDK 25+ where ThreadLocal.createMap calls Thread.setThreadLocals. addSensitiveMethod("java/lang/Thread", "threadLocals"); diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/CopyingVisitor.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/CopyingVisitor.java deleted file mode 100644 index 1e08291f9..000000000 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/CopyingVisitor.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.openjdk.btrace.instr; - -import static org.objectweb.asm.Opcodes.ASM9; - -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -class CopyingVisitor extends ClassVisitor { - private final boolean renameParent; - private final String targetClassName; - - private String origClassName; - - public CopyingVisitor(String targetClassName, boolean renameParent, ClassVisitor parent) { - super(Opcodes.ASM8, parent); - this.targetClassName = targetClassName; - this.renameParent = renameParent; - } - - @Override - public void visit( - int version, - int access, - String name, - String signature, - String superName, - String[] interfaces) { - if (renameParent) { - super.visit(version, access, targetClassName, signature, superName, interfaces); - } - origClassName = name; - } - - @Override - public MethodVisitor visitMethod( - int access, String name, String desc, String sig, String[] exceptions) { - return new MethodVisitor( - ASM9, - super.visitMethod( - Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC, getMethodName(name), desc, sig, exceptions)) { - @Override - public void visitMethodInsn( - int opcode, String owner, String name, String desc, boolean itfc) { - if (owner.equals(origClassName)) { - owner = targetClassName; - name = getActionMethodName(name); - } - super.visitMethodInsn(opcode, owner, name, desc, itfc); - } - }; - } - - protected String getActionMethodName(String name) { - return name; - } - - protected String getMethodName(String name) { - return name; - } -} diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/HandlerRepositoryImpl.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/HandlerRepositoryImpl.java index 027bec199..8461f3e46 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/HandlerRepositoryImpl.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/HandlerRepositoryImpl.java @@ -1,36 +1,50 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + package org.openjdk.btrace.instr; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.openjdk.btrace.core.DebugSupport; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.openjdk.btrace.core.HandlerRepository; -import org.openjdk.btrace.core.SharedSettings; +import org.openjdk.btrace.indy.IndyDispatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -public final class HandlerRepositoryImpl { +public final class HandlerRepositoryImpl implements HandlerRepository { private static final Logger log = LoggerFactory.getLogger(HandlerRepositoryImpl.class); + private static final HandlerRepositoryImpl INSTANCE = new HandlerRepositoryImpl(); + private static final Map probeMap = new ConcurrentHashMap<>(); - private static final Map handlerBytecodeCache = new ConcurrentHashMap<>(); + private static final Map handlerCache = new ConcurrentHashMap<>(); static { - try { - Class indyClz = Class.forName("org.openjdk.btrace.runtime.Indy"); - HandlerRepository hook = HandlerRepositoryImpl::getProbeHandler; - indyClz.getField("repository").set(null, hook); - } catch (UnsupportedClassVersionError ignored) { - // expected for pre Java 15 runtimes - } catch (Throwable t) { - log.warn("Unable to initialize BTrace Indy support", t); - } + IndyDispatcher.repository = INSTANCE; } public static void registerProbe(BTraceProbe probe) { @@ -40,50 +54,69 @@ public static void registerProbe(BTraceProbe probe) { public static void unregisterProbe(BTraceProbe probe) { String probeName = probe.getClassName(true); probeMap.remove(probeName); - String probePrefix = probeName + "#"; - handlerBytecodeCache.keySet().removeIf(key -> { - int delimiterIndex = key.indexOf('#'); - return delimiterIndex > 0 && key.substring(0, delimiterIndex).equals(probeName); - }); + handlerCache.keySet().removeIf(key -> key.startsWith(probeName + "#")); + } + + @Override + public MethodHandle resolveHandler( + String callerName, String probeName, String handlerName, MethodType handlerType) { + String cacheKey = probeName + "#" + handlerName + handlerType.toMethodDescriptorString(); + + MethodHandle cached = handlerCache.get(cacheKey); + if (cached != null) { + return cached; + } + + BTraceProbe probe = probeMap.get(probeName); + if (probe == null) { + log.warn("No probe registered for {}", probeName); + return null; + } + Class probeClass = probe.getDefinedClass(); + if (probeClass == null) { + log.warn("Probe {} not yet defined", probeName); + return null; + } + + // Strip action prefix to get the actual method name in the probe class. + // The handlerName is prefixed (e.g. "$btrace$com$example$MyProbe$onEntry"), + // and the actual method in the probe class is the part after the last '$'. + String actualName = handlerName; + int idx = handlerName.lastIndexOf('$'); + if (idx > -1) { + actualName = handlerName.substring(idx + 1); + } + + try { + MethodHandle mh = + MethodHandles.publicLookup().findStatic(probeClass, actualName, handlerType); + handlerCache.put(cacheKey, mh); + return mh; + } catch (NoSuchMethodException | IllegalAccessException e) { + log.warn("Failed to resolve handler {}.{}", probeName, actualName, e); + return null; + } } - public static byte[] getProbeHandler( - String callerName, String probeName, String handlerName, String handlerDesc) { - String cacheKey = probeName + "#" + handlerName + handlerDesc; - - return handlerBytecodeCache.computeIfAbsent(cacheKey, k -> { - DebugSupport debugSupport = new DebugSupport(SharedSettings.GLOBAL); - BTraceProbe probe = probeMap.get(probeName); - ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS); - - String handlerClassName = callerName.replace('.', '/') + "$" + probeName.replace('/', '_'); - ClassVisitor visitor = - new CopyingVisitor(handlerClassName, true, writer) { - @Override - protected String getMethodName(String name) { - int idx = name.lastIndexOf("$"); - if (idx > -1) { - return name.substring(idx + 1); - } - return name; - } - }; - - probe.copyHandlers(visitor); - byte[] data = writer.toByteArray(); - - if (debugSupport.isDumpClasses()) { - try { - String handlerPath = - debugSupport.getDumpClassDir() + "/" + handlerClassName.replace('/', '_') + ".class"; - log.debug("BTrace INDY handler dumped: {}", handlerPath); - Files.write(Paths.get(handlerPath), data, StandardOpenOption.CREATE); - } catch (Throwable e) { - log.debug("Failed to dump BTrace INDY handler", e); - } - } - - return data; - }); + @Override + public MethodHandle resolveRuntime(String owner, String name, MethodType type) { + String cacheKey = "rt#" + owner + "." + name + type.toMethodDescriptorString(); + + MethodHandle cached = handlerCache.get(cacheKey); + if (cached != null) { + return cached; + } + + try { + String className = owner.replace('/', '.'); + Class clz = + Class.forName(className, true, HandlerRepositoryImpl.class.getClassLoader()); + MethodHandle mh = MethodHandles.publicLookup().findStatic(clz, name, type); + handlerCache.put(cacheKey, mh); + return mh; + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) { + log.warn("Failed to resolve runtime method {}.{}", owner, name, e); + return null; + } } } diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/Instrumentor.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/Instrumentor.java index c11fa5001..ed91c6fd9 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/Instrumentor.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/Instrumentor.java @@ -43,7 +43,6 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import org.openjdk.btrace.core.BTraceRuntime; import org.openjdk.btrace.core.MethodID; import org.openjdk.btrace.core.annotations.Kind; import org.openjdk.btrace.core.annotations.Sampled; @@ -63,20 +62,11 @@ public class Instrumentor extends ClassVisitor { private String className, superName; - private final boolean useHiddenClasses; - - // Allow forcing INDY-based dispatch (no handler copying) on all JDKs via property - private static boolean useHiddenClassesInTest = false; - private Instrumentor( ClassLoader cl, BTraceProbe bcn, Collection applicables, ClassVisitor cv) { super(ASM9, cv); this.cl = cl; this.bcn = bcn; - BTraceRuntime.Impl rt = bcn.getRuntime(); - // 'rt' is null only during instrumentation tests; we want to default to in-situ instrumentation - // there - useHiddenClasses = useHiddenClassesInTest || (rt != null && rt.version() >= 15); applicableOnMethods = applicables; } @@ -1847,15 +1837,7 @@ protected void onThrow() { @Override public void visitEnd() { - if (!useHiddenClasses) { - bcn.copyHandlers( - new CopyingVisitor(className, false, this) { - @Override - protected String getActionMethodName(String name) { - return Instrumentor.this.getActionMethodName(name); - } - }); - } + // All handler dispatch goes through INVOKEDYNAMIC; no handler copying needed. cv.visitEnd(); } @@ -1867,32 +1849,28 @@ private String getActionMethodName(String name) { return getActionMethodName(bcn, name); } + private static final String INDY_DISPATCHER_INTERNAL = "org/openjdk/btrace/indy/IndyDispatcher"; + private static final MethodType BOOTSTRAP_MT = + MethodType.methodType( + CallSite.class, + MethodHandles.Lookup.class, + String.class, + MethodType.class, + String.class); + private static final Handle BOOTSTRAP_HANDLE = + new Handle( + H_INVOKESTATIC, + INDY_DISPATCHER_INTERNAL, + "bootstrap", + BOOTSTRAP_MT.toMethodDescriptorString(), + false); + private void invokeBTraceAction(Assembler asm, OnMethod om) { - if (useHiddenClasses) { - MethodType mt = - MethodType.methodType( - CallSite.class, - MethodHandles.Lookup.class, - String.class, - MethodType.class, - String.class); - - asm.invokeDynamic( - getActionMethodName(om.getTargetName()), - om.getTargetDescriptor().replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC), - new Handle( - H_INVOKESTATIC, - "org/openjdk/btrace/runtime/Indy", - "bootstrap", - mt.toMethodDescriptorString(), - false), - bcn.getClassName(true)); - } else { - asm.invokeStatic( - className, - getActionMethodName(om.getTargetName()), - om.getTargetDescriptor().replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC)); - } + asm.invokeDynamic( + getActionMethodName(om.getTargetName()), + om.getTargetDescriptor().replace(Constants.ANYTYPE_DESC, Constants.OBJECT_DESC), + BOOTSTRAP_HANDLE, + bcn.getClassName(true)); calledOnMethods.add(om); om.setCalled(); } @@ -1936,6 +1914,6 @@ private boolean typeMatches(String decl, String desc, boolean exactTypeMatch) { } boolean hasCushionMethods() { - return !useHiddenClasses; + return false; } } diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/MethodTrackingContext.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/MethodTrackingContext.java index f5f38ee61..4b93b84ac 100644 --- a/btrace-instr/src/main/java/org/openjdk/btrace/instr/MethodTrackingContext.java +++ b/btrace-instr/src/main/java/org/openjdk/btrace/instr/MethodTrackingContext.java @@ -185,7 +185,7 @@ public void emitExit(int methodId) { asm.loadLocal(Type.INT_TYPE, sHitVar) .jump(IFEQ, l) .ldc(methodId) - .invokeStatic(METHOD_COUNTER_CLASS, "updateEndTs", "(I)V") + .invokeRuntime(METHOD_COUNTER_CLASS, "updateEndTs", "(I)V") .label(l); helper.insertFrameSameStack(l); } @@ -313,10 +313,10 @@ private void emitTimingSamplerEntry(int mid) { asm.ldc(mid); switch (samplerKind) { case Const: - asm.invokeStatic(METHOD_COUNTER_CLASS, "hitTimed", "(I)J"); + asm.invokeRuntime(METHOD_COUNTER_CLASS, "hitTimed", "(I)J"); break; case Adaptive: - asm.invokeStatic(METHOD_COUNTER_CLASS, "hitTimedAdaptive", "(I)J"); + asm.invokeRuntime(METHOD_COUNTER_CLASS, "hitTimedAdaptive", "(I)J"); break; default: // do nothing @@ -356,10 +356,10 @@ private void emitSamplerEntry(int mid) { asm.ldc(mid); switch (samplerKind) { case Const: - asm.invokeStatic(METHOD_COUNTER_CLASS, "hit", "(I)Z"); + asm.invokeRuntime(METHOD_COUNTER_CLASS, "hit", "(I)Z"); break; case Adaptive: - asm.invokeStatic(METHOD_COUNTER_CLASS, "hitAdaptive", "(I)Z"); + asm.invokeRuntime(METHOD_COUNTER_CLASS, "hitAdaptive", "(I)Z"); break; default: // do nothing @@ -418,7 +418,7 @@ private void emitTimingSamplerTest(int mid) { if (!durationComputed) { if (entryTsVar != Integer.MIN_VALUE) { asm.ldc(mid) - .invokeStatic(METHOD_COUNTER_CLASS, "getEndTs", "(I)J") + .invokeRuntime(METHOD_COUNTER_CLASS, "getEndTs", "(I)J") .loadLocal(Type.LONG_TYPE, entryTsVar) .sub(Type.LONG_TYPE); } else { diff --git a/btrace-instr/src/test/java/org/openjdk/btrace/instr/OnMethodInstrumenterTest.java b/btrace-instr/src/test/java/org/openjdk/btrace/instr/OnMethodInstrumenterTest.java index 153d7d00a..d5af00d13 100644 --- a/btrace-instr/src/test/java/org/openjdk/btrace/instr/OnMethodInstrumenterTest.java +++ b/btrace-instr/src/test/java/org/openjdk/btrace/instr/OnMethodInstrumenterTest.java @@ -46,8 +46,6 @@ public class OnMethodInstrumenterTest extends InstrumentorTestBase { private static final Map targetClassMap = new HashMap<>(); private static final Map verifyFlagMap = new HashMap<>(); - private static Field instrHiddenClassesFlagFld = null; - static { targetClassMap.put("onmethod/MatchDerived", "DerivedClass"); targetClassMap.put("issues/BTRACE22", "issues/BTRACE22"); @@ -77,19 +75,15 @@ public static void classSetup() throws Exception { Field f = RandomIntProvider.class.getDeclaredField("useBtraceEnter"); f.setAccessible(true); f.setBoolean(null, false); - - instrHiddenClassesFlagFld = Instrumentor.class.getDeclaredField("useHiddenClassesInTest"); - instrHiddenClassesFlagFld.setAccessible(true); } @ParameterizedTest @MethodSource("listTransformations") - void testTransformation(String trace, String targetClass, boolean verify, boolean useHiddenClasses) throws Exception { - instrHiddenClassesFlagFld.set(null, useHiddenClasses); + void testTransformation(String trace, String targetClass, boolean verify) throws Exception { loadTargetClass(targetClass); transform(trace); - checkTransformation((useHiddenClasses ? "dynamic" : "static") + "/" + trace, verify); + checkTransformation(trace, verify); } @SuppressWarnings("resource") @@ -100,11 +94,8 @@ private static Stream listTransformations() throws Exception { .map(root::relativize) .map(Path::toString) .map(p -> p.replace(".class", "")) - .flatMap(p -> - Stream.of( - Arguments.of(Named.of("Trace: " + p, p), Named.of("Target Class: " + getTargetClass(p), getTargetClass(p)), Named.of("Verify: " + getVerifyFlag(p), getVerifyFlag(p)), Named.of("Dispatcher: INVOKESTATIC", false)), - Arguments.of(Named.of("Trace: " + p, p), Named.of("Target Class: " + getTargetClass(p), getTargetClass(p)), Named.of("Verify: " + getVerifyFlag(p), getVerifyFlag(p)), Named.of("Dispatcher: INVOKEDYNAMIC", true)) - ) + .map(p -> + Arguments.of(Named.of("Trace: " + p, p), Named.of("Target Class: " + getTargetClass(p), getTargetClass(p)), Named.of("Verify: " + getVerifyFlag(p), getVerifyFlag(p))) ); } diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/ExportTest b/btrace-instr/src/test/resources/instrumentorTestData/ExportTest similarity index 65% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/ExportTest rename to btrace-instr/src/test/resources/instrumentorTestData/ExportTest index 369be585e..219554c96 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/ExportTest +++ b/btrace-instr/src/test/resources/instrumentorTestData/ExportTest @@ -6,7 +6,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ExportTest$testArgs(Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ExportTest" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/OnProbeTest b/btrace-instr/src/test/resources/instrumentorTestData/OnProbeTest similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/OnProbeTest rename to btrace-instr/src/test/resources/instrumentorTestData/OnProbeTest diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/OnTimerTest b/btrace-instr/src/test/resources/instrumentorTestData/OnTimerTest similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/OnTimerTest rename to btrace-instr/src/test/resources/instrumentorTestData/OnTimerTest diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/ServicesTest b/btrace-instr/src/test/resources/instrumentorTestData/ServicesTest similarity index 64% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/ServicesTest rename to btrace-instr/src/test/resources/instrumentorTestData/ServicesTest index f767be6e7..0f2450681 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/ServicesTest +++ b/btrace-instr/src/test/resources/instrumentorTestData/ServicesTest @@ -3,7 +3,7 @@ IFNE L0 LDC "resources.OnMethodTest" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ServicesTest$testFieldInjection(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ServicesTest" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/TLSTest b/btrace-instr/src/test/resources/instrumentorTestData/TLSTest similarity index 65% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/TLSTest rename to btrace-instr/src/test/resources/instrumentorTestData/TLSTest index ab2981d40..89bf81d5c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/TLSTest +++ b/btrace-instr/src/test/resources/instrumentorTestData/TLSTest @@ -6,7 +6,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TLSTest$testArgs(Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TLSTest" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/TraceAllTest b/btrace-instr/src/test/resources/instrumentorTestData/TraceAllTest similarity index 65% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/TraceAllTest rename to btrace-instr/src/test/resources/instrumentorTestData/TraceAllTest index d7f2fabff..f492e14f1 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/TraceAllTest +++ b/btrace-instr/src/test/resources/instrumentorTestData/TraceAllTest @@ -3,7 +3,7 @@ IFNE L1 LDC "public void resources.OnMethodTest#" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -13,7 +13,7 @@ IFNE L1 LDC "private void resources.OnMethodTest#(java.lang.String)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -23,7 +23,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#noargs" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -34,7 +34,7 @@ IFNE L0 LDC "public static void resources.OnMethodTest#noargs$static" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -45,7 +45,7 @@ IFNE L0 LDC "public long resources.OnMethodTest#args(java.lang.String, long, java.lang.String[], int[])" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -55,7 +55,7 @@ IFNE L0 LDC "public static long resources.OnMethodTest#args$static(java.lang.String, long, java.lang.String[], int[])" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -65,7 +65,7 @@ IFNE L0 LDC "public static long resources.OnMethodTest#callTopLevelStatic(java.lang.String, long)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -75,7 +75,7 @@ IFNE L0 LDC "public static long resources.OnMethodTest#callTargetStatic(java.lang.String, long)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -85,7 +85,7 @@ IFNE L0 LDC "public long resources.OnMethodTest#callTopLevel(java.lang.String, long)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -95,7 +95,7 @@ IFNE L0 LDC "private long resources.OnMethodTest#callTarget(java.lang.String, long)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -105,7 +105,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#exception" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -115,7 +115,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#uncaught" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -125,7 +125,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#array(int)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -135,7 +135,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#field" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -145,7 +145,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#newObject" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -155,7 +155,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#newArray" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -165,7 +165,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#casts" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -175,7 +175,7 @@ IFNE L4 LDC "public void resources.OnMethodTest#sync" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -185,7 +185,7 @@ IFNE L0 LDC "public long resources.OnMethodTest#callTopLevel1(java.lang.String, long)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -195,7 +195,7 @@ IFNE L0 LDC "private long resources.OnMethodTest#calLTargetX(java.lang.String, long)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -205,7 +205,7 @@ IFNE L0 LDC "public long resources.OnMethodTest#argsMultiReturn(java.lang.String, long, java.lang.String[], int[])" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -215,7 +215,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#staticField" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -225,7 +225,7 @@ IFNE L4 LDC "public void resources.OnMethodTest#syncM" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -235,7 +235,7 @@ IFNE L0 LDC "public java.lang.String resources.OnMethodTest#argsTypeMatch(java.util.ArrayList)" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] @@ -245,7 +245,7 @@ IFNE L0 LDC "public void resources.OnMethodTest#caught" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TraceAllTest" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampledAdaptive deleted file mode 100644 index 8613f17c3..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampledAdaptive +++ /dev/null @@ -1,35 +0,0 @@ -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z -ISTORE 6 -ILOAD 6 -IFEQ L0 -L1 -FRAME APPEND [I] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ -// handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; -// arguments: -"org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive" -] -FRAME SAME -ILOAD 6 -IFEQ L2 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.updateEndTs (I)V -L2 -FRAME SAME1 J -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L3 4 -LOCALVARIABLE d [I L0 L3 5 -MAXSTACK = 6 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE106 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE106 similarity index 68% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE106 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE106 index 23d103185..047d05dff 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE106 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE106 @@ -4,7 +4,7 @@ ALOAD 0 LDC "aMethod" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o1(Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE106" ] @@ -26,7 +26,7 @@ LDC "bMethod" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o3(Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE106" ] @@ -39,7 +39,7 @@ LDC "bMethod" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o2(Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE106" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE189 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE189 similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE189 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE189 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE22 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE22 similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE22 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE22 index 88485bca5..8aabfeb1e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE22 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE22 @@ -17,7 +17,7 @@ ALOAD 0 LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE22$tracker(Ljava/lang/Object;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE22" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE256 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE256 similarity index 71% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE256 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE256 index 43db74306..e8db7fb59 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE256 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE256 @@ -7,7 +7,7 @@ IFNE L0 LDC "public void resources.issues.BTRACE256#doStuff" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE256$entry(Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE256" ] @@ -24,7 +24,7 @@ LDC "public void resources.issues.BTRACE256#doStuff" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE256$exit(Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE256" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE28 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE28 similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE28 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE28 index fd6e58ebe..232e9c632 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE28 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE28 @@ -4,7 +4,7 @@ LDC "resources.issues.BTRACE28" LDC "" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE28$tracker(Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE28" ] @@ -24,7 +24,7 @@ LDC "resources.issues.BTRACE28" LDC "serveResource" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE28$tracker(Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE28" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE53 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE53 similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE53 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE53 index 040e292b6..1efcc9520 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE53 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE53 @@ -13,7 +13,7 @@ IFNE L3 LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE53$onInit(J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE53" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE69 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE69 similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE69 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE69 index d036d5705..38e9d653c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE69 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE69 @@ -7,7 +7,7 @@ IFNE L0 ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncEntry(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE69" ] @@ -21,7 +21,7 @@ IFNE L8 ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncExit(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE69" ] @@ -37,7 +37,7 @@ IFNE L10 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncExit(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE69" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE87 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE87 similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE87 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE87 index 11f59d0c6..a1297768d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE87 +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE87 @@ -7,7 +7,7 @@ ICONST_0 ANEWARRAY java/lang/Object INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE87$o(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE87" ] @@ -30,7 +30,7 @@ ALOAD 3 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE87$o(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/BTRACE87" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE_333 b/btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE_333 similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/BTRACE_333 rename to btrace-instr/src/test/resources/instrumentorTestData/issues/BTRACE_333 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/InterestingVarsTest b/btrace-instr/src/test/resources/instrumentorTestData/issues/InterestingVarsTest similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/InterestingVarsTest rename to btrace-instr/src/test/resources/instrumentorTestData/issues/InterestingVarsTest index cd3a8d7c1..4dc890896 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/InterestingVarsTest +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/InterestingVarsTest @@ -5,7 +5,7 @@ ALOAD 1 ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$InterestingVarsTest$entry(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/InterestingVarsTest" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/TezSplitter b/btrace-instr/src/test/resources/instrumentorTestData/issues/TezSplitter similarity index 98% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/TezSplitter rename to btrace-instr/src/test/resources/instrumentorTestData/issues/TezSplitter index 6e164d484..468b74cea 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/issues/TezSplitter +++ b/btrace-instr/src/test/resources/instrumentorTestData/issues/TezSplitter @@ -21,7 +21,7 @@ ALOAD 4 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TezSplitter$getGroupedSplitsHook([Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TezSplitter" ] @@ -53,7 +53,7 @@ ALOAD 5 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$TezSplitter$getGroupedSplitsHook([Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/TezSplitter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AllLines b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/AllLines similarity index 68% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AllLines rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/AllLines index 2c7d12f25..2b1b2b6e7 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AllLines +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/AllLines @@ -5,7 +5,7 @@ LDC "" LDC 41 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -16,7 +16,7 @@ LDC "" LDC 42 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -32,7 +32,7 @@ LDC "" LDC 43 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -47,7 +47,7 @@ LDC "" LDC 45 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -58,7 +58,7 @@ LDC "" LDC 46 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -74,7 +74,7 @@ LDC "" LDC 47 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -90,7 +90,7 @@ LDC "noargs" LDC 50 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -106,7 +106,7 @@ LDC "noargs$static" LDC 53 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -120,7 +120,7 @@ LDC "args" LDC 57 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -140,7 +140,7 @@ LDC "args$static" LDC 61 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -159,7 +159,7 @@ LDC "callTopLevelStatic" LDC 65 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -174,7 +174,7 @@ LDC "callTopLevelStatic" LDC 66 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -191,7 +191,7 @@ LDC "callTargetStatic" LDC 70 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -207,7 +207,7 @@ LDC "callTopLevel" LDC 74 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -225,7 +225,7 @@ LDC "callTarget" LDC 78 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -243,7 +243,7 @@ LDC "exception" LDC 83 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -256,7 +256,7 @@ LDC "exception" LDC 84 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -271,7 +271,7 @@ LDC "exception" LDC 85 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -286,7 +286,7 @@ LDC "exception" LDC 87 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -303,7 +303,7 @@ LDC "uncaught" LDC 90 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -318,7 +318,7 @@ LDC "array" LDC 94 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -333,7 +333,7 @@ LDC "array" LDC 96 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -348,7 +348,7 @@ LDC "array" LDC 97 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -363,7 +363,7 @@ LDC "array" LDC 98 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -380,7 +380,7 @@ LDC "field" LDC 101 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -396,7 +396,7 @@ LDC "field" LDC 102 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -411,7 +411,7 @@ LDC "newObject" LDC 105 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -426,7 +426,7 @@ LDC "newObject" LDC 106 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -443,7 +443,7 @@ LDC "newArray" LDC 109 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -458,7 +458,7 @@ LDC "newArray" LDC 110 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -473,7 +473,7 @@ LDC "newArray" LDC 111 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -488,7 +488,7 @@ LDC "newArray" LDC 112 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -503,7 +503,7 @@ LDC "newArray" LDC 113 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -523,7 +523,7 @@ LDC "casts" LDC 116 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -538,7 +538,7 @@ LDC "casts" LDC 117 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -553,7 +553,7 @@ LDC "casts" LDC 119 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -569,7 +569,7 @@ LDC "casts" LDC 120 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -584,7 +584,7 @@ LDC "casts" LDC 122 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -601,7 +601,7 @@ LDC "sync" LDC 125 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -615,7 +615,7 @@ LDC "sync" LDC 126 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -630,7 +630,7 @@ LDC "sync" LDC 127 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -646,7 +646,7 @@ LDC "sync" LDC 128 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -661,7 +661,7 @@ LDC "callTopLevel1" LDC 131 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -677,7 +677,7 @@ LDC "callTopLevel1" LDC 132 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -695,7 +695,7 @@ LDC "calLTargetX" LDC 136 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -713,7 +713,7 @@ LDC "argsMultiReturn" LDC 140 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -729,7 +729,7 @@ LDC "argsMultiReturn" LDC 141 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -744,7 +744,7 @@ LDC "argsMultiReturn" LDC 144 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -759,7 +759,7 @@ LDC "argsMultiReturn" LDC 145 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -774,7 +774,7 @@ LDC "argsMultiReturn" LDC 149 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -788,7 +788,7 @@ LDC "argsMultiReturn" LDC 150 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -807,7 +807,7 @@ LDC "staticField" LDC 161 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -822,7 +822,7 @@ LDC "staticField" LDC 162 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -836,7 +836,7 @@ LDC "syncM" LDC 165 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -850,7 +850,7 @@ LDC "syncM" LDC 166 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -865,7 +865,7 @@ LDC "syncM" LDC 167 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -882,7 +882,7 @@ LDC "syncM" LDC 168 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -898,7 +898,7 @@ LDC "argsTypeMatch" LDC 173 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -915,7 +915,7 @@ LDC "caught" LDC 178 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -928,7 +928,7 @@ LDC "caught" LDC 179 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -943,7 +943,7 @@ LDC "caught" LDC 180 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] @@ -958,7 +958,7 @@ LDC "caught" LDC 182 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AllLines" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AnytypeArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/AnytypeArgs similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AnytypeArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/AnytypeArgs index de90bacd6..164047886 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AnytypeArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/AnytypeArgs @@ -22,7 +22,7 @@ ALOAD 5 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgs$args(Ljava/lang/Object;[Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AnytypeArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AnytypeArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/AnytypeArgsNoSelf similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AnytypeArgsNoSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/AnytypeArgsNoSelf index 1e7c7e968..8fa754ec2 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/AnytypeArgsNoSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/AnytypeArgsNoSelf @@ -21,7 +21,7 @@ ALOAD 5 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgsNoSelf$argsNoSelf([Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Args b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Args similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Args rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/Args index f6a8432c8..f16a47be4 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Args +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Args @@ -7,7 +7,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Args$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Args" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Args2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Args2Sampled similarity index 61% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Args2Sampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/Args2Sampled index d55b6715f..2318c4dc8 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Args2Sampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Args2Sampled @@ -1,5 +1,10 @@ ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 ILOAD 6 IFEQ L0 @@ -14,7 +19,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args2(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Args2Sampled" ] @@ -32,7 +37,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Args2Sampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration index 944f693e0..b759e2d9d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration @@ -21,7 +21,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2 similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2 index afff11533..6d2b18095 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2 @@ -21,7 +21,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2" ] @@ -40,7 +40,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2Err b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2Err similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2Err rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2Err index 3da1123e3..1ad12d8dc 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2Err +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2Err @@ -18,7 +18,7 @@ LLOAD 6 ALOAD 10 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args2(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err" ] @@ -40,7 +40,7 @@ LLOAD 6 ALOAD 11 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2Sampled similarity index 58% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2Sampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2Sampled index 8507056d9..1886abbe5 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDuration2Sampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDuration2Sampled @@ -1,7 +1,12 @@ LCONST_0 LSTORE 6 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 8 L2I @@ -9,7 +14,12 @@ ISTORE 10 ILOAD 10 IFEQ L1 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J +INVOKEDYNAMIC getEndTs(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] LLOAD 8 LSUB LSTORE 6 @@ -28,7 +38,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled" ] @@ -51,7 +61,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationBoxed b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationBoxed similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationBoxed rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationBoxed diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationBoxedErr b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationBoxedErr similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationBoxedErr rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationBoxedErr diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationConstructor b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationConstructor similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationConstructor rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationConstructor index 18f4e9e77..b8ceca409 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationConstructor +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationConstructor @@ -15,7 +15,7 @@ LLOAD 2 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructor$args(Ljava/lang/Object;JLjava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationConstructorErr b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationConstructorErr similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationConstructorErr rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationConstructorErr index 96d6fc9c2..5b9922d0a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationConstructorErr +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationConstructorErr @@ -24,7 +24,7 @@ LLOAD 1 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr" ] @@ -60,7 +60,7 @@ LLOAD 2 ALOAD 6 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationErr b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationErr similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationErr rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationErr index 8a9140219..d50e27e52 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationErr +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationErr @@ -17,7 +17,7 @@ LLOAD 6 ALOAD 10 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationMultiReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationMultiReturn similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationMultiReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationMultiReturn index 130a0e1de..b96981078 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationMultiReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationMultiReturn @@ -21,7 +21,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn" ] @@ -45,7 +45,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn" ] @@ -70,7 +70,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationSampled similarity index 50% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationSampled index 723b8f8eb..aa64054de 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsDurationSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsDurationSampled @@ -1,7 +1,12 @@ LCONST_0 LSTORE 6 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 8 L2I @@ -9,7 +14,12 @@ ISTORE 10 ILOAD 10 IFEQ L1 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J +INVOKEDYNAMIC getEndTs(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] LLOAD 8 LSUB LSTORE 6 @@ -28,7 +38,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationSampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsNoSelf similarity index 71% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsNoSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsNoSelf index 4795488d9..14ae5775c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsNoSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsNoSelf @@ -7,7 +7,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsNoSelf$argsNoSelf(Ljava/lang/String;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturn similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturn index ae346e6f4..0d23a1e5d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturn @@ -10,7 +10,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturn$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnAugmented similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnAugmented rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnAugmented index d148e39b9..72d47ee93 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnAugmented +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnAugmented @@ -9,7 +9,7 @@ ALOAD 5 LLOAD 6 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[IJ)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnAugmented1 similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnAugmented1 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnAugmented1 index 4367a76dd..d2895e174 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnAugmented1 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnAugmented1 @@ -9,7 +9,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented1$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnBoxed b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnBoxed similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnBoxed rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnBoxed index fe0063998..18b4de273 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnBoxed +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnBoxed @@ -11,7 +11,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnBoxed$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnBoxed" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnSampled similarity index 60% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnSampled index 9fbd61aec..25f829056 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnSampled @@ -1,5 +1,10 @@ ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 ILOAD 6 IFEQ L1 @@ -17,7 +22,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnSampled$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnTypeMatch b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnTypeMatch similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnTypeMatch rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnTypeMatch index 1293b2a86..9953fc01a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnTypeMatch +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnTypeMatch @@ -10,7 +10,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnTypeMatch$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnTypeMatch" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnTypeNoMatch b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnTypeNoMatch similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnTypeNoMatch rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnTypeNoMatch diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnVoid b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnVoid similarity index 69% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnVoid rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnVoid index 431f4435d..c12f4f9c9 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsReturnVoid +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsReturnVoid @@ -6,7 +6,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnVoid$args(Ljava/lang/Object;Ljava/lang/Void;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnVoid" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampled similarity index 56% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampled index e6f191025..b3488ddbf 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampled @@ -1,5 +1,10 @@ ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 ILOAD 6 IFEQ L0 @@ -14,7 +19,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampledAdaptive new file mode 100644 index 000000000..c9e9f85c8 --- /dev/null +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampledAdaptive @@ -0,0 +1,45 @@ +ICONST_1 +INVOKEDYNAMIC hitAdaptive(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] +ISTORE 6 +ILOAD 6 +IFEQ L0 +L1 +FRAME APPEND [I] +INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I +IFNE L0 +ALOAD 0 +ALOAD 1 +LLOAD 2 +ALOAD 4 +ALOAD 5 +INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive" +] +FRAME SAME +ILOAD 6 +IFEQ L2 +ICONST_1 +INVOKEDYNAMIC updateEndTs(I)V [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] +L2 +FRAME SAME1 J +L3 +LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 +LOCALVARIABLE a Ljava/lang/String; L0 L3 1 +LOCALVARIABLE b J L0 L3 2 +LOCALVARIABLE c [Ljava/lang/String; L0 L3 4 +LOCALVARIABLE d [I L0 L3 5 +MAXSTACK = 6 +MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampledNoSampling b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampledNoSampling similarity index 61% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampledNoSampling rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampledNoSampling index a45b566ea..18b0ebf6b 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSampledNoSampling +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSampledNoSampling @@ -1,5 +1,10 @@ ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 ILOAD 6 IFEQ L0 @@ -14,7 +19,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsSampled(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling" ] @@ -28,7 +33,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsNoSampling(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsShared b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsShared similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsShared rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsShared index dc57120ad..454ffecdb 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsShared +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsShared @@ -7,7 +7,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsShared" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSigMatch b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSigMatch similarity index 67% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSigMatch rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSigMatch index e3bc08fb9..9ffe3fc24 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsSigMatch +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsSigMatch @@ -4,7 +4,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m3(Ljava/lang/Object;Ljava/util/ArrayList;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch" ] @@ -15,7 +15,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m1(Ljava/lang/Object;Ljava/util/List;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsUnsafe b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsUnsafe similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsUnsafe rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsUnsafe index dfdd8aaa4..7ecf491c8 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArgsUnsafe +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArgsUnsafe @@ -7,7 +7,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsUnsafe$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetAfter similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetAfter index 3a9edbea6..71c379ead 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetAfter @@ -11,7 +11,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfter$args(Ljava/lang/Object;I[II)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetAfterAny similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetAfterAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetAfterAny index dfc9bb7ec..b68a6356a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetAfterAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetAfterAny @@ -12,7 +12,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetBefore similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetBefore index 197a86e18..55f099c61 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetBefore @@ -7,7 +7,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBefore$args(Ljava/lang/Object;[II)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetBeforeAny similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetBeforeAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetBeforeAny index e4c365578..d4e574a96 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArrayGetBeforeAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArrayGetBeforeAny @@ -7,7 +7,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetAfter similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetAfter index 77d4f3367..fe2ecef22 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetAfter @@ -11,7 +11,7 @@ ILOAD 5 ILOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfter$args(Ljava/lang/Object;[III)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetAfterAny similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetAfterAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetAfterAny index 8178c71d0..d7003098d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetAfterAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetAfterAny @@ -12,7 +12,7 @@ ILOAD 4 INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetBefore similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetBefore index c3e6aa12a..947369cd2 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetBefore @@ -11,7 +11,7 @@ ILOAD 5 ILOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBefore$args(Ljava/lang/Object;[III)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetBeforeAny similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetBeforeAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetBeforeAny index 39099c0e8..2a6cb2cbb 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ArraySetBeforeAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ArraySetBeforeAny @@ -12,7 +12,7 @@ ILOAD 4 INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Catch b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Catch similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Catch rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/Catch index 410446ef9..e97b40a52 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Catch +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Catch @@ -5,7 +5,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Catch$args(Ljava/lang/Object;Ljava/io/IOException;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Catch" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/CheckcastAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/CheckcastAfter similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/CheckcastAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/CheckcastAfter index 7bbfbb2db..c91a33154 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/CheckcastAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/CheckcastAfter @@ -7,7 +7,7 @@ ALOAD 2 LDC "java.util.HashMap" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/CheckcastAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/CheckcastBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/CheckcastBefore similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/CheckcastBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/CheckcastBefore index 8e4d5ba87..c22b89088 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/CheckcastBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/CheckcastBefore @@ -7,7 +7,7 @@ LDC "java.util.HashMap" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/CheckcastBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ConstructorArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ConstructorArgs similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ConstructorArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ConstructorArgs index 731a88e15..e2fb19785 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ConstructorArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ConstructorArgs @@ -4,7 +4,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ConstructorArgs$args(Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ConstructorArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Error b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Error similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Error rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/Error index 23a33d209..9a951b626 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Error +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Error @@ -9,7 +9,7 @@ LDC "uncaught" ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Error$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Error" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ErrorCaught b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ErrorCaught similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ErrorCaught rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ErrorCaught index 303a7b8b6..13a1542e0 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ErrorCaught +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ErrorCaught @@ -14,7 +14,7 @@ LDC "caught" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorCaught$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ErrorCaught" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ErrorDuration b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ErrorDuration similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ErrorDuration rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/ErrorDuration index 768dff09c..cc7685a5a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/ErrorDuration +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/ErrorDuration @@ -18,7 +18,7 @@ LLOAD 1 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorDuration$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ErrorDuration" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetAfter similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetAfter index 570125a60..b53d82fcb 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetAfter @@ -10,7 +10,7 @@ LDC "field int resources.OnMethodTest#field" ILOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetAfterStatic similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetAfterStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetAfterStatic index 41146ffd3..b679419c2 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetAfterStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetAfterStatic @@ -8,7 +8,7 @@ LDC "static field long resources.OnMethodTest#sField" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetBefore similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetBefore index 2f595f34b..37cb5a824 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetBefore @@ -7,7 +7,7 @@ ALOAD 1 LDC "field" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetBeforeStatic similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetBeforeStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetBeforeStatic index 0718885a9..beeb3e9fa 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldGetBeforeStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldGetBeforeStatic @@ -5,7 +5,7 @@ ACONST_NULL LDC "sField" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetAfter similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetAfter index 9a1755b04..6d54f0483 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetAfter @@ -10,7 +10,7 @@ LDC "field" ILOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetAfterStatic similarity index 69% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetAfterStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetAfterStatic index 95080ef6c..68ffa27d2 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetAfterStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetAfterStatic @@ -8,7 +8,7 @@ LDC "sField" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetBefore similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetBefore index 7aaa8ec10..50437845e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetBefore @@ -10,7 +10,7 @@ LDC "field" ILOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetBeforeStatic similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetBeforeStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetBeforeStatic index cda34fd5d..40acc7f29 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/FieldSetBeforeStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/FieldSetBeforeStatic @@ -8,7 +8,7 @@ LDC "sField" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/InstanceofAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/InstanceofAfter similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/InstanceofAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/InstanceofAfter index a78e1e486..6095baa07 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/InstanceofAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/InstanceofAfter @@ -8,7 +8,7 @@ LDC "java.util.HashMap" ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/InstanceofAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/InstanceofBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/InstanceofBefore similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/InstanceofBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/InstanceofBefore index 59756da72..120f8f66b 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/InstanceofBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/InstanceofBefore @@ -8,7 +8,7 @@ LDC "java.util.HashMap" ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/InstanceofBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Line b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Line similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Line rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/Line index 965a3f2bd..9bb1f6579 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Line +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Line @@ -5,7 +5,7 @@ LDC "exception" LDC 84 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Line$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Line" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchAnnotated b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchAnnotated similarity index 62% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchAnnotated rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchAnnotated index 750f5556f..f1c35b797 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchAnnotated +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchAnnotated @@ -3,7 +3,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MatchAnnotated$args(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MatchAnnotated" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchAnnotatedRegex b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchAnnotatedRegex similarity index 63% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchAnnotatedRegex rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchAnnotatedRegex index 0648efffb..b3ede598d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchAnnotatedRegex +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchAnnotatedRegex @@ -3,7 +3,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MatchAnnotatedRegex$args(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MatchAnnotatedRegex" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchDerived b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchDerived similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchDerived rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchDerived index 47577c880..1d6c9a486 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MatchDerived +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MatchDerived @@ -5,7 +5,7 @@ ALOAD 1 ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MatchDerived$args(Lresources/AbstractClass;Ljava/lang/String;Ljava/util/Map;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MatchDerived" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCall b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCall similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCall rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCall index 868720f1e..bcaff03a7 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCall +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCall @@ -12,7 +12,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCall$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCall" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDuration b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDuration similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDuration rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDuration index 3887e14b1..092f3a51b 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDuration +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDuration @@ -18,7 +18,7 @@ ALOAD 10 LLOAD 8 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDuration" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDuration2 similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDuration2 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDuration2 index c5bf485ff..ab983528c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDuration2 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDuration2 @@ -28,7 +28,7 @@ ALOAD 18 LLOAD 16 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args0(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2" ] @@ -44,7 +44,7 @@ ALOAD 10 LLOAD 8 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args1(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDurationSampled similarity index 59% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDurationSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDurationSampled index 3418b9cd8..78f5ae5ca 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDurationSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDurationSampled @@ -1,7 +1,12 @@ LCONST_0 LSTORE 4 ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 6 L2I @@ -22,7 +27,7 @@ ALOAD 11 LLOAD 9 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampled$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDurationSampledMulti b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDurationSampledMulti similarity index 58% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDurationSampledMulti rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDurationSampledMulti index a1b26c114..468cb83a6 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallDurationSampledMulti +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallDurationSampledMulti @@ -1,7 +1,12 @@ LCONST_0 LSTORE 4 ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 6 L2I @@ -22,7 +27,7 @@ ALOAD 11 LLOAD 9 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti" ] @@ -31,7 +36,12 @@ FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String r LCONST_0 LSTORE 15 ICONST_3 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 17 L2I @@ -50,7 +60,7 @@ ALOAD 22 LLOAD 20 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallNoArgs similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallNoArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallNoArgs index 965e7ad40..9fea21631 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallNoArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallNoArgs @@ -2,7 +2,7 @@ INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I IFNE L1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallNoArgs$args()V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturn similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturn index 1548d9ccf..e96ccbbb7 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturn @@ -13,7 +13,7 @@ ALOAD 6 LLOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturn$args(JLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturnAugmented similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturnAugmented rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturnAugmented index d04449802..70ec92745 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturnAugmented +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturnAugmented @@ -12,7 +12,7 @@ LLOAD 4 LLOAD 8 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented$args(Ljava/lang/String;JJ)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturnAugmented1 similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturnAugmented1 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturnAugmented1 index 099c44d5a..2b7019c25 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallReturnAugmented1 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallReturnAugmented1 @@ -12,7 +12,7 @@ ALOAD 6 LLOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented1$args(JLjava/lang/String;J)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallSampled similarity index 64% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallSampled index 0bd2972ad..0b9a05d37 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallSampled @@ -1,5 +1,10 @@ ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 4 LSTORE 5 ASTORE 7 @@ -19,7 +24,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampled$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallSampledAdaptive similarity index 64% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallSampledAdaptive rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallSampledAdaptive index fd8c07e8f..3dc196590 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallSampledAdaptive +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallSampledAdaptive @@ -1,5 +1,10 @@ ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z +INVOKEDYNAMIC hitAdaptive(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 4 LSTORE 5 ASTORE 7 @@ -19,7 +24,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallStatic similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallStatic index 78caa7fcc..4095ba14c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/MethodCallStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/MethodCallStatic @@ -11,7 +11,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallStatic$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NativeWithReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NativeWithReturn similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NativeWithReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NativeWithReturn diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NativeWithoutReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NativeWithoutReturn similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NativeWithoutReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NativeWithoutReturn diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewAfter similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewAfter index be7b541da..6327d8bce 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewAfter @@ -6,7 +6,7 @@ ALOAD 1 LDC "java.util.HashMap" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewAfter$args(Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayIntAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayIntAfter similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayIntAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayIntAfter index 8837b7886..a38dc9f7e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayIntAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayIntAfter @@ -5,7 +5,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntAfter$args(Ljava/lang/Object;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayIntBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayIntBefore similarity index 73% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayIntBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayIntBefore index f5648222c..f4c6a6628 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayIntBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayIntBefore @@ -5,7 +5,7 @@ LDC "int" ICONST_1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore" ] @@ -20,7 +20,7 @@ LDC "int" ICONST_2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayStringAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayStringAfter similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayStringAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayStringAfter index f451872e7..9b14f9183 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayStringAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayStringAfter @@ -5,7 +5,7 @@ ALOAD 0 ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringAfter$args(Ljava/lang/Object;[Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayStringBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayStringBefore similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayStringBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayStringBefore index 38089a4dd..ee97e1c16 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewArrayStringBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewArrayStringBefore @@ -5,7 +5,7 @@ LDC "java.lang.String" ICONST_1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore" ] @@ -20,7 +20,7 @@ LDC "java.lang.String" ICONST_2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewBefore similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewBefore index 33f4b38d7..6a22d8c36 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NewBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NewBefore @@ -4,7 +4,7 @@ ALOAD 0 LDC "java.util.HashMap" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewBefore$args(Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgs similarity index 60% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgs index fac09920f..d9cd3f08e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgs @@ -3,7 +3,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgs$argsEmpty(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgsEntryReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgsEntryReturn similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgsEntryReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgsEntryReturn index ae232c85d..c6ae9857f 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgsEntryReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgsEntryReturn @@ -3,7 +3,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyEntry(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn" ] @@ -16,7 +16,7 @@ ALOAD 0 LLOAD 6 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyReturn(Ljava/lang/Object;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgsEntryReturnNoCapture b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgsEntryReturnNoCapture similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgsEntryReturnNoCapture rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgsEntryReturnNoCapture index 084b3ef21..675b07e8e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/NoArgsEntryReturnNoCapture +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/NoArgsEntryReturnNoCapture @@ -3,7 +3,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturnNoCapture$argsEmptyEntry(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture" ] @@ -13,7 +13,7 @@ IFNE L1 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturnNoCapture$argsEmptyReturn(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgs similarity index 65% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgs index b7aba0515..6c5510413 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgs @@ -6,7 +6,7 @@ ALOAD 3 ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgs$args(Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgsReturn similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgsReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgsReturn index dca0b5077..c791739ac 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgsReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgsReturn @@ -9,7 +9,7 @@ ALOAD 3 ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsReturn$args(Ljava/lang/String;JJ[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgsSelf similarity index 67% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgsSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgsSelf index d223feab2..1529a0949 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticArgsSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticArgsSelf @@ -7,7 +7,7 @@ ALOAD 3 ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsSelf$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticMethodCall b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticMethodCall similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticMethodCall rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticMethodCall index 386a1b320..5181cc968 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticMethodCall +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticMethodCall @@ -11,7 +11,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevelStatic" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCall$args(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticMethodCall" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticMethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticMethodCallStatic similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticMethodCallStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticMethodCallStatic index 55ecd5423..8cc7891cd 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticMethodCallStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticMethodCallStatic @@ -9,7 +9,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevelStatic" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCallStatic$args(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticNoArgs similarity index 60% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticNoArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticNoArgs index 7f5eec1d5..1dfeb85af 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticNoArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticNoArgs @@ -2,7 +2,7 @@ INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I IFNE L0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgs$argsEmpty()V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticNoArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticNoArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticNoArgsSelf similarity index 63% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticNoArgsSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticNoArgsSelf index 05b92ba93..304a10cad 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/StaticNoArgsSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/StaticNoArgsSelf @@ -3,7 +3,7 @@ IFNE L0 ACONST_NULL INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgsSelf$argsEmpty(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncEntry b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncEntry similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncEntry rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncEntry index 77d559a08..83f76569c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncEntry +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncEntry @@ -8,7 +8,7 @@ LDC "sync" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncEntry" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncExit b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncExit similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncExit rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncExit index 23b8d20ad..4e00a28c6 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncExit +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncExit @@ -10,7 +10,7 @@ LDC "resources.OnMethodTest" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncExit" ] @@ -27,7 +27,7 @@ LDC "resources.OnMethodTest" ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncExit" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncMEntry b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncMEntry similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncMEntry rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncMEntry index d14f44743..a907c8888 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncMEntry +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncMEntry @@ -8,7 +8,7 @@ LDC "syncM" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncMEntry" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncMExit b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncMExit similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncMExit rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncMExit index 30110e900..3d7ab60a1 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/SyncMExit +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/SyncMExit @@ -10,7 +10,7 @@ LDC "resources.OnMethodTest" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncMExit" ] @@ -27,7 +27,7 @@ LDC "resources.OnMethodTest" ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncMExit" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Throw b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Throw similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Throw rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/Throw index 22747e3b9..5a9648a41 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/Throw +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/Throw @@ -8,7 +8,7 @@ LDC "exception" ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Throw$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Throw" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/AnytypeArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/AnytypeArgs similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/AnytypeArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/AnytypeArgs index 06efd952f..887a2a444 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/AnytypeArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/AnytypeArgs @@ -25,7 +25,7 @@ ALOAD 5 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgs$args(Ljava/lang/Object;[Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AnytypeArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/AnytypeArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/AnytypeArgsNoSelf similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/AnytypeArgsNoSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/AnytypeArgsNoSelf index 0958df380..b44ece43f 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/AnytypeArgsNoSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/AnytypeArgsNoSelf @@ -24,7 +24,7 @@ ALOAD 5 AASTORE INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgsNoSelf$argsNoSelf([Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Args b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Args similarity index 71% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Args rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Args index 84d0d38c2..b785fd23a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Args +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Args @@ -10,7 +10,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Args$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Args" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Args2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Args2Sampled similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Args2Sampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Args2Sampled index 1da21b78f..e05adb927 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Args2Sampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Args2Sampled @@ -7,7 +7,12 @@ IFLE L0 L1 FRAME APPEND [I I] ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 FRAME SAME ILOAD 7 @@ -30,7 +35,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args2(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Args2Sampled" ] @@ -56,7 +61,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Args2Sampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration similarity index 85% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration index 46c00946d..e985cfcec 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration @@ -37,7 +37,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2 similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2 index 7019f8dbd..8fc57b46f 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2 @@ -37,7 +37,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2" ] @@ -59,7 +59,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2Err b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2Err similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2Err rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2Err index 5e76f6812..9e0b4533e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2Err +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2Err @@ -30,7 +30,7 @@ LLOAD 6 ALOAD 11 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args2(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err" ] @@ -55,7 +55,7 @@ LLOAD 6 ALOAD 12 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2Sampled similarity index 64% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2Sampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2Sampled index a0bfd52d1..c52d8e647 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDuration2Sampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDuration2Sampled @@ -14,7 +14,12 @@ FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J GOTO L2 FRAME SAME ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 8 L2I @@ -33,7 +38,12 @@ FRAME SAME1 J ILOAD 10 IFEQ L6 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J +INVOKEDYNAMIC getEndTs(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] LLOAD 8 LSUB LSTORE 6 @@ -55,7 +65,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled" ] @@ -89,7 +99,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationBoxed b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationBoxed similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationBoxed rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationBoxed diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationBoxedErr b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationBoxedErr similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationBoxedErr rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationBoxedErr diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationConstructor b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationConstructor similarity index 84% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationConstructor rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationConstructor index 0f850d06d..fea110d19 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationConstructor +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationConstructor @@ -33,7 +33,7 @@ LLOAD 2 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructor$args(Ljava/lang/Object;JLjava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationConstructorErr b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationConstructorErr similarity index 86% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationConstructorErr rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationConstructorErr index 3b99f03a0..5dbe55139 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationConstructorErr +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationConstructorErr @@ -36,7 +36,7 @@ LLOAD 1 ALOAD 6 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr" ] @@ -84,7 +84,7 @@ LLOAD 2 ALOAD 7 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationErr b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationErr similarity index 84% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationErr rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationErr index 6f1c1a9b7..b9f38f20e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationErr +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationErr @@ -29,7 +29,7 @@ LLOAD 6 ALOAD 11 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationMultiReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationMultiReturn similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationMultiReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationMultiReturn index e34f0eff7..af39fee7f 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationMultiReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationMultiReturn @@ -40,7 +40,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn" ] @@ -69,7 +69,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn" ] @@ -97,7 +97,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationSampled similarity index 58% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationSampled index 6a7dad12d..2fad6653a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsDurationSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsDurationSampled @@ -11,7 +11,12 @@ IFLE L0 L1 FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I I] [] ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 8 L2I @@ -24,7 +29,12 @@ FRAME SAME1 J ILOAD 10 IFEQ L4 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J +INVOKEDYNAMIC getEndTs(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] LLOAD 8 LSUB LSTORE 6 @@ -46,7 +56,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationSampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsNoSelf similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsNoSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsNoSelf index 2414fb112..5ca566b51 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsNoSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsNoSelf @@ -10,7 +10,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsNoSelf$argsNoSelf(Ljava/lang/String;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturn similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturn index bbf290e8d..5df754a77 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturn @@ -13,7 +13,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturn$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnAugmented similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnAugmented rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnAugmented index adb9ca046..e196b4497 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnAugmented +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnAugmented @@ -12,7 +12,7 @@ ALOAD 5 LLOAD 6 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[IJ)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnAugmented1 similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnAugmented1 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnAugmented1 index e12e3dcdf..c6124e998 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnAugmented1 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnAugmented1 @@ -12,7 +12,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented1$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnSampled similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnSampled index e86b83305..c1e6a768c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsReturnSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsReturnSampled @@ -7,7 +7,12 @@ IFLE L0 L1 FRAME APPEND [I I] ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 FRAME SAME ILOAD 7 @@ -33,7 +38,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnSampled$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampled similarity index 65% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampled index 84fb29eed..b0d4e875a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampled @@ -7,7 +7,12 @@ IFLE L0 L1 FRAME APPEND [I I] ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 FRAME SAME ILOAD 7 @@ -30,7 +35,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampledAdaptive similarity index 55% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampledAdaptive rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampledAdaptive index 81c79451a..89ff39d1d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampledAdaptive +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampledAdaptive @@ -7,7 +7,12 @@ IFLE L0 L1 FRAME APPEND [I I] ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z +INVOKEDYNAMIC hitAdaptive(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 FRAME SAME ILOAD 7 @@ -30,7 +35,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive" ] @@ -40,7 +45,12 @@ FRAME SAME ILOAD 6 IFEQ L5 ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.updateEndTs (I)V +INVOKEDYNAMIC updateEndTs(I)V [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] L5 FRAME SAME1 J L6 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampledNoSampling b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampledNoSampling similarity index 66% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampledNoSampling rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampledNoSampling index 090f9f019..694948620 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsSampledNoSampling +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsSampledNoSampling @@ -7,7 +7,12 @@ IFLE L0 L1 FRAME APPEND [I I] ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 6 FRAME SAME ILOAD 7 @@ -30,7 +35,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsSampled(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling" ] @@ -48,7 +53,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsNoSampling(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsShared b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsShared similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsShared rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsShared index 28b4592fe..c188ddddd 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsShared +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsShared @@ -10,7 +10,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsShared" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsUnsafe b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsUnsafe similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsUnsafe rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsUnsafe index 6dbff2de9..19df95b95 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArgsUnsafe +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArgsUnsafe @@ -10,7 +10,7 @@ ALOAD 4 ALOAD 5 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsUnsafe$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetAfter similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetAfter index 5b948aca4..3e8f38de5 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetAfter @@ -20,7 +20,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfter$args(Ljava/lang/Object;I[II)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetAfterAny similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetAfterAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetAfterAny index 6a97f89cc..5faef6cfb 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetAfterAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetAfterAny @@ -21,7 +21,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetBefore similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetBefore index 3b47885ab..73d48caa8 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetBefore @@ -10,7 +10,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBefore$args(Ljava/lang/Object;[II)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetBeforeAny similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetBeforeAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetBeforeAny index 35da26e91..ef4e5a278 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArrayGetBeforeAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArrayGetBeforeAny @@ -10,7 +10,7 @@ ALOAD 4 ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetAfter similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetAfter index 91d5c1181..da0ba5399 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetAfter @@ -21,7 +21,7 @@ ILOAD 5 ILOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfter$args(Ljava/lang/Object;[III)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetAfterAny similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetAfterAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetAfterAny index dc8bf293c..50c7f677d 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetAfterAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetAfterAny @@ -22,7 +22,7 @@ ILOAD 4 INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetBefore similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetBefore index 3e56259b1..ed9ab5bf6 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetBefore @@ -14,7 +14,7 @@ ILOAD 5 ILOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBefore$args(Ljava/lang/Object;[III)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetBeforeAny similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetBeforeAny rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetBeforeAny index de5e1e4bf..f9d0ebae2 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ArraySetBeforeAny +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ArraySetBeforeAny @@ -15,7 +15,7 @@ ILOAD 4 INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Catch b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Catch similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Catch rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Catch index d3f800737..39267b17f 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Catch +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Catch @@ -8,7 +8,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Catch$args(Ljava/lang/Object;Ljava/io/IOException;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Catch" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/CheckcastAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/CheckcastAfter similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/CheckcastAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/CheckcastAfter index 47a02d268..dbdc350d3 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/CheckcastAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/CheckcastAfter @@ -10,7 +10,7 @@ LDC "java.util.HashMap" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/CheckcastAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/CheckcastBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/CheckcastBefore similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/CheckcastBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/CheckcastBefore index 9ed616dcc..70c913313 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/CheckcastBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/CheckcastBefore @@ -10,7 +10,7 @@ LDC "java.util.HashMap" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/CheckcastBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ConstructorArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ConstructorArgs similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ConstructorArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ConstructorArgs index 8e8f8fa10..ed0acb305 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ConstructorArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ConstructorArgs @@ -7,7 +7,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ConstructorArgs$args(Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ConstructorArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Error b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Error similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Error rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Error index 9e87e2937..a1b962c15 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Error +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Error @@ -12,7 +12,7 @@ LDC "uncaught" ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Error$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Error" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ErrorCaught b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ErrorCaught similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ErrorCaught rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ErrorCaught index 3cbc3a68c..dfe44851c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ErrorCaught +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ErrorCaught @@ -17,7 +17,7 @@ LDC "caught" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorCaught$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ErrorCaught" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ErrorDuration b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ErrorDuration similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ErrorDuration rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ErrorDuration index 7857f659e..9f7b90463 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/ErrorDuration +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/ErrorDuration @@ -30,7 +30,7 @@ LLOAD 1 ALOAD 6 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorDuration$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/ErrorDuration" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetAfter similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetAfter index f4d34486f..b00750198 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetAfter @@ -20,7 +20,7 @@ LDC "field int resources.OnMethodTest#field" ILOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetAfterStatic similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetAfterStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetAfterStatic index 863bd60c6..542ef09ed 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetAfterStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetAfterStatic @@ -18,7 +18,7 @@ LDC "static field long resources.OnMethodTest#sField" LLOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetBefore similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetBefore index 4ac746b43..142adc971 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetBefore @@ -10,7 +10,7 @@ ALOAD 1 LDC "field" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetBeforeStatic similarity index 75% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetBeforeStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetBeforeStatic index 1aafe373a..5230a4764 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldGetBeforeStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldGetBeforeStatic @@ -8,7 +8,7 @@ ACONST_NULL LDC "sField" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetAfter similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetAfter index fe5365793..71690b74c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetAfter @@ -20,7 +20,7 @@ LDC "field" ILOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetAfterStatic similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetAfterStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetAfterStatic index 6b7884019..582d5cac3 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetAfterStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetAfterStatic @@ -18,7 +18,7 @@ LDC "sField" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetBefore similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetBefore index e6d8f0b64..dc872b300 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetBefore @@ -13,7 +13,7 @@ LDC "field" ILOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetBeforeStatic similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetBeforeStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetBeforeStatic index 444b49ea2..bdb57d67b 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/FieldSetBeforeStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/FieldSetBeforeStatic @@ -11,7 +11,7 @@ LDC "sField" LLOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/InstanceofAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/InstanceofAfter similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/InstanceofAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/InstanceofAfter index d69c3d63f..705633d02 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/InstanceofAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/InstanceofAfter @@ -11,7 +11,7 @@ LDC "java.util.HashMap" ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/InstanceofAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/InstanceofBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/InstanceofBefore similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/InstanceofBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/InstanceofBefore index 37639540f..c5306ad3f 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/InstanceofBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/InstanceofBefore @@ -11,7 +11,7 @@ LDC "java.util.HashMap" ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/InstanceofBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Line b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Line similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Line rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Line index 207a863cd..77bbb8208 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Line +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Line @@ -8,7 +8,7 @@ LDC "exception" LDC 84 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Line$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Line" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MatchDerived b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MatchDerived similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MatchDerived rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MatchDerived diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCall b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCall similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCall rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCall index 0d9eab5ec..437008842 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCall +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCall @@ -15,7 +15,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCall$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCall" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDuration b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDuration similarity index 86% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDuration rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDuration index e30e5c444..b423ab41c 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDuration +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDuration @@ -31,7 +31,7 @@ ALOAD 11 LLOAD 9 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDuration" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDuration2 similarity index 86% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDuration2 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDuration2 index 150ee9f5a..6af71cf8a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDuration2 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDuration2 @@ -51,7 +51,7 @@ ALOAD 20 LLOAD 18 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args0(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2" ] @@ -70,7 +70,7 @@ ALOAD 11 LLOAD 9 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args1(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDurationSampled similarity index 71% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDurationSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDurationSampled index 08a6155a4..d6368e431 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDurationSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDurationSampled @@ -11,7 +11,12 @@ IFLE L1 L2 FRAME FULL [resources/OnMethodTest java/lang/String J J J I I] [resources/OnMethodTest java/lang/String J] ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 6 L2I @@ -37,7 +42,7 @@ ALOAD 12 LLOAD 10 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampled$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDurationSampledMulti b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDurationSampledMulti similarity index 71% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDurationSampledMulti rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDurationSampledMulti index d53cbe629..c20859201 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallDurationSampledMulti +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallDurationSampledMulti @@ -11,7 +11,12 @@ IFLE L1 L2 FRAME FULL [resources/OnMethodTest java/lang/String J J J I I] [resources/OnMethodTest java/lang/String J] ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 6 L2I @@ -37,7 +42,7 @@ ALOAD 12 LLOAD 10 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti" ] @@ -56,7 +61,12 @@ IFLE L4 L5 FRAME FULL [resources/OnMethodTest java/lang/String J J J I I J java/lang/String resources/OnMethodTest T T J J I I] [J java/lang/String J] ICONST_3 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J +INVOKEDYNAMIC hitTimed(I)J [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] DUP2 LSTORE 18 L2I @@ -80,7 +90,7 @@ ALOAD 24 LLOAD 22 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args(JJLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallNoArgs similarity index 76% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallNoArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallNoArgs index 129199462..4d320ead1 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallNoArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallNoArgs @@ -5,7 +5,7 @@ INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I IFNE L1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallNoArgs$args()V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturn similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturn index 738ad5a66..81fa2e81e 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturn @@ -16,7 +16,7 @@ ALOAD 6 LLOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturn$args(JLjava/lang/String;J)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturnAugmented similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturnAugmented rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturnAugmented index b6d0d131a..f533fb170 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturnAugmented +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturnAugmented @@ -15,7 +15,7 @@ LLOAD 4 LLOAD 8 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented$args(Ljava/lang/String;JJ)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturnAugmented1 similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturnAugmented1 rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturnAugmented1 index 28a31eda1..abf7ed5cc 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallReturnAugmented1 +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallReturnAugmented1 @@ -15,7 +15,7 @@ ALOAD 6 LLOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented1$args(JLjava/lang/String;J)J [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallSampled b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallSampled similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallSampled rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallSampled index c315e7321..deac60c14 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallSampled +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallSampled @@ -7,7 +7,12 @@ IFLE L1 L2 FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z +INVOKEDYNAMIC hit(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 4 L1 FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] @@ -36,7 +41,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampled$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallSampled" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallSampledAdaptive similarity index 73% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallSampledAdaptive rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallSampledAdaptive index 2e94533b1..7a57b2921 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallSampledAdaptive +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallSampledAdaptive @@ -7,7 +7,12 @@ IFLE L1 L2 FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z +INVOKEDYNAMIC hitAdaptive(I)Z [ +// handle kind 0x6 : INVOKESTATIC +org/openjdk/btrace/indy/IndyDispatcher.runtimeBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +// arguments: +"org/openjdk/btrace/instr/MethodTracker" +] ISTORE 4 L1 FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] @@ -36,7 +41,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallStatic similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallStatic index 8bec540e0..2c63ac1e9 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/MethodCallStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/MethodCallStatic @@ -13,7 +13,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevel" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallStatic$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/MethodCallStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NativeWithReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NativeWithReturn similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NativeWithReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NativeWithReturn diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NativeWithoutReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NativeWithoutReturn similarity index 100% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NativeWithoutReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NativeWithoutReturn diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewAfter similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewAfter index 162069f9b..d05d47ff9 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewAfter @@ -9,7 +9,7 @@ ALOAD 1 LDC "java.util.HashMap" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewAfter$args(Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayIntAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayIntAfter similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayIntAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayIntAfter index ecd2b1c6a..b9ea70c7a 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayIntAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayIntAfter @@ -8,7 +8,7 @@ ALOAD 0 ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntAfter$args(Ljava/lang/Object;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayIntBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayIntBefore similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayIntBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayIntBefore index 86e5697b2..c95718af4 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayIntBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayIntBefore @@ -8,7 +8,7 @@ LDC "int" ICONST_1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore" ] @@ -26,7 +26,7 @@ LDC "int" ICONST_2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayStringAfter b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayStringAfter similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayStringAfter rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayStringAfter index 51e692b49..a84a17e9b 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayStringAfter +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayStringAfter @@ -8,7 +8,7 @@ ALOAD 0 ALOAD 3 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringAfter$args(Ljava/lang/Object;[Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayStringBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayStringBefore similarity index 77% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayStringBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayStringBefore index f715296c2..6b2e92881 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewArrayStringBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewArrayStringBefore @@ -8,7 +8,7 @@ LDC "java.lang.String" ICONST_1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore" ] @@ -26,7 +26,7 @@ LDC "java.lang.String" ICONST_2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewBefore b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewBefore similarity index 74% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewBefore rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewBefore index e125047ff..850775354 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NewBefore +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NewBefore @@ -7,7 +7,7 @@ ALOAD 0 LDC "java.util.HashMap" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NewBefore$args(Ljava/lang/Object;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NewBefore" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NoArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NoArgs similarity index 67% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NoArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NoArgs index 502de5e8b..43c4cb123 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NoArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NoArgs @@ -6,7 +6,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgs$argsEmpty(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NoArgsEntryReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NoArgsEntryReturn similarity index 73% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NoArgsEntryReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NoArgsEntryReturn index cc7cadaf6..eda02dc32 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/NoArgsEntryReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/NoArgsEntryReturn @@ -8,7 +8,7 @@ IFNE L0 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyEntry(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn" ] @@ -21,7 +21,7 @@ IFNE L1 ALOAD 0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyReturn(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgs similarity index 70% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgs index 8be30e8db..610ffdcd2 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgs @@ -9,7 +9,7 @@ ALOAD 3 ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgs$args(Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgsReturn similarity index 78% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgsReturn rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgsReturn index 064b3c3b7..ca59c8823 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgsReturn +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgsReturn @@ -12,7 +12,7 @@ ALOAD 3 ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsReturn$args(Ljava/lang/String;JJ[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgsSelf similarity index 72% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgsSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgsSelf index a357193ac..82a7a00ff 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticArgsSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticArgsSelf @@ -10,7 +10,7 @@ ALOAD 3 ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsSelf$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticMethodCall b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticMethodCall similarity index 83% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticMethodCall rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticMethodCall index 939482ecd..133112052 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticMethodCall +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticMethodCall @@ -14,7 +14,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevelStatic" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCall$args(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticMethodCall" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticMethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticMethodCallStatic similarity index 82% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticMethodCallStatic rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticMethodCallStatic index cf0a2bf02..2ad5b6082 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticMethodCallStatic +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticMethodCallStatic @@ -12,7 +12,7 @@ LDC "resources.OnMethodTest" LDC "callTopLevelStatic" INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCallStatic$args(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticNoArgs similarity index 67% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticNoArgs rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticNoArgs index 2835fbbc4..37f0a3567 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticNoArgs +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticNoArgs @@ -5,7 +5,7 @@ INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I IFNE L0 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgs$argsEmpty()V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticNoArgs" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticNoArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticNoArgsSelf similarity index 69% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticNoArgsSelf rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticNoArgsSelf index 1207c73d0..dd7820875 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/StaticNoArgsSelf +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/StaticNoArgsSelf @@ -6,7 +6,7 @@ IFNE L0 ACONST_NULL INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgsSelf$argsEmpty(Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncEntry b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncEntry similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncEntry rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncEntry index 98855c5f6..11530b9fe 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncEntry +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncEntry @@ -11,7 +11,7 @@ LDC "sync" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncEntry" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncExit b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncExit similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncExit rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncExit index 708f63535..af0d5bea1 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncExit +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncExit @@ -13,7 +13,7 @@ LDC "resources.OnMethodTest" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncExit" ] @@ -33,7 +33,7 @@ LDC "resources.OnMethodTest" ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncExit" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncMEntry b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncMEntry similarity index 80% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncMEntry rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncMEntry index a68749e13..d3680dcc0 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncMEntry +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncMEntry @@ -11,7 +11,7 @@ LDC "syncM" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncMEntry" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncMExit b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncMExit similarity index 79% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncMExit rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncMExit index fa12468a4..2361acb87 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/SyncMExit +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/SyncMExit @@ -13,7 +13,7 @@ LDC "resources.OnMethodTest" ALOAD 2 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncMExit" ] @@ -33,7 +33,7 @@ LDC "resources.OnMethodTest" ALOAD 4 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/SyncMExit" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Throw b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Throw similarity index 81% rename from btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Throw rename to btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Throw index 9ee724006..5e62ceab5 100644 --- a/btrace-instr/src/test/resources/instrumentorTestData/dynamic/onmethod/leveled/Throw +++ b/btrace-instr/src/test/resources/instrumentorTestData/onmethod/leveled/Throw @@ -11,7 +11,7 @@ LDC "exception" ALOAD 1 INVOKEDYNAMIC $btrace$org$openjdk$btrace$runtime$auxiliary$Throw$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V [ // handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/Indy.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; +org/openjdk/btrace/indy/IndyDispatcher.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;)Ljava/lang/invoke/CallSite; // arguments: "org/openjdk/btrace/runtime/auxiliary/Throw" ] diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/ExportTest b/btrace-instr/src/test/resources/instrumentorTestData/static/ExportTest deleted file mode 100644 index 22300e912..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/ExportTest +++ /dev/null @@ -1,43 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ExportTest$testArgs (Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ExportTest$testArgs(Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="resources.OnMethodTest", method="args") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ExportTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ACONST_NULL -LLOAD 1 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.push (Ljava/util/Deque;Ljava/lang/Object;)V -ALOAD 0 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ExportTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -SWAP -LDC "btrace.traces/ExportTest.name" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.putPerfString (Ljava/lang/String;Ljava/lang/String;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ExportTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ExportTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ExportTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/OnProbeTest b/btrace-instr/src/test/resources/instrumentorTestData/static/OnProbeTest deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/OnTimerTest b/btrace-instr/src/test/resources/instrumentorTestData/static/OnTimerTest deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/ServicesTest b/btrace-instr/src/test/resources/instrumentorTestData/static/ServicesTest deleted file mode 100644 index b884a2044..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/ServicesTest +++ /dev/null @@ -1,69 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "resources.OnMethodTest" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ServicesTest$testFieldInjection (Ljava/lang/String;)V -FRAME SAME -MAXSTACK = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ServicesTest$testFieldInjection(Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="resources.OnMethodTest", method="noargs$static") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ServicesTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -INVOKEDYNAMIC printer()Lorg/openjdk/btrace/utils/PrinterService; [ -// handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/ExtensionIndy.bootstrapFieldGet(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)Ljava/lang/invoke/CallSite; -// arguments: -"org.openjdk.btrace.utils.PrinterService", -"SIMPLE", -"", -0, -"UNSPECIFIED" -] -DUP -ASTORE 1 -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "svc-injection ok: " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKEINTERFACE org/openjdk/btrace/utils/PrinterService.println (Ljava/lang/String;)V (itf) -INVOKEDYNAMIC statsd()Lorg/openjdk/btrace/statsd/Statsd; [ -// handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/ExtensionIndy.bootstrapFieldGet(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)Ljava/lang/invoke/CallSite; -// arguments: -"org.openjdk.btrace.statsd.Statsd", -"SIMPLE", -"", -0, -"UNSPECIFIED" -] -DUP -ASTORE 2 -LDC "btrace.services.test" -LDC "source:onmethod" -INVOKEINTERFACE org/openjdk/btrace/statsd/Statsd.increment (Ljava/lang/String;Ljava/lang/String;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ServicesTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ServicesTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ServicesTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/TLSTest b/btrace-instr/src/test/resources/instrumentorTestData/static/TLSTest deleted file mode 100644 index cd56c3702..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/TLSTest +++ /dev/null @@ -1,44 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TLSTest$testArgs (Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$TLSTest$testArgs(Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="resources.OnMethodTest", method="args") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TLSTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TLSTest.entryTimes : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/util/Deque -LLOAD 1 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.push (Ljava/util/Deque;Ljava/lang/Object;)V -ALOAD 0 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TLSTest.name : Ljava/lang/ThreadLocal; -SWAP -INVOKEVIRTUAL java/lang/ThreadLocal.set (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TLSTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TLSTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TLSTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/TraceAllTest b/btrace-instr/src/test/resources/instrumentorTestData/static/TraceAllTest deleted file mode 100644 index 2bd75298c..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/TraceAllTest +++ /dev/null @@ -1,157 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LDC "public void resources.OnMethodTest#" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LDC "private void resources.OnMethodTest#(java.lang.String)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest java/lang/String] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#noargs" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -MAXSTACK = 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public static void resources.OnMethodTest#noargs$static" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -MAXSTACK = 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public long resources.OnMethodTest#args(java.lang.String, long, java.lang.String[], int[])" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public static long resources.OnMethodTest#args$static(java.lang.String, long, java.lang.String[], int[])" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public static long resources.OnMethodTest#callTopLevelStatic(java.lang.String, long)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public static long resources.OnMethodTest#callTargetStatic(java.lang.String, long)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public long resources.OnMethodTest#callTopLevel(java.lang.String, long)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "private long resources.OnMethodTest#callTarget(java.lang.String, long)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#exception" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#uncaught" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#array(int)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#field" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#newObject" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#newArray" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#casts" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -LDC "public void resources.OnMethodTest#sync" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public long resources.OnMethodTest#callTopLevel1(java.lang.String, long)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "private long resources.OnMethodTest#calLTargetX(java.lang.String, long)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public long resources.OnMethodTest#argsMultiReturn(java.lang.String, long, java.lang.String[], int[])" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#staticField" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -LDC "public void resources.OnMethodTest#syncM" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public java.lang.String resources.OnMethodTest#argsTypeMatch(java.util.ArrayList)" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.OnMethodTest#caught" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall (Ljava/lang/String;)V -FRAME SAME - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$TraceAllTest$doall(Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*/") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;(fqn=true) // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TraceAllTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TraceAllTest.hitCnt : Ljava/util/concurrent/atomic/AtomicLong; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.getAndIncrement (Ljava/util/concurrent/atomic/AtomicLong;)J -POP2 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TraceAllTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TraceAllTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TraceAllTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE106 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE106 deleted file mode 100644 index 0c642fd6a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE106 +++ /dev/null @@ -1,128 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -LDC "aMethod" -INVOKESTATIC resources/issues/BTRACE106.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o1 (Ljava/lang/Object;Ljava/lang/String;)V -FRAME SAME -LCONST_0 -LSTORE 1 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -L2 -FRAME APPEND [J J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "bMethod" -LLOAD 1 -INVOKESTATIC resources/issues/BTRACE106.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o3 (Ljava/lang/Object;Ljava/lang/String;J)V -L3 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LDC "bMethod" -LLOAD 1 -INVOKESTATIC resources/issues/BTRACE106.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o2 (Ljava/lang/Object;Ljava/lang/String;J)V -L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/issues/BTRACE106; L0 L5 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o1(Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="@/.*\\.Deprecated/", method="aMethod") -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ALOAD 1 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o2(Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="@/.*\\.Deprecated/", method="bMethod", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ALOAD 1 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE106$o3(Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="@/.*\\.Deprecated/", method="@/.*\\.Deprecated/", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ALOAD 1 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE106.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE189 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE189 deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE22 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE22 deleted file mode 100644 index 538a2d14a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE22 +++ /dev/null @@ -1,53 +0,0 @@ -LCONST_0 -LSTORE 1 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -DSTORE 5 -DLOAD 5 -DLOAD 5 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -L3 -FRAME FULL [resources/issues/BTRACE22 J J D] [D] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LLOAD 1 -INVOKESTATIC resources/issues/BTRACE22.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE22$tracker (Ljava/lang/Object;J)V -L4 -FRAME SAME1 D -L5 -LOCALVARIABLE this Lresources/issues/BTRACE22; L0 L5 0 -LOCALVARIABLE d D L1 L5 5 -MAXSTACK = 6 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE22$tracker(Ljava/lang/Object;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.BTRACE22/", method="testDouble", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE22.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE22.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE22.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE22.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE256 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE256 deleted file mode 100644 index 2fa0ac63f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE256 +++ /dev/null @@ -1,102 +0,0 @@ -LCONST_0 -LSTORE 1 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public void resources.issues.BTRACE256#doStuff" -INVOKESTATIC resources/issues/BTRACE256.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE256$entry (Ljava/lang/String;)V -FRAME APPEND [J J] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -L3 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -LDC "public void resources.issues.BTRACE256#doStuff" -LLOAD 1 -INVOKESTATIC resources/issues/BTRACE256.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE256$exit (Ljava/lang/String;J)V -L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/issues/BTRACE256; L0 L5 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE256$entry(Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.BTRACE256/", method="doStuff") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;(fqn=true) // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.swingProfiler : Lorg/openjdk/btrace/core/Profiler; -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Profiling.recordEntry (Lorg/openjdk/btrace/core/Profiler;Ljava/lang/String;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE256$exit(Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.BTRACE256/", method="doStuff", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;(fqn=true) // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.swingProfiler : Lorg/openjdk/btrace/core/Profiler; -ALOAD 0 -LLOAD 1 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Profiling.recordExit (Lorg/openjdk/btrace/core/Profiler;Ljava/lang/String;J)V -INVOKEDYNAMIC sd()Lorg/openjdk/btrace/statsd/Statsd; [ -// handle kind 0x6 : INVOKESTATIC -org/openjdk/btrace/runtime/ExtensionIndy.bootstrapFieldGet(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;)Ljava/lang/invoke/CallSite; -// arguments: -"org.openjdk.btrace.statsd.Statsd", -"SIMPLE", -"", -0, -"UNSPECIFIED" -] -DUP -ASTORE 3 -LDC "my.metric.b" -LDC "regular,distribution:gaussian" -INVOKEINTERFACE org/openjdk/btrace/statsd/Statsd.increment (Ljava/lang/String;Ljava/lang/String;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE256.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 4 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE28 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE28 deleted file mode 100644 index cfb7fe8cc..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE28 +++ /dev/null @@ -1,65 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LDC "resources.issues.BTRACE28" -LDC "" -INVOKESTATIC resources/issues/BTRACE28.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE28$tracker (Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME FULL [resources/issues/BTRACE28] [] -L2 -LOCALVARIABLE this Lresources/issues/BTRACE28; L0 L2 0 -MAXSTACK = 2 -ASTORE 5 -ASTORE 6 -ASTORE 7 -ALOAD 7 -FRAME FULL [resources/issues/BTRACE28 java/lang/String java/lang/String java/lang/String java/lang/String [B [B java/lang/StringBuilder] [java/lang/Throwable] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L11 -LDC "resources.issues.BTRACE28" -LDC "serveResource" -INVOKESTATIC resources/issues/BTRACE28.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE28$tracker (Ljava/lang/String;Ljava/lang/String;)V -L11 -FRAME SAME -L12 -LOCALVARIABLE this Lresources/issues/BTRACE28; L3 L12 0 -LOCALVARIABLE param1 Ljava/lang/String; L3 L12 1 -LOCALVARIABLE param2 Ljava/lang/String; L3 L12 2 -LOCALVARIABLE resourceType Ljava/lang/String; L4 L12 3 -LOCALVARIABLE contentType Ljava/lang/String; L5 L12 4 -LOCALVARIABLE mainArr [B L6 L12 5 -LOCALVARIABLE byteArr [B L7 L12 6 -LOCALVARIABLE sb Ljava/lang/StringBuilder; L0 L12 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE28$tracker(Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.BTRACE28/", method="/.*/", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE28.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -ALOAD 1 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE28.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE28.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE28.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE53 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE53 deleted file mode 100644 index d75505d5e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE53 +++ /dev/null @@ -1,52 +0,0 @@ -LCONST_0 -LSTORE 1 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -L2 -FRAME FULL [resources/DerivedClass J J] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -LLOAD 1 -INVOKESTATIC resources/DerivedClass.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE53$onInit (J)V -L3 -FRAME SAME -L4 -LOCALVARIABLE this Lresources/DerivedClass; L0 L4 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE53$onInit(J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.DerivedClass/", method="", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE53.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "init: " -LLOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (J)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.strcat (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE53.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE53.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE53.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE69 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE69 deleted file mode 100644 index bd752b46d..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE69 +++ /dev/null @@ -1,106 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -TRYCATCHBLOCK L4 L6 L6 java/lang/Throwable -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncEntry (Ljava/lang/Object;)V -FRAME APPEND [resources/OnMethodTest resources/OnMethodTest] -L7 -LINENUMBER 127 L7 -DUP -ASTORE 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L8 -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncExit (Ljava/lang/Object;)V -L8 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest] -GOTO L9 -FRAME FULL [resources/OnMethodTest java/lang/Object resources/OnMethodTest] [java/lang/Throwable] -ASTORE 4 -DUP -ASTORE 5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L10 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncExit (Ljava/lang/Object;)V -L10 -FRAME FULL [resources/OnMethodTest java/lang/Object resources/OnMethodTest T java/lang/Throwable java/lang/Object] [java/lang/Object] -ALOAD 4 -ATHROW -L9 -LINENUMBER 128 L9 -FRAME FULL [resources/OnMethodTest T resources/OnMethodTest resources/OnMethodTest] [] -RETURN -L5 -FRAME FULL [resources/OnMethodTest] [java/lang/Throwable] -FRAME SAME1 java/lang/Throwable -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncEntry(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="sync", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_ENTRY, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "after synchronized entry: " -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.identityStr (Ljava/lang/Object;)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Strings.strcat (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE69$onSyncExit(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="sync", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_EXIT)) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "before synchronized exit: " -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.identityStr (Ljava/lang/Object;)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Strings.strcat (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE69.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE87 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE87 deleted file mode 100644 index 07e968120..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE87 +++ /dev/null @@ -1,67 +0,0 @@ -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "containerMethod" -ICONST_0 -ANEWARRAY java/lang/Object -INVOKESTATIC resources/issues/BTRACE87.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE87$o (Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V -L2 -FRAME APPEND [java/util/ArrayList java/util/ArrayList] -ALOAD 2 -L3 -LINENUMBER 17 L3 -ASTORE 3 -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LDC "containerMethod" -ICONST_1 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 3 -AASTORE -INVOKESTATIC resources/issues/BTRACE87.$btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE87$o (Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V -L4 -FRAME APPEND [java/lang/String java/util/ArrayList] -ALOAD 4 -ALOAD 3 -L5 -LINENUMBER 18 L5 -RETURN -L6 -LOCALVARIABLE this Lresources/issues/BTRACE87; L0 L6 0 -LOCALVARIABLE a Ljava/util/List; L1 L6 1 -MAXSTACK = 6 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$BTRACE87$o(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.BTRACE87/", method="/.*/", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*/", method="/.*/")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE87.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ALOAD 2 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.printArray ([Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE87.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE87.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/BTRACE87.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE_333 b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/BTRACE_333 deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/InterestingVarsTest b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/InterestingVarsTest deleted file mode 100644 index 514aa85b4..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/InterestingVarsTest +++ /dev/null @@ -1,34 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -ALOAD 2 -INVOKESTATIC resources/InterestingVarsClass.$btrace$org$openjdk$btrace$runtime$auxiliary$InterestingVarsTest$entry (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -FRAME SAME - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$InterestingVarsTest$entry(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.InterestingVarsClass/", method="initAndStartApp") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InterestingVarsTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InterestingVarsTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InterestingVarsTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InterestingVarsTest.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/TezSplitter b/btrace-instr/src/test/resources/instrumentorTestData/static/issues/TezSplitter deleted file mode 100644 index 4ce2aac95..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/issues/TezSplitter +++ /dev/null @@ -1,474 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ICONST_4 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 1 -AASTORE -DUP -ICONST_1 -ALOAD 2 -AASTORE -DUP -ICONST_2 -ILOAD 3 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -AASTORE -DUP -ICONST_3 -ALOAD 4 -AASTORE -INVOKESTATIC org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.$btrace$org$openjdk$btrace$runtime$auxiliary$TezSplitter$getGroupedSplitsHook ([Ljava/lang/Object;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ICONST_5 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 1 -AASTORE -DUP -ICONST_1 -ALOAD 2 -AASTORE -DUP -ICONST_2 -ILOAD 3 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -AASTORE -DUP -ICONST_3 -ALOAD 4 -AASTORE -DUP -ICONST_4 -ALOAD 5 -AASTORE -INVOKESTATIC org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.$btrace$org$openjdk$btrace$runtime$auxiliary$TezSplitter$getGroupedSplitsHook ([Ljava/lang/Object;)V -FRAME SAME -LSTORE 23 -LSTORE 25 -LSTORE 27 -LLOAD 25 -LLOAD 27 -LLOAD 27 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map I T T T T T T T T J J J] [] -LLOAD 25 -LLOAD 27 -LLOAD 23 -LLOAD 25 -LLOAD 25 -LLOAD 23 -LLOAD 25 -LLOAD 23 -LLOAD 27 -LLOAD 27 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map I T T T T T T I T J J J] [] -LLOAD 23 -LLOAD 27 -ISTORE 23 -ASTORE 24 -ALOAD 24 -ISTORE 25 -ISTORE 26 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map [Lorg/apache/hadoop/mapred/InputSplit; T T T T T T T T I [Lorg/apache/hadoop/mapred/InputSplit; I I] [] -ILOAD 26 -ILOAD 25 -ALOAD 24 -ILOAD 26 -ASTORE 27 -ALOAD 27 -ASTORE 28 -ALOAD 28 -ALOAD 27 -ILOAD 23 -IINC 23 1 -ALOAD 28 -IINC 26 1 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map] [] -LSTORE 23 -ISTORE 25 -ILOAD 25 -ISTORE 26 -ISTORE 27 -ASTORE 28 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T T T J I I I java/util/Iterator] [] -ALOAD 28 -ALOAD 28 -ILOAD 26 -ASTORE 28 -ISTORE 29 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T [Lorg/apache/hadoop/mapred/InputSplit; I J I I I java/util/Set I] [] -ILOAD 29 -ILOAD 29 -ASTORE 30 -ALOAD 28 -ALOAD 30 -ASTORE 31 -ALOAD 30 -ASTORE 32 -ALOAD 32 -ALOAD 32 -ASTORE 32 -ALOAD 32 -ASTORE 33 -ALOAD 33 -ISTORE 34 -ISTORE 35 -ILOAD 35 -ILOAD 34 -ALOAD 33 -ILOAD 35 -ASTORE 36 -ALOAD 36 -ASTORE 36 -ALOAD 28 -ALOAD 36 -IINC 35 1 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T [Lorg/apache/hadoop/mapred/InputSplit; I J I I I java/util/Set I org/apache/hadoop/mapred/InputSplit org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder [Ljava/lang/String;] [] -ALOAD 28 -ASTORE 33 -ALOAD 33 -ALOAD 33 -ASTORE 34 -ALOAD 34 -ASTORE 35 -ALOAD 35 -ALOAD 31 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T [Lorg/apache/hadoop/mapred/InputSplit; I J I I I java/util/Set I] [] -IINC 29 1 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T T T J I I I java/util/Set] [] -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set] [] -LLOAD 23 -ILOAD 25 -ILOAD 26 -ILOAD 27 -ISTORE 29 -ILOAD 27 -ASTORE 30 -ASTORE 31 -ISTORE 32 -ISTORE 33 -ISTORE 34 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I] [] -ILOAD 29 -IINC 34 1 -ISTORE 35 -ASTORE 36 -ALOAD 36 -ALOAD 36 -ASTORE 37 -ALOAD 30 -ALOAD 31 -ALOAD 37 -ASTORE 38 -ALOAD 37 -ASTORE 39 -ALOAD 39 -ASTORE 40 -ALOAD 40 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I java/util/Iterator java/util/Map$Entry java/lang/String org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder] [] -ALOAD 39 -ISTORE 41 -LSTORE 42 -ISTORE 44 -ALOAD 30 -ALOAD 40 -LLOAD 42 -ALOAD 40 -LSTORE 42 -IINC 44 1 -ALOAD 39 -ALOAD 39 -ASTORE 40 -ALOAD 40 -LLOAD 42 -ALOAD 40 -LLOAD 23 -ILOAD 44 -ILOAD 27 -ALOAD 39 -ILOAD 32 -LLOAD 42 -LLOAD 23 -ILOAD 44 -ILOAD 27 -ALOAD 39 -ILOAD 41 -IINC 35 1 -ALOAD 38 -ASTORE 45 -ALOAD 38 -ASTORE 45 -ILOAD 33 -ALOAD 30 -ASTORE 46 -ALOAD 46 -ALOAD 46 -ASTORE 47 -ALOAD 47 -ASTORE 48 -ALOAD 48 -ALOAD 48 -ASTORE 49 -ALOAD 49 -ISTORE 50 -ISTORE 51 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I java/util/Iterator java/util/Map$Entry java/lang/String org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder I J I [Ljava/lang/String; java/util/Iterator org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder [Ljava/lang/String; [Ljava/lang/String; I I] [] -ILOAD 51 -ILOAD 50 -ALOAD 49 -ILOAD 51 -ASTORE 52 -ALOAD 52 -ALOAD 31 -ALOAD 52 -IINC 51 1 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I java/util/Iterator java/util/Map$Entry java/lang/String org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder I J I [Ljava/lang/String; java/util/Iterator] [] -ALOAD 31 -ALOAD 45 -ASTORE 45 -ALOAD 30 -ALOAD 45 -ILOAD 33 -ALOAD 38 -ALOAD 38 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I java/util/Iterator java/util/Map$Entry java/lang/String org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder I J I [Ljava/lang/String;] [L144 L144 I java/lang/String [Ljava/lang/String;] -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I java/util/Iterator java/util/Map$Entry java/lang/String org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder I J I [Ljava/lang/String;] [L144 L144 I java/lang/String [Ljava/lang/String; java/lang/String] -ASTORE 46 -ALOAD 30 -ASTORE 47 -ALOAD 47 -ALOAD 47 -ASTORE 48 -ALOAD 46 -ALOAD 48 -ALOAD 48 -ALOAD 38 -ALOAD 48 -IINC 29 1 -ALOAD 30 -ALOAD 46 -ALOAD 38 -ALOAD 46 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I] [] -ILOAD 33 -ILOAD 35 -ISTORE 33 -ILOAD 29 -ISTORE 36 -ILOAD 36 -ASTORE 37 -ASTORE 38 -ALOAD 38 -ALOAD 38 -ASTORE 39 -ALOAD 39 -ASTORE 40 -ALOAD 40 -ALOAD 40 -ASTORE 41 -ALOAD 41 -ALOAD 37 -ALOAD 41 -ALOAD 40 -ALOAD 37 -ILOAD 36 -ILOAD 36 -ALOAD 37 -ASTORE 38 -ASTORE 39 -ASTORE 40 -ALOAD 40 -ALOAD 40 -ASTORE 41 -ASTORE 42 -ALOAD 41 -ALOAD 41 -ASTORE 42 -ALOAD 38 -ALOAD 41 -ALOAD 42 -ALOAD 39 -ALOAD 42 -ALOAD 39 -ALOAD 42 -ILOAD 36 -ALOAD 39 -ASTORE 40 -ALOAD 37 -ISTORE 41 -ASTORE 42 -ALOAD 42 -ISTORE 43 -ISTORE 44 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I I java/util/Set java/util/Map java/util/Map java/util/HashSet I [Lorg/apache/hadoop/mapred/InputSplit; I I] [] -ILOAD 44 -ILOAD 43 -ALOAD 42 -ILOAD 44 -ASTORE 45 -ILOAD 41 -ALOAD 37 -ALOAD 45 -IINC 41 -1 -ALOAD 40 -ALOAD 45 -ASTORE 46 -ALOAD 45 -ASTORE 47 -ALOAD 47 -ALOAD 47 -ASTORE 47 -ALOAD 47 -ASTORE 48 -ALOAD 48 -ISTORE 49 -ISTORE 50 -ILOAD 50 -ILOAD 49 -ALOAD 48 -ILOAD 50 -ASTORE 51 -ALOAD 51 -ASTORE 51 -ALOAD 40 -ALOAD 38 -ALOAD 51 -IINC 50 1 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I I java/util/Set java/util/Map java/util/Map java/util/HashSet I [Lorg/apache/hadoop/mapred/InputSplit; I I org/apache/hadoop/mapred/InputSplit org/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder [Ljava/lang/String;] [] -ALOAD 40 -ASTORE 48 -ALOAD 48 -ALOAD 48 -ASTORE 49 -ALOAD 39 -ALOAD 49 -ALOAD 46 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I I java/util/Set java/util/Map java/util/Map java/util/HashSet I [Lorg/apache/hadoop/mapred/InputSplit; I I] [] -IINC 44 1 -ALOAD 37 -ALOAD 39 -FSTORE 42 -FLOAD 42 -LLOAD 23 -FLOAD 42 -LSTORE 53 -ILOAD 27 -FLOAD 42 -ISTORE 45 -LLOAD 55 -LLOAD 55 -LSTORE 23 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I I java/util/Set java/util/Map java/util/Map java/util/HashSet I F T T I T T T T T T T T T J] [] -ILOAD 45 -ILOAD 45 -ISTORE 27 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I I java/util/Set java/util/Map java/util/Map java/util/HashSet I F] [] -ILOAD 34 -ILOAD 29 -ILOAD 35 -LLOAD 23 -ILOAD 27 -FRAME FULL [org/apache/hadoop/mapred/split/TezMapredSplitsGrouper org/apache/hadoop/conf/Configuration [Lorg/apache/hadoop/mapred/InputSplit; I java/lang/String org/apache/hadoop/mapred/split/SplitSizeEstimator I java/lang/String java/lang/String [Ljava/lang/String; I J java/util/Map java/util/List T T T T T T I I J I I I java/util/Set I java/util/List java/util/Set I I I I] [] -ILOAD 32 -ILOAD 35 -ILOAD 25 -ISTORE 32 -ILOAD 34 -ILOAD 29 -ILOAD 35 -ILOAD 34 -ILOAD 29 -ILOAD 35 -ASTORE 35 -ALOAD 35 -ILOAD 29 -ALOAD 35 -LOCALVARIABLE lengthPerGroup J L42 L34 23 -LOCALVARIABLE maxLengthPerGroup J L43 L34 25 -LOCALVARIABLE minLengthPerGroup J L44 L34 27 -LOCALVARIABLE newSplit Lorg/apache/hadoop/mapred/split/TezGroupedSplit; L68 L70 28 -LOCALVARIABLE split Lorg/apache/hadoop/mapred/InputSplit; L66 L70 27 -LOCALVARIABLE i I L63 L60 23 -LOCALVARIABLE location Ljava/lang/String; L91 L94 36 -LOCALVARIABLE holder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder; L98 L99 35 -LOCALVARIABLE location Ljava/lang/String; L97 L99 34 -LOCALVARIABLE splitHolder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder; L85 L96 31 -LOCALVARIABLE locations [Ljava/lang/String; L86 L96 32 -LOCALVARIABLE split Lorg/apache/hadoop/mapred/InputSplit; L83 L96 30 -LOCALVARIABLE loc Ljava/lang/String; L153 L154 52 -LOCALVARIABLE locations [Ljava/lang/String; L149 L150 48 -LOCALVARIABLE splitH Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder; L148 L150 47 -LOCALVARIABLE groupedSplitHolder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder; L162 L168 48 -LOCALVARIABLE location Ljava/lang/String; L120 L173 38 -LOCALVARIABLE holder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder; L121 L173 39 -LOCALVARIABLE splitHolder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder; L122 L173 40 -LOCALVARIABLE oldHeadIndex I L125 L173 41 -LOCALVARIABLE groupLength J L126 L173 42 -LOCALVARIABLE groupNumSplits I L127 L173 44 -LOCALVARIABLE groupLocation [Ljava/lang/String; L141 L173 45 -LOCALVARIABLE groupedSplit Lorg/apache/hadoop/mapred/split/TezGroupedSplit; L159 L173 46 -LOCALVARIABLE entry Ljava/util/Map$Entry; L117 L173 37 -LOCALVARIABLE splitHolder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder; L185 L186 41 -LOCALVARIABLE locHolder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$LocationHolder; L182 L183 40 -LOCALVARIABLE entry Ljava/util/Map$Entry; L181 L183 39 -LOCALVARIABLE rack Ljava/lang/String; L198 L202 42 -LOCALVARIABLE location Ljava/lang/String; L197 L202 41 -LOCALVARIABLE location Ljava/lang/String; L223 L226 51 -LOCALVARIABLE rack Ljava/lang/String; L228 L229 49 -LOCALVARIABLE splitHolder Lorg/apache/hadoop/mapred/split/TezMapredSplitsGrouper$SplitHolder; L217 L214 46 -LOCALVARIABLE locations [Ljava/lang/String; L218 L214 47 -LOCALVARIABLE split Lorg/apache/hadoop/mapred/InputSplit; L209 L214 45 -LOCALVARIABLE newLengthPerGroup J L235 L233 43 -LOCALVARIABLE newNumSplitsInGroup I L236 L233 45 -LOCALVARIABLE numRemainingSplits I L177 L174 36 -LOCALVARIABLE remainingSplits Ljava/util/Set; L178 L174 37 -LOCALVARIABLE locToRackMap Ljava/util/Map; L193 L174 38 -LOCALVARIABLE rackLocations Ljava/util/Map; L194 L174 39 -LOCALVARIABLE rackSet Ljava/util/HashSet; L205 L174 40 -LOCALVARIABLE numRackSplitsToGroup I L206 L174 41 -LOCALVARIABLE rackSplitReduction F L232 L174 42 -LOCALVARIABLE numFullGroupsCreated I L114 L248 35 -LOCALVARIABLE lengthPerGroup J L72 L257 23 -LOCALVARIABLE numNodeLocations I L73 L257 25 -LOCALVARIABLE numSplitsPerLocation I L74 L257 26 -LOCALVARIABLE numSplitsInGroup I L75 L257 27 -LOCALVARIABLE locSet Ljava/util/Set; L80 L257 28 -LOCALVARIABLE splitsProcessed I L105 L257 29 -LOCALVARIABLE group Ljava/util/List; L106 L257 30 -LOCALVARIABLE groupLocationSet Ljava/util/Set; L107 L257 31 -LOCALVARIABLE allowSmallGroups Z L108 L257 32 -LOCALVARIABLE doingRackLocal Z L109 L257 33 -LOCALVARIABLE iterations I L110 L257 34 -LOCALVARIABLE groupedSplits [Lorg/apache/hadoop/mapred/InputSplit; L252 L257 35 -MAXLOCALS = 57 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$TezSplitter$getGroupedSplitsHook([Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="org.apache.hadoop.mapred.split.TezMapredSplitsGrouper", method="getGroupedSplits") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TezSplitter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "here" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TezSplitter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TezSplitter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/TezSplitter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AllLines b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AllLines deleted file mode 100644 index 084fdde2b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AllLines +++ /dev/null @@ -1,690 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "" -LDC 41 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -FRAME FULL [resources/OnMethodTest] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -LDC "" -LDC 42 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME SAME -ALOAD 0 -L3 -LINENUMBER 43 L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LDC "" -LDC 43 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "" -LDC 45 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -FRAME FULL [resources/OnMethodTest java/lang/String] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -LDC "" -LDC 46 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME SAME -ALOAD 0 -L3 -LINENUMBER 47 L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LDC "" -LDC 47 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a Ljava/lang/String; L0 L5 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "noargs" -LDC 50 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ACONST_NULL -LDC "noargs$static" -LDC 53 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "args" -LDC 57 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ACONST_NULL -LDC "args$static" -LDC 61 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE a Ljava/lang/String; L0 L2 0 -LOCALVARIABLE b J L0 L2 1 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 3 -LOCALVARIABLE d [I L0 L2 4 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ACONST_NULL -LDC "callTopLevelStatic" -LDC 65 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LINENUMBER 66 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ACONST_NULL -LDC "callTopLevelStatic" -LDC 66 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME APPEND [resources/OnMethodTest] -L4 -LOCALVARIABLE a Ljava/lang/String; L0 L4 0 -LOCALVARIABLE b J L0 L4 1 -LOCALVARIABLE instance Lresources/OnMethodTest; L2 L4 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ACONST_NULL -LDC "callTargetStatic" -LDC 70 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE a Ljava/lang/String; L0 L2 0 -LOCALVARIABLE b J L0 L2 1 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LDC "callTopLevel" -LDC 74 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -ALOAD 0 -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "callTarget" -LDC 78 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "exception" -LDC 83 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "exception" -LDC 84 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME SAME1 java/lang/Throwable -L4 -LINENUMBER 85 L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "exception" -LDC 85 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME APPEND [java/lang/Throwable] -L6 -LINENUMBER 87 L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "exception" -LDC 87 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L7 -FRAME SAME -L8 -LOCALVARIABLE e Ljava/io/IOException; L4 L6 1 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L8 0 -MAXSTACK = 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "uncaught" -LDC 90 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "array" -LDC 94 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LINENUMBER 96 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "array" -LDC 96 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME APPEND [[I] -L4 -LINENUMBER 97 L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "array" -LDC 97 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME APPEND [I] -L6 -LINENUMBER 98 L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "array" -LDC 98 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L7 -FRAME SAME -L8 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L8 0 -LOCALVARIABLE a I L0 L8 1 -LOCALVARIABLE arr [I L2 L8 2 -LOCALVARIABLE b I L4 L8 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LDC "field" -LDC 101 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -ALOAD 0 -L2 -LINENUMBER 102 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "field" -LDC 102 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME SAME -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "newObject" -LDC 105 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LINENUMBER 106 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "newObject" -LDC 106 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME APPEND [java/util/HashMap] -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -LOCALVARIABLE m Ljava/util/Map; L2 L4 1 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "newArray" -LDC 109 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LINENUMBER 110 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "newArray" -LDC 110 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME APPEND [[I] -L4 -LINENUMBER 111 L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "newArray" -LDC 111 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME APPEND [[[I] -L6 -LINENUMBER 112 L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "newArray" -LDC 112 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L7 -FRAME APPEND [[Ljava/lang/String;] -L8 -LINENUMBER 113 L8 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "newArray" -LDC 113 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L9 -FRAME APPEND [[[Ljava/lang/String;] -L10 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L10 0 -LOCALVARIABLE a [I L2 L10 1 -LOCALVARIABLE b [[I L4 L10 2 -LOCALVARIABLE c [Ljava/lang/String; L6 L10 3 -LOCALVARIABLE d [[Ljava/lang/String; L8 L10 4 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "casts" -LDC 116 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LINENUMBER 117 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "casts" -LDC 117 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME APPEND [java/util/HashMap] -L4 -LINENUMBER 119 L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "casts" -LDC 119 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME APPEND [java/util/HashMap] -IFEQ L6 -L7 -LINENUMBER 120 L7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L8 -ALOAD 0 -LDC "casts" -LDC 120 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L8 -FRAME SAME -L6 -LINENUMBER 122 L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "casts" -LDC 122 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L9 -FRAME SAME -L10 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L10 0 -LOCALVARIABLE c Ljava/util/Map; L2 L10 1 -LOCALVARIABLE d Ljava/util/HashMap; L4 L10 2 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -LDC "sync" -LDC 125 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME SAME -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LDC "sync" -LDC 126 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L6 -FRAME APPEND [resources/OnMethodTest] -L7 -LINENUMBER 127 L7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L8 -ALOAD 0 -LDC "sync" -LDC 127 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L8 -FRAME SAME -GOTO L9 -L9 -LINENUMBER 128 L9 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L10 -ALOAD 0 -LDC "sync" -LDC 128 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L10 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest] [] -L11 -LOCALVARIABLE this Lresources/OnMethodTest; L4 L11 0 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LDC "callTopLevel1" -LDC 131 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -ALOAD 0 -L2 -LINENUMBER 132 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "callTopLevel1" -LDC 132 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME APPEND [J] -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -LOCALVARIABLE a Ljava/lang/String; L0 L4 1 -LOCALVARIABLE b J L0 L4 2 -LOCALVARIABLE i J L2 L4 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "calLTargetX" -LDC 136 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "argsMultiReturn" -LDC 140 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -IFLE L2 -L3 -LINENUMBER 141 L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LDC "argsMultiReturn" -LDC 141 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L4 -FRAME SAME -L2 -LINENUMBER 144 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "argsMultiReturn" -LDC 144 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -IFLE L6 -L7 -LINENUMBER 145 L7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L8 -ALOAD 0 -LDC "argsMultiReturn" -LDC 145 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L8 -FRAME SAME -L6 -LINENUMBER 149 L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "argsMultiReturn" -LDC 149 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L9 -L10 -LINENUMBER 150 L10 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L11 -ALOAD 0 -LDC "argsMultiReturn" -LDC 150 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L11 -FRAME SAME -L12 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L12 0 -LOCALVARIABLE a Ljava/lang/String; L0 L12 1 -LOCALVARIABLE b J L0 L12 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L12 4 -LOCALVARIABLE d [I L0 L12 5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "staticField" -LDC 161 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LINENUMBER 162 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "staticField" -LDC 162 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME SAME -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -LDC "syncM" -LDC 165 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME SAME -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LDC "syncM" -LDC 166 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L6 -FRAME APPEND [java/lang/Object] -L7 -LINENUMBER 167 L7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L8 -ALOAD 0 -LDC "syncM" -LDC 167 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L8 -FRAME SAME -GOTO L9 -FRAME SAME1 java/lang/Throwable -L9 -LINENUMBER 168 L9 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L10 -ALOAD 0 -LDC "syncM" -LDC 168 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L10 -FRAME SAME -L11 -LOCALVARIABLE this Lresources/OnMethodTest; L4 L11 0 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "argsTypeMatch" -LDC 173 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE l Ljava/util/ArrayList; L0 L2 1 -MAXSTACK = 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "caught" -LDC 178 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "caught" -LDC 179 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME SAME1 java/lang/Throwable -L4 -LINENUMBER 180 L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "caught" -LDC 180 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME APPEND [java/lang/Throwable] -L6 -LINENUMBER 182 L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "caught" -LDC 182 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args (Ljava/lang/Object;Ljava/lang/String;I)V -L7 -FRAME SAME -RETURN -L8 -LOCALVARIABLE e Ljava/lang/RuntimeException; L4 L6 1 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L8 0 -MAXSTACK = 4 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$AllLines$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.LINE, line=-1)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AllLines.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AllLines.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AllLines.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AllLines.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AnytypeArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AnytypeArgs deleted file mode 100644 index f2681759e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AnytypeArgs +++ /dev/null @@ -1,54 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ICONST_4 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 1 -AASTORE -DUP -ICONST_1 -LLOAD 2 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -AASTORE -DUP -ICONST_2 -ALOAD 4 -AASTORE -DUP -ICONST_3 -ALOAD 5 -AASTORE -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgs$args (Ljava/lang/Object;[Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgs$args(Ljava/lang/Object;[Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AnytypeArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AnytypeArgsNoSelf deleted file mode 100644 index 45aa957be..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/AnytypeArgsNoSelf +++ /dev/null @@ -1,51 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ICONST_4 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 1 -AASTORE -DUP -ICONST_1 -LLOAD 2 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -AASTORE -DUP -ICONST_2 -ALOAD 4 -AASTORE -DUP -ICONST_3 -ALOAD 5 -AASTORE -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgsNoSelf$argsNoSelf ([Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgsNoSelf$argsNoSelf([Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args no self" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Args b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Args deleted file mode 100644 index 5221e6120..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Args +++ /dev/null @@ -1,79 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Args$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Args$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (I)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -ICONST_1 -IADD -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.cntr : Ljava/lang/ThreadLocal; -SWAP -INVOKEVIRTUAL java/lang/ThreadLocal.set (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/Args.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (J)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/Args.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X2 -POP -LDC "btrace.traces/onmethod/Args.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.putPerfLong (JLjava/lang/String;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 4 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Args2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Args2Sampled deleted file mode 100644 index 51ce415a4..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Args2Sampled +++ /dev/null @@ -1,99 +0,0 @@ -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -ILOAD 6 -IFEQ L0 -L1 -FRAME APPEND [I] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args2 (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -ILOAD 6 -IFEQ L2 -L3 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L2 -LINENUMBER 57 L2 -FRAME SAME -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L2 L4 0 -LOCALVARIABLE a Ljava/lang/String; L2 L4 1 -LOCALVARIABLE b J L2 L4 2 -LOCALVARIABLE c [Ljava/lang/String; L2 L4 4 -LOCALVARIABLE d [I L2 L4 5 -MAXSTACK = 6 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args2(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration deleted file mode 100644 index e2224ae4f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration +++ /dev/null @@ -1,63 +0,0 @@ -LCONST_0 -LSTORE 6 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -DUP2 -LSTORE 10 -ALOAD 0 -LLOAD 10 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L2 -FRAME SAME1 J -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L3 4 -LOCALVARIABLE d [I L0 L3 5 -MAXSTACK = 12 -MAXLOCALS = 12 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2 deleted file mode 100644 index c63460e5b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2 +++ /dev/null @@ -1,108 +0,0 @@ -LCONST_0 -LSTORE 6 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -DUP2 -LSTORE 10 -ALOAD 0 -LLOAD 10 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args2 (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L2 -FRAME SAME1 J -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -DUP2 -LSTORE 12 -ALOAD 0 -LLOAD 12 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J T T] [J] -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -LOCALVARIABLE a Ljava/lang/String; L0 L4 1 -LOCALVARIABLE b J L0 L4 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L4 4 -LOCALVARIABLE d [I L0 L4 5 -MAXSTACK = 12 -MAXLOCALS = 14 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2Err b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2Err deleted file mode 100644 index 5d1a01c71..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2Err +++ /dev/null @@ -1,103 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -TRYCATCHBLOCK L0 L2 L2 java/lang/Throwable -LCONST_0 -LSTORE 6 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -DUP -ASTORE 10 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LLOAD 6 -ALOAD 10 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args2 (Ljava/lang/Object;JLjava/lang/Throwable;)V -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J java/lang/Throwable] [java/lang/Throwable] -ATHROW -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -DUP -ASTORE 11 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LLOAD 6 -ALOAD 11 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L4 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J T java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 5 -MAXLOCALS = 12 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args2(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2Sampled deleted file mode 100644 index d8044b131..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDuration2Sampled +++ /dev/null @@ -1,121 +0,0 @@ -LCONST_0 -LSTORE 6 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 8 -L2I -ISTORE 10 -ILOAD 10 -IFEQ L1 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J -LLOAD 8 -LSUB -LSTORE 6 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 11 -ALOAD 0 -LLOAD 11 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args2 (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -ILOAD 10 -IFEQ L3 -L4 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I T T] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -DUP2 -LSTORE 13 -ALOAD 0 -LLOAD 13 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L3 -FRAME SAME1 J -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a Ljava/lang/String; L0 L5 1 -LOCALVARIABLE b J L0 L5 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L5 4 -LOCALVARIABLE d [I L0 L5 5 -MAXSTACK = 12 -MAXLOCALS = 15 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationBoxed b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationBoxed deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationBoxedErr b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationBoxedErr deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationConstructor b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationConstructor deleted file mode 100644 index 5a1a13a76..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationConstructor +++ /dev/null @@ -1,53 +0,0 @@ -LCONST_0 -LSTORE 2 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 4 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 4 -LSUB -LSTORE 2 -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J J] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LLOAD 2 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructor$args (Ljava/lang/Object;JLjava/lang/String;)V -L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a Ljava/lang/String; L0 L5 1 -MAXSTACK = 4 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructor$args(Ljava/lang/Object;JLjava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationConstructorErr b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationConstructorErr deleted file mode 100644 index f9a10ee4f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationConstructorErr +++ /dev/null @@ -1,94 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -L2 -LINENUMBER 41 L2 -LCONST_0 -LSTORE 1 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -L0 -LINENUMBER 42 L0 -L3 -LINENUMBER 43 L3 -L1 -FRAME FULL [resources/OnMethodTest J J] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -DUP -ASTORE 5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LLOAD 1 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L4 -FRAME FULL [resources/OnMethodTest J J java/lang/Throwable] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L2 L1 0 -MAXSTACK = 5 -MAXLOCALS = 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -L2 -LINENUMBER 45 L2 -LCONST_0 -LSTORE 2 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 4 -L0 -LINENUMBER 46 L0 -L3 -LINENUMBER 47 L3 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 4 -LSUB -LSTORE 2 -DUP -ASTORE 6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LLOAD 2 -ALOAD 6 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L4 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/Throwable] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L2 L1 0 -LOCALVARIABLE a Ljava/lang/String; L2 L1 1 -MAXSTACK = 5 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationErr b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationErr deleted file mode 100644 index 3e15014ee..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationErr +++ /dev/null @@ -1,54 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -LCONST_0 -LSTORE 6 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -DUP -ASTORE 10 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LLOAD 6 -ALOAD 10 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationErr$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 5 -MAXLOCALS = 11 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationMultiReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationMultiReturn deleted file mode 100644 index ff08044ba..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationMultiReturn +++ /dev/null @@ -1,102 +0,0 @@ -LCONST_0 -LSTORE 6 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -DUP2 -LSTORE 10 -ALOAD 0 -LLOAD 10 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME1 J -IFLE L5 -L6 -LINENUMBER 145 L6 -L7 -FRAME SAME1 J -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L8 -DUP2 -LSTORE 12 -ALOAD 0 -LLOAD 12 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L8 -FRAME SAME1 J -L5 -LINENUMBER 149 L5 -L9 -LINENUMBER 150 L9 -L10 -FRAME SAME1 J -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L11 -DUP2 -LSTORE 14 -ALOAD 0 -LLOAD 14 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L11 -FRAME SAME1 J -L12 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L12 0 -LOCALVARIABLE a Ljava/lang/String; L0 L12 1 -LOCALVARIABLE b J L0 L12 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L12 4 -LOCALVARIABLE d [I L0 L12 5 -MAXSTACK = 12 -MAXLOCALS = 16 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="argsMultiReturn", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationSampled deleted file mode 100644 index 5c7fdc21f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsDurationSampled +++ /dev/null @@ -1,71 +0,0 @@ -LCONST_0 -LSTORE 6 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 8 -L2I -ISTORE 10 -ILOAD 10 -IFEQ L1 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J -LLOAD 8 -LSUB -LSTORE 6 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 11 -ALOAD 0 -LLOAD 11 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationSampled$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L3 4 -LOCALVARIABLE d [I L0 L3 5 -MAXSTACK = 12 -MAXLOCALS = 13 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationSampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const, mean=20) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsNoSelf deleted file mode 100644 index 1e6d2a4b7..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsNoSelf +++ /dev/null @@ -1,39 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public long resources.OnMethodTest#args(java.lang.String, long, java.lang.String[], int[])" -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsNoSelf$argsNoSelf (Ljava/lang/String;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsNoSelf$argsNoSelf(Ljava/lang/String;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;(fqn=true) // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args no self" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturn deleted file mode 100644 index baa4c15af..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturn +++ /dev/null @@ -1,51 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 6 -ALOAD 0 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturn$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 10 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturn$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnAugmented deleted file mode 100644 index 9e3b4dbaf..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnAugmented +++ /dev/null @@ -1,52 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 6 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -LLOAD 6 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[IJ)J -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 8 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[IJ)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 6 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LCONST_1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnAugmented1 deleted file mode 100644 index bca6a763a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnAugmented1 +++ /dev/null @@ -1,55 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 6 -ALOAD 0 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented1$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)J -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 8 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented1$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 1 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LLOAD 1 -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnBoxed b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnBoxed deleted file mode 100644 index 74b7d9e46..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnBoxed +++ /dev/null @@ -1,61 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 6 -ALOAD 0 -LLOAD 6 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnBoxed$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 9 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnBoxed$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnBoxed.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "args " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -LDC "value" -ALOAD 0 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Reflective.getLong (Ljava/lang/String;Ljava/lang/Object;)J -INVOKEVIRTUAL java/lang/StringBuilder.append (J)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnBoxed.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnBoxed.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnBoxed.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnSampled deleted file mode 100644 index 06497494e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnSampled +++ /dev/null @@ -1,59 +0,0 @@ -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -ILOAD 6 -IFEQ L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I I] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 7 -ALOAD 0 -LLOAD 7 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnSampled$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L3 4 -LOCALVARIABLE d [I L0 L3 5 -MAXSTACK = 10 -MAXLOCALS = 9 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnSampled$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnTypeMatch b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnTypeMatch deleted file mode 100644 index 12c3eb40f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnTypeMatch +++ /dev/null @@ -1,51 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 6 -ALOAD 0 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnTypeMatch$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 10 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnTypeMatch$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", type="long (java.lang.String, long, java.lang.String[], int[])", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnTypeMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnTypeMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnTypeMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnTypeMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnTypeNoMatch b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnTypeNoMatch deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnVoid b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnVoid deleted file mode 100644 index f54c54a24..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsReturnVoid +++ /dev/null @@ -1,43 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ACONST_NULL -ASTORE 1 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnVoid$args (Ljava/lang/Object;Ljava/lang/Void;)V -L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -MAXSTACK = 2 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnVoid$args(Ljava/lang/Object;Ljava/lang/Void;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="noargs", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnVoid.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnVoid.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnVoid.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnVoid.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampled deleted file mode 100644 index 0084e69e8..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampled +++ /dev/null @@ -1,63 +0,0 @@ -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -ILOAD 6 -IFEQ L0 -L1 -FRAME APPEND [I] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampled$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 6 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampledAdaptive deleted file mode 100644 index f75c77f80..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampledAdaptive +++ /dev/null @@ -1,69 +0,0 @@ -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z -ISTORE 6 -ILOAD 6 -IFEQ L0 -L1 -FRAME APPEND [I] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -ILOAD 6 -IFEQ L2 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.updateEndTs (I)V -L2 -FRAME SAME1 J -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L3 4 -LOCALVARIABLE d [I L0 L3 5 -MAXSTACK = 6 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Adaptive) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampledNoSampling b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampledNoSampling deleted file mode 100644 index bbab08a2f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSampledNoSampling +++ /dev/null @@ -1,112 +0,0 @@ -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -ILOAD 6 -IFEQ L0 -L1 -FRAME APPEND [I] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsSampled (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsNoSampling (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L2 -LINENUMBER 57 L2 -FRAME SAME -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L2 L3 0 -LOCALVARIABLE a Ljava/lang/String; L2 L3 1 -LOCALVARIABLE b J L2 L3 2 -LOCALVARIABLE c [Ljava/lang/String; L2 L3 4 -LOCALVARIABLE d [I L2 L3 5 -MAXSTACK = 6 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsNoSampling(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsSampled(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsShared b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsShared deleted file mode 100644 index d13c5899d..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsShared +++ /dev/null @@ -1,93 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (I)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -ICONST_1 -IADD -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.cntr : Ljava/lang/ThreadLocal; -SWAP -INVOKEVIRTUAL java/lang/ThreadLocal.set (Ljava/lang/Object;)V -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$dumpExported ()V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$dumpExported()V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/ArgsShared.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (J)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$incExported ()V -RETURN -MAXSTACK = 2 -MAXLOCALS = 0 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$incExported()V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/ArgsShared.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X2 -POP -LDC "btrace.traces/onmethod/ArgsShared.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.putPerfLong (JLjava/lang/String;)V (itf) -RETURN -MAXSTACK = 4 -MAXLOCALS = 0 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSigMatch b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSigMatch deleted file mode 100644 index 79dfb9d91..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsSigMatch +++ /dev/null @@ -1,80 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m3 (Ljava/lang/Object;Ljava/util/ArrayList;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m1 (Ljava/lang/Object;Ljava/util/List;)V -L1 -LINENUMBER 173 L1 -FRAME SAME -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L1 L2 0 -LOCALVARIABLE l Ljava/util/ArrayList; L1 L2 1 -MAXSTACK = 2 - -// access flags 0xA -// signature (Ljava/lang/Object;Ljava/util/List;)V -// declaration: void $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m1(java.lang.Object, java.util.List) -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m1(Ljava/lang/Object;Ljava/util/List;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="argsTypeMatch") -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "m1" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 - -// access flags 0xA -// signature (Ljava/lang/Object;Ljava/util/ArrayList;)V -// declaration: void $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m3(java.lang.Object, java.util.ArrayList) -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSigMatch$m3(Ljava/lang/Object;Ljava/util/ArrayList;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="argsTypeMatch", exactTypeMatch=true) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "m3" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSigMatch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsUnsafe b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsUnsafe deleted file mode 100644 index 39eb6d9e1..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArgsUnsafe +++ /dev/null @@ -1,65 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsUnsafe$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsUnsafe$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable -TRYCATCHBLOCK L0 L3 L3 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Sys$VM.systemLoadAverage ()D -DSTORE 6 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Sys$VM.processCPUTime ()J -LSTORE 8 -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -DLOAD 6 -INVOKEVIRTUAL java/lang/StringBuilder.append (D)Ljava/lang/StringBuilder; -LDC " # " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -LLOAD 8 -INVOKEVIRTUAL java/lang/StringBuilder.append (J)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -L1 -GOTO L4 -L2 -FRAME SAME1 java/lang/Throwable -ASTORE 6 -LDC "FAILED" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -ALOAD 6 -INVOKEVIRTUAL java/lang/Throwable.getMessage ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -L4 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L3 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetAfter deleted file mode 100644 index 191a9e434..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetAfter +++ /dev/null @@ -1,56 +0,0 @@ -DUP2 -ISTORE 3 -ASTORE 4 -DUP -ISTORE 5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ILOAD 5 -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfter$args (Ljava/lang/Object;I[II)V -FRAME FULL [resources/OnMethodTest I [I I [I I] [I] -ISTORE 6 -L3 -LINENUMBER 97 L3 -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L3 L5 6 -MAXSTACK = 5 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfter$args(Ljava/lang/Object;I[II)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetAfterAny deleted file mode 100644 index c9323a561..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetAfterAny +++ /dev/null @@ -1,57 +0,0 @@ -DUP2 -ISTORE 3 -ASTORE 4 -DUP -ISTORE 5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ILOAD 5 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfterAny$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V -FRAME FULL [resources/OnMethodTest I [I I [I I] [I] -ISTORE 6 -L3 -LINENUMBER 97 L3 -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L3 L5 6 -MAXSTACK = 5 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetBefore deleted file mode 100644 index 9e9963a3e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetBefore +++ /dev/null @@ -1,52 +0,0 @@ -DUP2 -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBefore$args (Ljava/lang/Object;[II)V -FRAME FULL [resources/OnMethodTest I [I I [I] [[I I] -IALOAD -ISTORE 5 -L3 -LINENUMBER 97 L3 -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L3 L5 5 -MAXSTACK = 5 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBefore$args(Ljava/lang/Object;[II)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetBeforeAny deleted file mode 100644 index 0c34832a2..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArrayGetBeforeAny +++ /dev/null @@ -1,52 +0,0 @@ -DUP2 -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBeforeAny$args (Ljava/lang/Object;Ljava/lang/Object;I)V -FRAME FULL [resources/OnMethodTest I [I I [I] [[I I] -IALOAD -ISTORE 5 -L3 -LINENUMBER 97 L3 -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L3 L5 5 -MAXSTACK = 5 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetAfter deleted file mode 100644 index 71c223cac..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetAfter +++ /dev/null @@ -1,45 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfter$args (Ljava/lang/Object;[III)V -FRAME FULL [resources/OnMethodTest I [I I I I [I] [] -MAXSTACK = 4 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfter$args(Ljava/lang/Object;[III)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetAfterAny deleted file mode 100644 index 86c4c2128..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetAfterAny +++ /dev/null @@ -1,46 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfterAny$args (Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -FRAME FULL [resources/OnMethodTest I [I I I I [I] [] -MAXSTACK = 4 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetBefore deleted file mode 100644 index 454cfcaa2..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetBefore +++ /dev/null @@ -1,53 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBefore$args (Ljava/lang/Object;[III)V -L3 -FRAME FULL [resources/OnMethodTest I [I I I I [I] [[I I I] -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L2 L5 3 -MAXSTACK = 7 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBefore$args(Ljava/lang/Object;[III)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetBeforeAny deleted file mode 100644 index aa946ade5..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ArraySetBeforeAny +++ /dev/null @@ -1,54 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBeforeAny$args (Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -L3 -FRAME FULL [resources/OnMethodTest I [I I I I [I] [[I I I] -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L2 L5 3 -MAXSTACK = 7 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Catch b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Catch deleted file mode 100644 index 6b7d49d44..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Catch +++ /dev/null @@ -1,47 +0,0 @@ -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Catch$args (Ljava/lang/Object;Ljava/io/IOException;)V -FRAME FULL [resources/OnMethodTest java/io/IOException] [java/io/IOException] -ASTORE 2 -L3 -LINENUMBER 85 L3 -ALOAD 2 -L4 -LINENUMBER 87 L4 -L5 -LOCALVARIABLE e Ljava/io/IOException; L3 L4 2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Catch$args(Ljava/lang/Object;Ljava/io/IOException;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="exception", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CATCH)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/CheckcastAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/CheckcastAfter deleted file mode 100644 index d900825cf..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/CheckcastAfter +++ /dev/null @@ -1,55 +0,0 @@ -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "casts" -ALOAD 2 -LDC "java.util.HashMap" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastAfter$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap] [java/util/HashMap] -ASTORE 3 -L3 -LINENUMBER 119 L3 -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map java/util/HashMap java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L3 L6 3 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CHECKCAST, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/CheckcastBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/CheckcastBefore deleted file mode 100644 index 60d001752..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/CheckcastBefore +++ /dev/null @@ -1,56 +0,0 @@ -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "resources.OnMethodTest" -LDC "java.util.HashMap" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastBefore$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap] [java/util/HashMap] -CHECKCAST java/util/HashMap -ASTORE 3 -L3 -LINENUMBER 119 L3 -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map java/util/HashMap java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L3 L6 3 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CHECKCAST)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ConstructorArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ConstructorArgs deleted file mode 100644 index d28d897e0..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ConstructorArgs +++ /dev/null @@ -1,35 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ConstructorArgs$args (Ljava/lang/Object;Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest java/lang/String] [] - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ConstructorArgs$args(Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="") -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "constructor args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Error b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Error deleted file mode 100644 index 4e5cae513..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Error +++ /dev/null @@ -1,46 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -FRAME SAME1 java/lang/Throwable -DUP -ASTORE 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "uncaught" -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Error$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -L2 -FRAME FULL [resources/OnMethodTest java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 4 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Error$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="uncaught", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ErrorCaught b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ErrorCaught deleted file mode 100644 index c8bcc1e62..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ErrorCaught +++ /dev/null @@ -1,52 +0,0 @@ -TRYCATCHBLOCK L0 L2 L2 java/lang/Throwable -L3 -LINENUMBER 180 L3 -L4 -LINENUMBER 182 L4 -RETURN -L2 -FRAME SAME1 java/lang/Throwable -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "caught" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ErrorCaught$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -L5 -FRAME FULL [resources/OnMethodTest T java/lang/Throwable] [java/lang/Throwable] -ATHROW -LOCALVARIABLE e Ljava/lang/RuntimeException; L3 L4 1 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -MAXSTACK = 4 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorCaught$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="caught", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ErrorDuration b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ErrorDuration deleted file mode 100644 index b839c30ba..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/ErrorDuration +++ /dev/null @@ -1,56 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -LCONST_0 -LSTORE 1 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -FRAME FULL [resources/OnMethodTest J J] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -DUP -ASTORE 5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "uncaught" -LLOAD 1 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ErrorDuration$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Throwable;)V -L2 -FRAME FULL [resources/OnMethodTest J J java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 6 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorDuration$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="uncaught", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetAfter deleted file mode 100644 index af01f6b3f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetAfter +++ /dev/null @@ -1,51 +0,0 @@ -DUP -ASTORE 1 -DUP -ISTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -LDC "field int resources.OnMethodTest#field" -ILOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfter$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest I] [resources/OnMethodTest I] -L2 -LINENUMBER 102 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 6 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/^resources.OnMethodTest$/", field="/^field$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 2 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetAfterStatic deleted file mode 100644 index ed96d1deb..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetAfterStatic +++ /dev/null @@ -1,49 +0,0 @@ -DUP2 -LSTORE 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ACONST_NULL -LDC "static field long resources.OnMethodTest#sField" -LLOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfterStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest J] [J] -L2 -LINENUMBER 162 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 7 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/^resources.OnMethodTest$/", field="/^sField$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 2 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetBefore deleted file mode 100644 index 6a8633b7c..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetBefore +++ /dev/null @@ -1,47 +0,0 @@ -DUP -ASTORE 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -LDC "field" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBefore$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -L1 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest resources/OnMethodTest] -L2 -LINENUMBER 102 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 5 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/.*\\.OnMethodTest/", field="/^field$/")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetBeforeStatic deleted file mode 100644 index 7a3da4bf2..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldGetBeforeStatic +++ /dev/null @@ -1,43 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ACONST_NULL -LDC "sField" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBeforeStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -L1 -FRAME SAME -L2 -LINENUMBER 162 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/.*\\.OnMethodTest/", field="/^sField$/")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetAfter deleted file mode 100644 index 3beb621bb..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetAfter +++ /dev/null @@ -1,45 +0,0 @@ -ISTORE 1 -DUP -ASTORE 2 -ILOAD 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 2 -LDC "field" -ILOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfter$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -FRAME APPEND [I resources/OnMethodTest] -MAXSTACK = 4 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="resources.OnMethodTest", field="/^field$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetAfterStatic deleted file mode 100644 index 4cb2468a5..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetAfterStatic +++ /dev/null @@ -1,43 +0,0 @@ -LSTORE 1 -LLOAD 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ACONST_NULL -LDC "sField" -LLOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfterStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -FRAME APPEND [J] -MAXSTACK = 5 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="resources.OnMethodTest", field="/^sField$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetBefore deleted file mode 100644 index d21ef460a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetBefore +++ /dev/null @@ -1,50 +0,0 @@ -ISTORE 1 -DUP -ASTORE 2 -ILOAD 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 2 -LDC "field" -ILOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBefore$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME FULL [resources/OnMethodTest I resources/OnMethodTest] [resources/OnMethodTest I] -L2 -LINENUMBER 102 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 6 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="/.*\\.OnMethodTest/", field="/^field$/")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetBeforeStatic deleted file mode 100644 index 6b37a9c3a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/FieldSetBeforeStatic +++ /dev/null @@ -1,48 +0,0 @@ -LSTORE 1 -LLOAD 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ACONST_NULL -LDC "sField" -LLOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBeforeStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest J] [J] -L2 -LINENUMBER 162 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 7 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="/.*\\.OnMethodTest/", field="/^sField$/")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/InstanceofAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/InstanceofAfter deleted file mode 100644 index 128354128..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/InstanceofAfter +++ /dev/null @@ -1,54 +0,0 @@ -DUP -ASTORE 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "casts" -LDC "java.util.HashMap" -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofAfter$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -L3 -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap java/util/HashMap] [I] -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map java/util/HashMap java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L2 L6 2 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.INSTANCEOF, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/InstanceofBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/InstanceofBefore deleted file mode 100644 index bbb0a8589..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/InstanceofBefore +++ /dev/null @@ -1,54 +0,0 @@ -DUP -ASTORE 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "resources.OnMethodTest" -LDC "java.util.HashMap" -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofBefore$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -L3 -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap java/util/HashMap] [java/util/HashMap] -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map java/util/HashMap java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L2 L6 2 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.INSTANCEOF)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Line b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Line deleted file mode 100644 index e4b9fda81..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Line +++ /dev/null @@ -1,46 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "exception" -LDC 84 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Line$args (Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME SAME1 java/lang/Throwable -L3 -LINENUMBER 85 L3 -L4 -LINENUMBER 87 L4 -L5 -LOCALVARIABLE e Ljava/io/IOException; L3 L4 1 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -MAXSTACK = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Line$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.LINE, line=84)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchAnnotated b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchAnnotated deleted file mode 100644 index 76e720c85..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchAnnotated +++ /dev/null @@ -1,35 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MatchAnnotated$args (Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MatchAnnotated$args(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="@org.openjdk.btrace.core.annotations.BTrace", method="@org.openjdk.btrace.core.annotations.Level") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotated.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotated.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotated.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotated.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchAnnotatedRegex b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchAnnotatedRegex deleted file mode 100644 index d993f6720..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchAnnotatedRegex +++ /dev/null @@ -1,35 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MatchAnnotatedRegex$args (Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MatchAnnotatedRegex$args(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="@/.*\\.BTrace/", method="@/org\\.openjdk\\.btrace\\.core\\.annotations\\..*/") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotatedRegex.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotatedRegex.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotatedRegex.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchAnnotatedRegex.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchDerived b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchDerived deleted file mode 100644 index 37d7a3093..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MatchDerived +++ /dev/null @@ -1,37 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -ALOAD 2 -INVOKESTATIC resources/DerivedClass.$btrace$org$openjdk$btrace$runtime$auxiliary$MatchDerived$args (Lresources/AbstractClass;Ljava/lang/String;Ljava/util/Map;)V -FRAME SAME -MAXSTACK = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MatchDerived$args(Lresources/AbstractClass;Ljava/lang/String;Ljava/util/Map;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="+resources.AbstractClass", method="/do(Get|Set)/") -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchDerived.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchDerived.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchDerived.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MatchDerived.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCall b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCall deleted file mode 100644 index e33dfd009..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCall +++ /dev/null @@ -1,57 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 6 -LLOAD 4 -ALOAD 7 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCall$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME APPEND [J java/lang/String resources/OnMethodTest] -ALOAD 7 -ALOAD 6 -LLOAD 4 -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 8 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCall$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDuration b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDuration deleted file mode 100644 index 55fc9ed4e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDuration +++ /dev/null @@ -1,57 +0,0 @@ -LCONST_0 -LSTORE 4 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 6 -LSTORE 8 -ASTORE 10 -ASTORE 11 -ALOAD 11 -ALOAD 10 -LLOAD 8 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 12 -LLOAD 12 -LCONST_0 -ALOAD 10 -LLOAD 8 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration$args (JJLjava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 9 -MAXLOCALS = 14 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration$args(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDuration2 deleted file mode 100644 index 452fae5c6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDuration2 +++ /dev/null @@ -1,108 +0,0 @@ -LCONST_0 -LSTORE 4 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 6 -LSTORE 8 -ASTORE 10 -ASTORE 11 -ALOAD 11 -ALOAD 10 -LLOAD 8 -LCONST_0 -LSTORE 12 -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 14 -LSTORE 16 -ASTORE 18 -ASTORE 19 -ALOAD 19 -ALOAD 18 -LLOAD 16 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 20 -LLOAD 20 -LCONST_0 -ALOAD 18 -LLOAD 16 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args0 (JJLjava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J J java/lang/String resources/OnMethodTest J J J java/lang/String resources/OnMethodTest] [J] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -DUP2 -LSTORE 22 -LLOAD 22 -LCONST_0 -ALOAD 10 -LLOAD 8 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args1 (JJLjava/lang/String;J)V -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J J J java/lang/String resources/OnMethodTest J J J java/lang/String resources/OnMethodTest T T] [J] -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -MAXSTACK = 9 -MAXLOCALS = 24 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args0(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args1(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDurationSampled deleted file mode 100644 index 32d6a98ca..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDurationSampled +++ /dev/null @@ -1,62 +0,0 @@ -LCONST_0 -LSTORE 4 -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 6 -L2I -ISTORE 8 -LSTORE 9 -ASTORE 11 -ASTORE 12 -ALOAD 12 -ALOAD 11 -LLOAD 9 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 13 -LLOAD 13 -LCONST_0 -ALOAD 11 -LLOAD 9 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampled$args (JJLjava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 9 -MAXLOCALS = 15 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampled$args(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDurationSampledMulti b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDurationSampledMulti deleted file mode 100644 index e226fbf1e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallDurationSampledMulti +++ /dev/null @@ -1,90 +0,0 @@ -LCONST_0 -LSTORE 4 -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 6 -L2I -ISTORE 8 -LSTORE 9 -ASTORE 11 -ASTORE 12 -ALOAD 12 -ALOAD 11 -LLOAD 9 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 13 -LLOAD 13 -LCONST_0 -ALOAD 11 -LLOAD 9 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args (JJLjava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest] [J] -LCONST_0 -LSTORE 15 -ICONST_3 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 17 -L2I -ISTORE 19 -LSTORE 20 -ASTORE 22 -ALOAD 22 -LLOAD 20 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -DUP2 -LSTORE 23 -LLOAD 23 -LCONST_0 -ALOAD 22 -LLOAD 20 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args (JJLjava/lang/String;J)V -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest T T J J I J java/lang/String] [J J] -LSTORE 25 -L3 -LINENUMBER 132 L3 -LLOAD 25 -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -LOCALVARIABLE a Ljava/lang/String; L0 L4 1 -LOCALVARIABLE b J L0 L4 2 -LOCALVARIABLE i J L3 L4 25 -MAXSTACK = 11 -MAXLOCALS = 27 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel1", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="/callTarget.*/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallNoArgs deleted file mode 100644 index 630134eee..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallNoArgs +++ /dev/null @@ -1,36 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallNoArgs$args ()V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J] [resources/OnMethodTest java/lang/String J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallNoArgs$args()V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget")) -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 0 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturn deleted file mode 100644 index 95f1c524b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturn +++ /dev/null @@ -1,51 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -ALOAD 7 -ALOAD 6 -LLOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 8 -LLOAD 8 -ALOAD 6 -LLOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturn$args (JLjava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 7 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturn$args(JLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturnAugmented deleted file mode 100644 index 3ee98efb6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturnAugmented +++ /dev/null @@ -1,52 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -ALOAD 7 -ALOAD 6 -LLOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 8 -ALOAD 6 -LLOAD 4 -LLOAD 8 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented$args (Ljava/lang/String;JJ)J -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented$args(Ljava/lang/String;JJ)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 3 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LCONST_1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturnAugmented1 deleted file mode 100644 index 409d11b77..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallReturnAugmented1 +++ /dev/null @@ -1,54 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -ALOAD 7 -ALOAD 6 -LLOAD 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 8 -LLOAD 8 -ALOAD 6 -LLOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented1$args (JLjava/lang/String;J)J -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented1$args(JLjava/lang/String;J)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 0 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LLOAD 0 -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 0 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallSampled deleted file mode 100644 index a6847b58e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallSampled +++ /dev/null @@ -1,65 +0,0 @@ -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 4 -LSTORE 5 -ASTORE 7 -ASTORE 8 -ILOAD 4 -IFEQ L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J I J java/lang/String resources/OnMethodTest] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 7 -LLOAD 5 -ALOAD 8 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampled$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME SAME -ALOAD 8 -ALOAD 7 -LLOAD 5 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -MAXSTACK = 8 -MAXLOCALS = 9 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampled$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallSampledAdaptive deleted file mode 100644 index ae741742c..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallSampledAdaptive +++ /dev/null @@ -1,65 +0,0 @@ -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z -ISTORE 4 -LSTORE 5 -ASTORE 7 -ASTORE 8 -ILOAD 4 -IFEQ L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J I J java/lang/String resources/OnMethodTest] [] -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 7 -LLOAD 5 -ALOAD 8 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampledAdaptive$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME SAME -ALOAD 8 -ALOAD 7 -LLOAD 5 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE a Ljava/lang/String; L0 L3 1 -LOCALVARIABLE b J L0 L3 2 -MAXSTACK = 8 -MAXLOCALS = 9 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Adaptive) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallStatic deleted file mode 100644 index cf99a0884..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/MethodCallStatic +++ /dev/null @@ -1,55 +0,0 @@ -LSTORE 4 -ASTORE 6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 6 -LLOAD 4 -ACONST_NULL -LDC "static long resources.OnMethodTest#callTargetStatic(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallStatic$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String] [J] -ALOAD 6 -LLOAD 4 -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 10 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallStatic$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTargetStatic")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NativeWithReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NativeWithReturn deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NativeWithoutReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NativeWithoutReturn deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewAfter deleted file mode 100644 index 83046c89a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewAfter +++ /dev/null @@ -1,46 +0,0 @@ -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -LDC "java.util.HashMap" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewAfter$args (Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest java/util/HashMap] [java/util/HashMap] -ASTORE 2 -L2 -LINENUMBER 106 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE m Ljava/util/Map; L2 L3 2 -MAXSTACK = 4 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewAfter$args(Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newObject", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEW, clazz="/.*/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayIntAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayIntAfter deleted file mode 100644 index 6476fe80e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayIntAfter +++ /dev/null @@ -1,57 +0,0 @@ -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntAfter$args (Ljava/lang/Object;[I)V -FRAME FULL [resources/OnMethodTest [I] [[I] -ASTORE 2 -L2 -LINENUMBER 110 L2 -ASTORE 3 -L3 -LINENUMBER 111 L3 -ASTORE 4 -L4 -LINENUMBER 112 L4 -ASTORE 5 -L5 -LINENUMBER 113 L5 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a [I L2 L6 2 -LOCALVARIABLE b [[I L3 L6 3 -LOCALVARIABLE c [Ljava/lang/String; L4 L6 4 -LOCALVARIABLE d [[Ljava/lang/String; L5 L6 5 -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntAfter$args(Ljava/lang/Object;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="int", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayIntBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayIntBefore deleted file mode 100644 index 38caa4d42..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayIntBefore +++ /dev/null @@ -1,60 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "int" -ICONST_1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME1 I -L2 -LINENUMBER 110 L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "int" -ICONST_2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME FULL [resources/OnMethodTest [I] [I I] -L4 -LINENUMBER 111 L4 -L5 -LINENUMBER 112 L5 -L6 -LINENUMBER 113 L6 -L7 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L7 0 -LOCALVARIABLE a [I L2 L7 1 -LOCALVARIABLE b [[I L4 L7 2 -LOCALVARIABLE c [Ljava/lang/String; L5 L7 3 -LOCALVARIABLE d [[Ljava/lang/String; L6 L7 4 -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="int")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayStringAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayStringAfter deleted file mode 100644 index f235a9661..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayStringAfter +++ /dev/null @@ -1,51 +0,0 @@ -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringAfter$args (Ljava/lang/Object;[Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest [I [[I [Ljava/lang/String;] [[Ljava/lang/String;] -ASTORE 4 -L4 -LINENUMBER 112 L4 -ASTORE 5 -L5 -LINENUMBER 113 L5 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a [I L1 L6 1 -LOCALVARIABLE b [[I L2 L6 2 -LOCALVARIABLE c [Ljava/lang/String; L4 L6 4 -LOCALVARIABLE d [[Ljava/lang/String; L5 L6 5 -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringAfter$args(Ljava/lang/Object;[Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="/java\\.lang\\.String.*/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayStringBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayStringBefore deleted file mode 100644 index 95a19cd35..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewArrayStringBefore +++ /dev/null @@ -1,56 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "java.lang.String" -ICONST_1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME FULL [resources/OnMethodTest [I [[I] [I] -L4 -LINENUMBER 112 L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "java.lang.String" -ICONST_2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME FULL [resources/OnMethodTest [I [[I [Ljava/lang/String;] [I I] -L6 -LINENUMBER 113 L6 -L7 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L7 0 -LOCALVARIABLE a [I L1 L7 1 -LOCALVARIABLE b [[I L2 L7 2 -LOCALVARIABLE c [Ljava/lang/String; L4 L7 3 -LOCALVARIABLE d [[Ljava/lang/String; L6 L7 4 -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="/java\\.lang\\.String.*/")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewBefore deleted file mode 100644 index b87c544c3..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NewBefore +++ /dev/null @@ -1,41 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "java.util.HashMap" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewBefore$args (Ljava/lang/Object;Ljava/lang/String;)V -L1 -FRAME SAME -L2 -LINENUMBER 106 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE m Ljava/util/Map; L2 L3 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewBefore$args(Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newObject", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEW, clazz="/.*/")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgs deleted file mode 100644 index 2e75c0c5b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgs +++ /dev/null @@ -1,34 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgs$argsEmpty (Ljava/lang/Object;)V -FRAME SAME - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgs$argsEmpty(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgsEntryReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgsEntryReturn deleted file mode 100644 index 202ebb1cc..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgsEntryReturn +++ /dev/null @@ -1,81 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyEntry (Ljava/lang/Object;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 6 -ALOAD 0 -LLOAD 6 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyReturn (Ljava/lang/Object;J)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 5 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyEntry(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "entry" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyReturn(Ljava/lang/Object;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "return" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgsEntryReturnNoCapture b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgsEntryReturnNoCapture deleted file mode 100644 index c1e7a7342..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/NoArgsEntryReturnNoCapture +++ /dev/null @@ -1,76 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturnNoCapture$argsEmptyEntry (Ljava/lang/Object;)V -FRAME SAME -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturnNoCapture$argsEmptyReturn (Ljava/lang/Object;)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturnNoCapture$argsEmptyEntry(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "entry" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturnNoCapture$argsEmptyReturn(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "return" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturnNoCapture.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgs deleted file mode 100644 index 283db6b1e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgs +++ /dev/null @@ -1,36 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -LLOAD 1 -ALOAD 3 -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgs$args (Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgs$args(Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args$static") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgsReturn deleted file mode 100644 index 296a6aab6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgsReturn +++ /dev/null @@ -1,48 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 5 -ALOAD 0 -LLOAD 5 -LLOAD 1 -ALOAD 3 -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsReturn$args (Ljava/lang/String;JJ[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE a Ljava/lang/String; L0 L2 0 -LOCALVARIABLE b J L0 L2 1 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 3 -LOCALVARIABLE d [I L0 L2 4 -MAXSTACK = 9 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsReturn$args(Ljava/lang/String;JJ[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args$static", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN)) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgsSelf deleted file mode 100644 index 740226491..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticArgsSelf +++ /dev/null @@ -1,39 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ACONST_NULL -ALOAD 0 -LLOAD 1 -ALOAD 3 -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsSelf$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsSelf$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args$static") -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticMethodCall b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticMethodCall deleted file mode 100644 index 2818fdb2b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticMethodCall +++ /dev/null @@ -1,55 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 6 -LLOAD 4 -ALOAD 7 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevelStatic" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCall$args (Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L2 -FRAME FULL [java/lang/String J resources/OnMethodTest J java/lang/String resources/OnMethodTest] [J] -ALOAD 7 -ALOAD 6 -LLOAD 4 -L3 -LOCALVARIABLE a Ljava/lang/String; L0 L3 0 -LOCALVARIABLE b J L0 L3 1 -LOCALVARIABLE instance Lresources/OnMethodTest; L1 L3 3 -MAXSTACK = 9 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCall$args(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevelStatic", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget")) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 3 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 5 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticMethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticMethodCallStatic deleted file mode 100644 index 6ca623d13..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticMethodCallStatic +++ /dev/null @@ -1,50 +0,0 @@ -LSTORE 4 -ASTORE 6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 6 -LLOAD 4 -LDC "static long resources.OnMethodTest#callTargetStatic(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevelStatic" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCallStatic$args (Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L2 -FRAME APPEND [resources/OnMethodTest J java/lang/String] -ALOAD 6 -LLOAD 4 -L3 -LOCALVARIABLE a Ljava/lang/String; L0 L3 0 -LOCALVARIABLE b J L0 L3 1 -LOCALVARIABLE instance Lresources/OnMethodTest; L1 L3 3 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCallStatic$args(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevelStatic", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTargetStatic")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 2 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 4 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticNoArgs deleted file mode 100644 index 116ad04c6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticNoArgs +++ /dev/null @@ -1,32 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgs$argsEmpty ()V -FRAME SAME -MAXSTACK = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgs$argsEmpty()V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="noargs$static") -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 0 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticNoArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticNoArgsSelf deleted file mode 100644 index 4dbc616c5..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/StaticNoArgsSelf +++ /dev/null @@ -1,35 +0,0 @@ -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ACONST_NULL -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgsSelf$argsEmpty (Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgsSelf$argsEmpty(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="noargs$static") -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncEntry b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncEntry deleted file mode 100644 index 0a70989d5..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncEntry +++ /dev/null @@ -1,57 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LDC "sync" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncEntry$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L6 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest] -L7 -LINENUMBER 127 L7 -GOTO L8 -FRAME FULL [resources/OnMethodTest java/lang/Object resources/OnMethodTest] [java/lang/Throwable] -ASTORE 3 -ALOAD 3 -L8 -LINENUMBER 128 L8 -FRAME FULL [resources/OnMethodTest T resources/OnMethodTest] [] -L5 -FRAME FULL [resources/OnMethodTest] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="sync", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_ENTRY)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncExit b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncExit deleted file mode 100644 index 4d47a1341..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncExit +++ /dev/null @@ -1,66 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -L6 -LINENUMBER 127 L6 -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L7 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest] -GOTO L8 -ASTORE 3 -DUP -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L9 -FRAME FULL [resources/OnMethodTest java/lang/Object T java/lang/Throwable java/lang/Object] [java/lang/Object] -ALOAD 3 -L8 -LINENUMBER 128 L8 -FRAME FULL [resources/OnMethodTest T resources/OnMethodTest] [] -L5 -FRAME FULL [resources/OnMethodTest] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="sync", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_EXIT)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncMEntry b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncMEntry deleted file mode 100644 index 08604c556..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncMEntry +++ /dev/null @@ -1,57 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LDC "syncM" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncMEntry$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L6 -FRAME FULL [resources/OnMethodTest java/lang/Object java/lang/Object] [java/lang/Object] -L7 -LINENUMBER 167 L7 -GOTO L8 -FRAME SAME1 java/lang/Throwable -ASTORE 3 -ALOAD 3 -L8 -LINENUMBER 168 L8 -FRAME FULL [resources/OnMethodTest T java/lang/Object] [] -L5 -FRAME FULL [resources/OnMethodTest] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="syncM", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_ENTRY)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncMExit b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncMExit deleted file mode 100644 index 7be4564ce..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/SyncMExit +++ /dev/null @@ -1,66 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -L6 -LINENUMBER 167 L6 -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L7 -FRAME FULL [resources/OnMethodTest java/lang/Object java/lang/Object] [java/lang/Object] -GOTO L8 -ASTORE 3 -DUP -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L9 -FRAME FULL [resources/OnMethodTest java/lang/Object T java/lang/Throwable java/lang/Object] [java/lang/Object] -ALOAD 3 -L8 -LINENUMBER 168 L8 -FRAME FULL [resources/OnMethodTest T java/lang/Object] [] -L5 -FRAME FULL [resources/OnMethodTest] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="syncM", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_EXIT)) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Throw b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Throw deleted file mode 100644 index c14b150aa..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/Throw +++ /dev/null @@ -1,55 +0,0 @@ -DUP -ASTORE 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "resources.OnMethodTest" -LDC "exception" -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Throw$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V -L2 -FRAME FULL [resources/OnMethodTest java/io/IOException] [java/io/IOException] -FRAME FULL [resources/OnMethodTest] [java/io/IOException] -ASTORE 2 -L3 -LINENUMBER 85 L3 -ALOAD 2 -L4 -LINENUMBER 87 L4 -L5 -LOCALVARIABLE e Ljava/io/IOException; L3 L4 2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -MAXSTACK = 5 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Throw$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="exception", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.THROW)) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 2 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/AnytypeArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/AnytypeArgs deleted file mode 100644 index ed777d9dc..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/AnytypeArgs +++ /dev/null @@ -1,57 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ICONST_4 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 1 -AASTORE -DUP -ICONST_1 -LLOAD 2 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -AASTORE -DUP -ICONST_2 -ALOAD 4 -AASTORE -DUP -ICONST_3 -ALOAD 5 -AASTORE -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgs$args (Ljava/lang/Object;[Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgs$args(Ljava/lang/Object;[Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/AnytypeArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/AnytypeArgsNoSelf deleted file mode 100644 index 099a57d1b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/AnytypeArgsNoSelf +++ /dev/null @@ -1,54 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ICONST_4 -ANEWARRAY java/lang/Object -DUP -ICONST_0 -ALOAD 1 -AASTORE -DUP -ICONST_1 -LLOAD 2 -INVOKESTATIC java/lang/Long.valueOf (J)Ljava/lang/Long; -AASTORE -DUP -ICONST_2 -ALOAD 4 -AASTORE -DUP -ICONST_3 -ALOAD 5 -AASTORE -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgsNoSelf$argsNoSelf ([Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$AnytypeArgsNoSelf$argsNoSelf([Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args no self" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/AnytypeArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Args b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Args deleted file mode 100644 index a8e71ee97..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Args +++ /dev/null @@ -1,82 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Args$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Args$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (I)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -ICONST_1 -IADD -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.cntr : Ljava/lang/ThreadLocal; -SWAP -INVOKEVIRTUAL java/lang/ThreadLocal.set (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/leveled/Args.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (J)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/leveled/Args.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X2 -POP -LDC "btrace.traces/onmethod/leveled/Args.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.putPerfLong (JLjava/lang/String;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 4 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Args2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Args2Sampled deleted file mode 100644 index c4ec701e6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Args2Sampled +++ /dev/null @@ -1,123 +0,0 @@ -ICONST_0 -ISTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.$btrace$$level : I -DUP -ISTORE 7 -IFLE L0 -L1 -FRAME APPEND [I I] -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -FRAME SAME -ILOAD 7 -IFLE L2 -L3 -FRAME SAME -ILOAD 6 -IFEQ L4 -L2 -FRAME SAME -ILOAD 7 -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args2 (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME -ILOAD 7 -IFLE L5 -L6 -FRAME SAME -ILOAD 6 -IFEQ L7 -L5 -FRAME SAME -ILOAD 7 -ICONST_1 -IF_ICMPLT L7 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L7 -LINENUMBER 57 L7 -FRAME SAME -L8 -LOCALVARIABLE this Lresources/OnMethodTest; L7 L8 0 -LOCALVARIABLE a Ljava/lang/String; L7 L8 1 -LOCALVARIABLE b J L7 L8 2 -LOCALVARIABLE c [Ljava/lang/String; L7 L8 4 -LOCALVARIABLE d [I L7 L8 5 -MAXSTACK = 6 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Args2Sampled$args2(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Args2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration deleted file mode 100644 index 5d43b477a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration +++ /dev/null @@ -1,79 +0,0 @@ -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.$btrace$$level : I -DUP -ISTORE 10 -IFLE L0 -L1 -FRAME APPEND [J J I] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME SAME -ILOAD 10 -IFLE L2 -L3 -FRAME SAME1 J -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -L2 -FRAME SAME1 J -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.$btrace$$level : I -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -DUP2 -LSTORE 11 -ALOAD 0 -LLOAD 11 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME1 J -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a Ljava/lang/String; L0 L5 1 -LOCALVARIABLE b J L0 L5 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L5 4 -LOCALVARIABLE d [I L0 L5 5 -MAXSTACK = 12 -MAXLOCALS = 13 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2 deleted file mode 100644 index 88e2e79f1..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2 +++ /dev/null @@ -1,127 +0,0 @@ -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.$btrace$$level : I -DUP -ISTORE 10 -IFLE L0 -L1 -FRAME APPEND [J J I] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME SAME -ILOAD 10 -IFLE L2 -L3 -FRAME SAME1 J -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -L2 -FRAME SAME1 J -ILOAD 10 -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -DUP2 -LSTORE 11 -ALOAD 0 -LLOAD 11 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args2 (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME1 J -ILOAD 10 -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -DUP2 -LSTORE 13 -ALOAD 0 -LLOAD 13 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L5 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I T T] [J] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a Ljava/lang/String; L0 L6 1 -LOCALVARIABLE b J L0 L6 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L6 4 -LOCALVARIABLE d [I L0 L6 5 -MAXSTACK = 12 -MAXLOCALS = 15 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2Err b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2Err deleted file mode 100644 index defd36225..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2Err +++ /dev/null @@ -1,118 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -TRYCATCHBLOCK L0 L2 L2 java/lang/Throwable -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.$btrace$$level : I -DUP -ISTORE 10 -IFLE L0 -L3 -FRAME APPEND [J J I] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME SAME -FRAME SAME1 java/lang/Throwable -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -DUP -ASTORE 11 -ILOAD 10 -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -LLOAD 6 -ALOAD 11 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args2 (Ljava/lang/Object;JLjava/lang/Throwable;)V -L4 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I java/lang/Throwable] [java/lang/Throwable] -ATHROW -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I] [java/lang/Throwable] -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -DUP -ASTORE 12 -ILOAD 10 -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LLOAD 6 -ALOAD 12 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L5 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I T java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 5 -MAXLOCALS = 13 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Err$args2(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Err.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2Sampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2Sampled deleted file mode 100644 index 6ee4e3370..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDuration2Sampled +++ /dev/null @@ -1,159 +0,0 @@ -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -ICONST_0 -ISTORE 10 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.$btrace$$level : I -DUP -ISTORE 11 -LDC 6 -IF_ICMPLT L0 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I I] [] -GOTO L2 -FRAME SAME -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 8 -L2I -ISTORE 10 -L2 -LINENUMBER 57 L2 -FRAME SAME -ILOAD 11 -LDC 6 -IF_ICMPLT L3 -L4 -FRAME SAME1 J -GOTO L5 -L3 -FRAME SAME1 J -ILOAD 10 -IFEQ L6 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J -LLOAD 8 -LSUB -LSTORE 6 -L5 -FRAME SAME1 J -ILOAD 11 -ICONST_5 -IF_ICMPGT L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -DUP2 -LSTORE 12 -ALOAD 0 -LLOAD 12 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args2 (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L6 -FRAME SAME1 J -ILOAD 11 -LDC 6 -IF_ICMPLT L7 -L8 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I I T T] [J] -GOTO L9 -L7 -FRAME SAME1 J -ILOAD 10 -IFEQ L10 -L9 -FRAME SAME1 J -ILOAD 11 -ICONST_1 -IF_ICMPLT L10 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L10 -DUP2 -LSTORE 14 -ALOAD 0 -LLOAD 14 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L10 -FRAME SAME1 J -L11 -LOCALVARIABLE this Lresources/OnMethodTest; L2 L11 0 -LOCALVARIABLE a Ljava/lang/String; L2 L11 1 -LOCALVARIABLE b J L2 L11 2 -LOCALVARIABLE c [Ljava/lang/String; L2 L11 4 -LOCALVARIABLE d [I L2 L11 5 -MAXSTACK = 12 -MAXLOCALS = 16 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDuration2Sampled$args2(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value="<=5")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDuration2Sampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationBoxed b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationBoxed deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationBoxedErr b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationBoxedErr deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationConstructor b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationConstructor deleted file mode 100644 index 646261f42..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationConstructor +++ /dev/null @@ -1,71 +0,0 @@ -LCONST_0 -LSTORE 2 -LCONST_0 -LSTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.$btrace$$level : I -DUP -ISTORE 6 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J I] [] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 4 -FRAME SAME -L3 -LINENUMBER 47 L3 -ILOAD 6 -IFLE L4 -L5 -FRAME SAME -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 4 -LSUB -LSTORE 2 -L4 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.$btrace$$level : I -ICONST_1 -IF_ICMPLT L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LLOAD 2 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructor$args (Ljava/lang/Object;JLjava/lang/String;)V -L6 -FRAME SAME -L7 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L7 0 -LOCALVARIABLE a Ljava/lang/String; L0 L7 1 -MAXSTACK = 4 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructor$args(Ljava/lang/Object;JLjava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructor.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationConstructorErr b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationConstructorErr deleted file mode 100644 index dcf8ae266..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationConstructorErr +++ /dev/null @@ -1,118 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -L2 -LINENUMBER 41 L2 -LCONST_0 -LSTORE 1 -LCONST_0 -LSTORE 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.$btrace$$level : I -DUP -ISTORE 5 -IFLE L0 -L3 -FRAME FULL [resources/OnMethodTest J J I] [] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -L0 -LINENUMBER 42 L0 -FRAME SAME -L4 -LINENUMBER 43 L4 -L1 -FRAME SAME1 java/lang/Throwable -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -DUP -ASTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.$btrace$$level : I -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LLOAD 1 -ALOAD 6 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L5 -FRAME FULL [resources/OnMethodTest J J I java/lang/Throwable] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L2 L1 0 -MAXSTACK = 5 -MAXLOCALS = 7 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -L2 -LINENUMBER 45 L2 -LCONST_0 -LSTORE 2 -LCONST_0 -LSTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.$btrace$$level : I -DUP -ISTORE 6 -IFLE L0 -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J J I] [] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 4 -L0 -LINENUMBER 46 L0 -FRAME SAME -L4 -LINENUMBER 47 L4 -L1 -FRAME SAME1 java/lang/Throwable -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 4 -LSUB -LSTORE 2 -DUP -ASTORE 7 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.$btrace$$level : I -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LLOAD 2 -ALOAD 7 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L5 -FRAME FULL [resources/OnMethodTest java/lang/String J J I java/lang/Throwable] [java/lang/Throwable] -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L2 L1 0 -LOCALVARIABLE a Ljava/lang/String; L2 L1 1 -MAXSTACK = 5 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationConstructorErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationConstructorErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationErr b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationErr deleted file mode 100644 index 5c3c994a9..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationErr +++ /dev/null @@ -1,66 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.$btrace$$level : I -DUP -ISTORE 10 -IFLE L0 -L2 -FRAME APPEND [J J I] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME SAME -FRAME SAME1 java/lang/Throwable -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -DUP -ASTORE 11 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LLOAD 6 -ALOAD 11 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationErr$args (Ljava/lang/Object;JLjava/lang/Throwable;)V -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 5 -MAXLOCALS = 12 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationErr$args(Ljava/lang/Object;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationErr.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationMultiReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationMultiReturn deleted file mode 100644 index 0479c8336..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationMultiReturn +++ /dev/null @@ -1,129 +0,0 @@ -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.$btrace$$level : I -DUP -ISTORE 10 -IFLE L0 -L1 -FRAME APPEND [J J I] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 8 -FRAME SAME -IFLE L2 -L3 -LINENUMBER 141 L3 -ILOAD 10 -IFLE L4 -L5 -FRAME SAME1 J -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 8 -LSUB -LSTORE 6 -L4 -FRAME SAME1 J -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.$btrace$$level : I -ICONST_1 -IF_ICMPLT L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -DUP2 -LSTORE 11 -ALOAD 0 -LLOAD 11 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L6 -FRAME SAME1 J -L2 -LINENUMBER 144 L2 -IFLE L7 -L8 -LINENUMBER 145 L8 -L9 -FRAME SAME1 J -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.$btrace$$level : I -ICONST_1 -IF_ICMPLT L10 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L10 -DUP2 -LSTORE 13 -ALOAD 0 -LLOAD 13 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L10 -FRAME SAME1 J -L7 -LINENUMBER 149 L7 -L11 -LINENUMBER 150 L11 -L12 -FRAME SAME1 J -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.$btrace$$level : I -ICONST_1 -IF_ICMPLT L13 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L13 -DUP2 -LSTORE 15 -ALOAD 0 -LLOAD 15 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L13 -FRAME SAME1 J -L14 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L14 0 -LOCALVARIABLE a Ljava/lang/String; L0 L14 1 -LOCALVARIABLE b J L0 L14 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L14 4 -LOCALVARIABLE d [I L0 L14 5 -MAXSTACK = 12 -MAXLOCALS = 17 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationMultiReturn$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="argsMultiReturn", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationMultiReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationSampled deleted file mode 100644 index 9032034be..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsDurationSampled +++ /dev/null @@ -1,89 +0,0 @@ -LCONST_0 -LSTORE 6 -LCONST_0 -LSTORE 8 -ICONST_0 -ISTORE 10 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.$btrace$$level : I -DUP -ISTORE 11 -IFLE L0 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J [Ljava/lang/String; [I J J I I] [] -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 8 -L2I -ISTORE 10 -FRAME SAME -ILOAD 11 -IFLE L2 -L3 -FRAME SAME1 J -ILOAD 10 -IFEQ L4 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.getEndTs (I)J -LLOAD 8 -LSUB -LSTORE 6 -L2 -FRAME SAME1 J -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.$btrace$$level : I -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -DUP2 -LSTORE 12 -ALOAD 0 -LLOAD 12 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationSampled$args (Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME1 J -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a Ljava/lang/String; L0 L5 1 -LOCALVARIABLE b J L0 L5 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L5 4 -LOCALVARIABLE d [I L0 L5 5 -MAXSTACK = 12 -MAXLOCALS = 14 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsDurationSampled$args(Ljava/lang/Object;JJLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const, mean=20) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsNoSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsNoSelf deleted file mode 100644 index 1271a7c67..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsNoSelf +++ /dev/null @@ -1,42 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -LDC "public long resources.OnMethodTest#args(java.lang.String, long, java.lang.String[], int[])" -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsNoSelf$argsNoSelf (Ljava/lang/String;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsNoSelf$argsNoSelf(Ljava/lang/String;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;(fqn=true) // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args no self" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsNoSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturn deleted file mode 100644 index b4c65d8ea..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturn +++ /dev/null @@ -1,54 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 6 -ALOAD 0 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturn$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 10 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturn$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnAugmented deleted file mode 100644 index 6911e18a4..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnAugmented +++ /dev/null @@ -1,55 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 6 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -LLOAD 6 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[IJ)J -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 8 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[IJ)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 6 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LCONST_1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnAugmented1 deleted file mode 100644 index 05e732b20..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnAugmented1 +++ /dev/null @@ -1,58 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 6 -ALOAD 0 -LLOAD 6 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented1$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)J -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 8 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnAugmented1$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 1 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LLOAD 1 -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnSampled deleted file mode 100644 index 346dcb551..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsReturnSampled +++ /dev/null @@ -1,75 +0,0 @@ -ICONST_0 -ISTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.$btrace$$level : I -DUP -ISTORE 7 -IFLE L0 -L1 -FRAME APPEND [I I] -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -FRAME SAME -ILOAD 7 -IFLE L2 -L3 -FRAME SAME1 J -ILOAD 6 -IFEQ L4 -L2 -FRAME SAME1 J -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.$btrace$$level : I -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -DUP2 -LSTORE 8 -ALOAD 0 -LLOAD 8 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnSampled$args (Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME1 J -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a Ljava/lang/String; L0 L5 1 -LOCALVARIABLE b J L0 L5 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L5 4 -LOCALVARIABLE d [I L0 L5 5 -MAXSTACK = 10 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsReturnSampled$args(Ljava/lang/Object;JLjava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsReturnSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampled deleted file mode 100644 index 22966be42..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampled +++ /dev/null @@ -1,81 +0,0 @@ -ICONST_0 -ISTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.$btrace$$level : I -DUP -ISTORE 7 -IFLE L0 -L1 -FRAME APPEND [I I] -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -FRAME SAME -ILOAD 7 -IFLE L2 -L3 -FRAME SAME -ILOAD 6 -IFEQ L4 -L2 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.$btrace$$level : I -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampled$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L4 -LINENUMBER 57 L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -LOCALVARIABLE a Ljava/lang/String; L4 L5 1 -LOCALVARIABLE b J L4 L5 2 -LOCALVARIABLE c [Ljava/lang/String; L4 L5 4 -LOCALVARIABLE d [I L4 L5 5 -MAXSTACK = 6 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampled$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampledAdaptive deleted file mode 100644 index d3e792aa4..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampledAdaptive +++ /dev/null @@ -1,87 +0,0 @@ -ICONST_0 -ISTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.$btrace$$level : I -DUP -ISTORE 7 -IFLE L0 -L1 -FRAME APPEND [I I] -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z -ISTORE 6 -FRAME SAME -ILOAD 7 -IFLE L2 -L3 -FRAME SAME -ILOAD 6 -IFEQ L4 -L2 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.$btrace$$level : I -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L4 -LINENUMBER 57 L4 -FRAME SAME -ILOAD 6 -IFEQ L5 -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.updateEndTs (I)V -L5 -FRAME SAME1 J -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L4 L6 0 -LOCALVARIABLE a Ljava/lang/String; L4 L6 1 -LOCALVARIABLE b J L4 L6 2 -LOCALVARIABLE c [Ljava/lang/String; L4 L6 4 -LOCALVARIABLE d [I L4 L6 5 -MAXSTACK = 6 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Adaptive) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampledNoSampling b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampledNoSampling deleted file mode 100644 index 37701fb47..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsSampledNoSampling +++ /dev/null @@ -1,132 +0,0 @@ -ICONST_0 -ISTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.$btrace$$level : I -DUP -ISTORE 7 -IFLE L0 -L1 -FRAME APPEND [I I] -ICONST_1 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 6 -FRAME SAME -ILOAD 7 -IFLE L2 -L3 -FRAME SAME -ILOAD 6 -IFEQ L4 -L2 -FRAME SAME -ILOAD 7 -ICONST_1 -IF_ICMPLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsSampled (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L4 -FRAME SAME -ILOAD 7 -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsNoSampling (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -L5 -LINENUMBER 57 L5 -FRAME SAME -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L5 L6 0 -LOCALVARIABLE a Ljava/lang/String; L5 L6 1 -LOCALVARIABLE b J L5 L6 2 -LOCALVARIABLE c [Ljava/lang/String; L5 L6 4 -LOCALVARIABLE d [I L5 L6 5 -MAXSTACK = 6 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsNoSampling(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsSampledNoSampling$argsSampled(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsSampledNoSampling.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsShared b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsShared deleted file mode 100644 index ab738d457..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsShared +++ /dev/null @@ -1,96 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -LDC "this = " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -ALOAD 0 -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (I)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.cntr : Ljava/lang/ThreadLocal; -INVOKEVIRTUAL java/lang/ThreadLocal.get ()Ljava/lang/Object; -CHECKCAST java/lang/Integer -INVOKEVIRTUAL java/lang/Integer.intValue ()I -ICONST_1 -IADD -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.cntr : Ljava/lang/ThreadLocal; -SWAP -INVOKEVIRTUAL java/lang/ThreadLocal.set (Ljava/lang/Object;)V -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$dumpExported ()V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$dumpExported()V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/leveled/ArgsShared.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.str (J)Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$incExported ()V -RETURN -MAXSTACK = 2 -MAXLOCALS = 0 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsShared$incExported()V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -LDC "btrace.traces/onmethod/leveled/ArgsShared.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.getPerfLong (Ljava/lang/String;)J (itf) -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsShared.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X2 -POP -LDC "btrace.traces/onmethod/leveled/ArgsShared.exported" -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.putPerfLong (JLjava/lang/String;)V (itf) -RETURN -MAXSTACK = 4 -MAXLOCALS = 0 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsUnsafe b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsUnsafe deleted file mode 100644 index 26cffbb8d..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArgsUnsafe +++ /dev/null @@ -1,68 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -ALOAD 1 -LLOAD 2 -ALOAD 4 -ALOAD 5 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArgsUnsafe$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArgsUnsafe$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable -TRYCATCHBLOCK L0 L3 L3 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Sys$VM.systemLoadAverage ()D -DSTORE 6 -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils$Sys$VM.processCPUTime ()J -LSTORE 8 -NEW java/lang/StringBuilder -DUP -INVOKESPECIAL java/lang/StringBuilder. ()V -DLOAD 6 -INVOKEVIRTUAL java/lang/StringBuilder.append (D)Ljava/lang/StringBuilder; -LDC " # " -INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; -LLOAD 8 -INVOKEVIRTUAL java/lang/StringBuilder.append (J)Ljava/lang/StringBuilder; -INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -L1 -GOTO L4 -L2 -FRAME SAME1 java/lang/Throwable -ASTORE 6 -LDC "FAILED" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -ALOAD 6 -INVOKEVIRTUAL java/lang/Throwable.getMessage ()Ljava/lang/String; -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -L4 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L3 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArgsUnsafe.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 10 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetAfter deleted file mode 100644 index f2bc45443..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetAfter +++ /dev/null @@ -1,66 +0,0 @@ -DUP2 -ASTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 5 -IFLT L2 -FRAME FULL [resources/OnMethodTest I [I I [I I] [[I I] -IALOAD -ILOAD 5 -IFLT L3 -DUP -ISTORE 6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ILOAD 6 -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfter$args (Ljava/lang/Object;I[II)V -L3 -FRAME FULL [resources/OnMethodTest I [I I [I I I] [I] -ISTORE 7 -L4 -LINENUMBER 97 L4 -L5 -LINENUMBER 98 L5 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a I L0 L6 1 -LOCALVARIABLE arr [I L1 L6 2 -LOCALVARIABLE b I L4 L6 7 -MAXSTACK = 5 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfter$args(Ljava/lang/Object;I[II)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetAfterAny deleted file mode 100644 index a58980779..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetAfterAny +++ /dev/null @@ -1,67 +0,0 @@ -DUP2 -ASTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 5 -IFLT L2 -FRAME FULL [resources/OnMethodTest I [I I [I I] [[I I] -IALOAD -ILOAD 5 -IFLT L3 -DUP -ISTORE 6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ILOAD 6 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfterAny$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V -L3 -FRAME FULL [resources/OnMethodTest I [I I [I I I] [I] -ISTORE 7 -L4 -LINENUMBER 97 L4 -L5 -LINENUMBER 98 L5 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a I L0 L6 1 -LOCALVARIABLE arr [I L1 L6 2 -LOCALVARIABLE b I L4 L6 7 -MAXSTACK = 5 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetBefore deleted file mode 100644 index 298a3a799..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetBefore +++ /dev/null @@ -1,55 +0,0 @@ -DUP2 -ASTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBefore$args (Ljava/lang/Object;[II)V -FRAME FULL [resources/OnMethodTest I [I I [I] [[I I] -IALOAD -ISTORE 5 -L3 -LINENUMBER 97 L3 -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L3 L5 5 -MAXSTACK = 5 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBefore$args(Ljava/lang/Object;[II)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetBeforeAny deleted file mode 100644 index 0541ba4a3..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArrayGetBeforeAny +++ /dev/null @@ -1,55 +0,0 @@ -DUP2 -ASTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 4 -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBeforeAny$args (Ljava/lang/Object;Ljava/lang/Object;I)V -FRAME FULL [resources/OnMethodTest I [I I [I] [[I I] -IALOAD -ISTORE 5 -L3 -LINENUMBER 97 L3 -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L3 L5 5 -MAXSTACK = 5 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArrayGetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_GET), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArrayGetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetAfter deleted file mode 100644 index 18d768118..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetAfter +++ /dev/null @@ -1,62 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 7 -IFLT L3 -L3 -FRAME FULL [resources/OnMethodTest I [I I I I [I I] [[I I I] -ILOAD 7 -IFLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfter$args (Ljava/lang/Object;[III)V -L4 -LINENUMBER 98 L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L2 L5 3 -MAXSTACK = 5 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfter$args(Ljava/lang/Object;[III)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetAfterAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetAfterAny deleted file mode 100644 index 592a90a65..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetAfterAny +++ /dev/null @@ -1,63 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 7 -IFLT L3 -L3 -FRAME FULL [resources/OnMethodTest I [I I I I [I I] [[I I I] -ILOAD 7 -IFLT L4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L4 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfterAny$args (Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -L4 -LINENUMBER 98 L4 -FRAME SAME -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L2 L5 3 -MAXSTACK = 5 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetAfterAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetAfterAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetBefore deleted file mode 100644 index 2d1738c84..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetBefore +++ /dev/null @@ -1,56 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBefore$args (Ljava/lang/Object;[III)V -L3 -FRAME FULL [resources/OnMethodTest I [I I I I [I] [[I I I] -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L2 L5 3 -MAXSTACK = 7 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBefore$args(Ljava/lang/Object;[III)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetBeforeAny b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetBeforeAny deleted file mode 100644 index 4ce492d33..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ArraySetBeforeAny +++ /dev/null @@ -1,57 +0,0 @@ -ISTORE 4 -DUP2 -ISTORE 5 -ASTORE 6 -ILOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 6 -ILOAD 5 -ILOAD 4 -INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer; -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBeforeAny$args (Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -L3 -FRAME FULL [resources/OnMethodTest I [I I I I [I] [[I I I] -L4 -LINENUMBER 98 L4 -L5 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -LOCALVARIABLE a I L0 L5 1 -LOCALVARIABLE arr [I L1 L5 2 -LOCALVARIABLE b I L2 L5 3 -MAXSTACK = 7 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ArraySetBeforeAny$args(Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="array", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ARRAY_SET), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ArraySetBeforeAny.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Catch b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Catch deleted file mode 100644 index ca08a75f6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Catch +++ /dev/null @@ -1,50 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Catch$args (Ljava/lang/Object;Ljava/io/IOException;)V -FRAME FULL [resources/OnMethodTest java/io/IOException] [java/io/IOException] -ASTORE 2 -L3 -LINENUMBER 85 L3 -ALOAD 2 -L4 -LINENUMBER 87 L4 -L5 -LOCALVARIABLE e Ljava/io/IOException; L3 L4 2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Catch$args(Ljava/lang/Object;Ljava/io/IOException;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="exception", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CATCH), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Catch.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/CheckcastAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/CheckcastAfter deleted file mode 100644 index e7bf0cd37..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/CheckcastAfter +++ /dev/null @@ -1,58 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "casts" -LDC "java.util.HashMap" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastAfter$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap] [java/util/HashMap] -ASTORE 3 -L3 -LINENUMBER 119 L3 -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map T java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L3 L6 3 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CHECKCAST, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/CheckcastBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/CheckcastBefore deleted file mode 100644 index 22d49dcb2..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/CheckcastBefore +++ /dev/null @@ -1,59 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "resources.OnMethodTest" -LDC "java.util.HashMap" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastBefore$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap] [java/util/HashMap] -CHECKCAST java/util/HashMap -ASTORE 3 -L3 -LINENUMBER 119 L3 -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map T java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L3 L6 3 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$CheckcastBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CHECKCAST), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/CheckcastBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ConstructorArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ConstructorArgs deleted file mode 100644 index ad8d0be2e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ConstructorArgs +++ /dev/null @@ -1,38 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ConstructorArgs$args (Ljava/lang/Object;Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest java/lang/String] [] - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ConstructorArgs$args(Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "constructor args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ConstructorArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Error b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Error deleted file mode 100644 index c924c7698..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Error +++ /dev/null @@ -1,49 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -FRAME SAME1 java/lang/Throwable -DUP -ASTORE 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "uncaught" -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Error$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -L2 -FRAME FULL [resources/OnMethodTest java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 4 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Error$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="uncaught", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Error.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ErrorCaught b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ErrorCaught deleted file mode 100644 index 72a684348..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ErrorCaught +++ /dev/null @@ -1,55 +0,0 @@ -TRYCATCHBLOCK L0 L2 L2 java/lang/Throwable -L3 -LINENUMBER 180 L3 -L4 -LINENUMBER 182 L4 -RETURN -L2 -FRAME SAME1 java/lang/Throwable -DUP -ASTORE 2 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.$btrace$$level : I -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "caught" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ErrorCaught$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -L5 -FRAME FULL [resources/OnMethodTest T java/lang/Throwable] [java/lang/Throwable] -ATHROW -LOCALVARIABLE e Ljava/lang/RuntimeException; L3 L4 1 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -MAXSTACK = 4 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorCaught$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="caught", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorCaught.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ErrorDuration b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ErrorDuration deleted file mode 100644 index 5bb3e18fe..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/ErrorDuration +++ /dev/null @@ -1,68 +0,0 @@ -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -LCONST_0 -LSTORE 1 -LCONST_0 -LSTORE 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.$btrace$$level : I -DUP -ISTORE 5 -IFLE L0 -L2 -FRAME APPEND [J J I] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 3 -FRAME SAME -FRAME SAME1 java/lang/Throwable -INVOKESTATIC java/lang/System.nanoTime ()J -LLOAD 3 -LSUB -LSTORE 1 -DUP -ASTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "uncaught" -LLOAD 1 -ALOAD 6 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$ErrorDuration$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Throwable;)V -L3 -FRAME FULL [resources/OnMethodTest J J I java/lang/Throwable] [java/lang/Throwable] -ATHROW -MAXSTACK = 6 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$ErrorDuration$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="uncaught", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.ERROR), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 2 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/ErrorDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetAfter deleted file mode 100644 index e3a846a47..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetAfter +++ /dev/null @@ -1,61 +0,0 @@ -DUP -ASTORE 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 2 -IFLT L1 -L1 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest I] [resources/OnMethodTest resources/OnMethodTest] -ILOAD 2 -IFLT L2 -DUP -ISTORE 3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 1 -LDC "field int resources.OnMethodTest#field" -ILOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfter$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest I I] [resources/OnMethodTest I] -L3 -LINENUMBER 102 L3 -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -MAXSTACK = 6 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/^resources.OnMethodTest$/", field="/^field$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 2 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetAfterStatic deleted file mode 100644 index 44c8f36fd..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetAfterStatic +++ /dev/null @@ -1,59 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 1 -IFLT L1 -L1 -FRAME APPEND [I] -ILOAD 1 -IFLT L2 -DUP2 -LSTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ACONST_NULL -LDC "static field long resources.OnMethodTest#sField" -LLOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfterStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -L2 -FRAME FULL [resources/OnMethodTest I J] [J] -L3 -LINENUMBER 162 L3 -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -MAXSTACK = 7 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/^resources.OnMethodTest$/", field="/^sField$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 2 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetBefore deleted file mode 100644 index 08e6914c6..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetBefore +++ /dev/null @@ -1,50 +0,0 @@ -DUP -ASTORE 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -LDC "field" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBefore$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -L1 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest resources/OnMethodTest] -L2 -LINENUMBER 102 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 5 -MAXLOCALS = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/.*\\.OnMethodTest/", field="/^field$/"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetBeforeStatic deleted file mode 100644 index 7f5121c4e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldGetBeforeStatic +++ /dev/null @@ -1,46 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ACONST_NULL -LDC "sField" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBeforeStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -L1 -FRAME SAME -L2 -LINENUMBER 162 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldGetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_GET, clazz="/.*\\.OnMethodTest/", field="/^sField$/"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldGetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetAfter deleted file mode 100644 index 4eac58e0b..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetAfter +++ /dev/null @@ -1,59 +0,0 @@ -ISTORE 1 -DUP -ASTORE 2 -ILOAD 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 3 -IFLT L1 -L1 -FRAME FULL [resources/OnMethodTest I resources/OnMethodTest I] [resources/OnMethodTest I] -ILOAD 3 -IFLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ALOAD 2 -LDC "field" -ILOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfter$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -L2 -LINENUMBER 102 L2 -FRAME SAME -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 4 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfter$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="resources.OnMethodTest", field="/^field$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetAfterStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetAfterStatic deleted file mode 100644 index e1990d452..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetAfterStatic +++ /dev/null @@ -1,57 +0,0 @@ -LSTORE 1 -LLOAD 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.$btrace$$level : I -ICONST_1 -ISUB -DUP -ISTORE 3 -IFLT L1 -L1 -FRAME FULL [resources/OnMethodTest J I] [J] -ILOAD 3 -IFLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -ACONST_NULL -LDC "sField" -LLOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfterStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -L2 -LINENUMBER 162 L2 -FRAME SAME -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetAfterStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="resources.OnMethodTest", field="/^sField$/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetAfterStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetBefore deleted file mode 100644 index fd8cb0f3f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetBefore +++ /dev/null @@ -1,53 +0,0 @@ -ISTORE 1 -DUP -ASTORE 2 -ILOAD 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 2 -LDC "field" -ILOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBefore$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME FULL [resources/OnMethodTest I resources/OnMethodTest] [resources/OnMethodTest I] -L2 -LINENUMBER 102 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 6 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBefore$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="/.*\\.OnMethodTest/", field="/^field$/"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetBeforeStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetBeforeStatic deleted file mode 100644 index 7577d87bb..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/FieldSetBeforeStatic +++ /dev/null @@ -1,51 +0,0 @@ -LSTORE 1 -LLOAD 1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ACONST_NULL -LDC "sField" -LLOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBeforeStatic$args (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest J] [J] -L2 -LINENUMBER 162 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -MAXSTACK = 7 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$FieldSetBeforeStatic$args(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="staticField", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.FIELD_SET, clazz="/.*\\.OnMethodTest/", field="/^sField$/"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/FieldSetBeforeStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/InstanceofAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/InstanceofAfter deleted file mode 100644 index 281928649..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/InstanceofAfter +++ /dev/null @@ -1,57 +0,0 @@ -DUP -ASTORE 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "casts" -LDC "java.util.HashMap" -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofAfter$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -L3 -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap java/util/HashMap] [I] -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map java/util/HashMap java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L2 L6 2 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofAfter$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.INSTANCEOF, where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/InstanceofBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/InstanceofBefore deleted file mode 100644 index 8f345da73..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/InstanceofBefore +++ /dev/null @@ -1,57 +0,0 @@ -DUP -ASTORE 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "resources.OnMethodTest" -LDC "java.util.HashMap" -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofBefore$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -L3 -FRAME FULL [resources/OnMethodTest java/util/HashMap java/util/HashMap java/util/HashMap] [java/util/HashMap] -IFEQ L4 -L5 -LINENUMBER 120 L5 -L4 -LINENUMBER 122 L4 -FRAME FULL [resources/OnMethodTest java/util/Map java/util/HashMap java/util/HashMap] [] -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE c Ljava/util/Map; L1 L6 1 -LOCALVARIABLE d Ljava/util/HashMap; L2 L6 2 -MAXSTACK = 5 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$InstanceofBefore$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="casts", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.INSTANCEOF), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/InstanceofBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Line b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Line deleted file mode 100644 index 4f014d0ba..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Line +++ /dev/null @@ -1,49 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "exception" -LDC 84 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Line$args (Ljava/lang/Object;Ljava/lang/String;I)V -L2 -FRAME SAME1 java/lang/Throwable -L3 -LINENUMBER 85 L3 -L4 -LINENUMBER 87 L4 -L5 -LOCALVARIABLE e Ljava/io/IOException; L3 L4 1 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -MAXSTACK = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Line$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="field", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.LINE, line=84), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Line.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MatchDerived b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MatchDerived deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCall b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCall deleted file mode 100644 index b84bf7bd8..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCall +++ /dev/null @@ -1,60 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 6 -LLOAD 4 -ALOAD 7 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCall$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME APPEND [J java/lang/String resources/OnMethodTest] -ALOAD 7 -ALOAD 6 -LLOAD 4 -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 8 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCall$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDuration b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDuration deleted file mode 100644 index b96c89fa0..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDuration +++ /dev/null @@ -1,70 +0,0 @@ -LCONST_0 -LSTORE 4 -LCONST_0 -LSTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.$btrace$$level : I -DUP -ISTORE 8 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I] [resources/OnMethodTest java/lang/String J] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 6 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I] [resources/OnMethodTest java/lang/String J] -LSTORE 9 -ASTORE 11 -ASTORE 12 -ALOAD 12 -ALOAD 11 -LLOAD 9 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -DUP2 -LSTORE 13 -LLOAD 13 -LCONST_0 -ALOAD 11 -LLOAD 9 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration$args (JJLjava/lang/String;J)V -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest] [J] -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -LOCALVARIABLE a Ljava/lang/String; L0 L4 1 -LOCALVARIABLE b J L0 L4 2 -MAXSTACK = 9 -MAXLOCALS = 15 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration$args(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDuration2 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDuration2 deleted file mode 100644 index 764739584..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDuration2 +++ /dev/null @@ -1,134 +0,0 @@ -LCONST_0 -LSTORE 4 -LCONST_0 -LSTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.$btrace$$level : I -DUP -ISTORE 8 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I] [resources/OnMethodTest java/lang/String J] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 6 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I] [resources/OnMethodTest java/lang/String J] -LSTORE 9 -ASTORE 11 -ASTORE 12 -ALOAD 12 -ALOAD 11 -LLOAD 9 -LCONST_0 -LSTORE 13 -LCONST_0 -LSTORE 15 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.$btrace$$level : I -DUP -ISTORE 17 -IFLE L3 -L4 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest J J I] [resources/OnMethodTest java/lang/String J] -INVOKESTATIC java/lang/System.nanoTime ()J -LSTORE 15 -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest J J I] [resources/OnMethodTest java/lang/String J] -LSTORE 18 -ASTORE 20 -ASTORE 21 -ALOAD 21 -ALOAD 20 -LLOAD 18 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.$btrace$$level : I -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -DUP2 -LSTORE 22 -LLOAD 22 -LCONST_0 -ALOAD 20 -LLOAD 18 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args0 (JJLjava/lang/String;J)V -L5 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest J J I J java/lang/String resources/OnMethodTest] [J] -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.$btrace$$level : I -ICONST_1 -IF_ICMPLT L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -DUP2 -LSTORE 24 -LLOAD 24 -LCONST_0 -ALOAD 11 -LLOAD 9 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args1 (JJLjava/lang/String;J)V -L6 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I J java/lang/String resources/OnMethodTest J J I J java/lang/String resources/OnMethodTest T T] [J] -L7 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L7 0 -LOCALVARIABLE a Ljava/lang/String; L0 L7 1 -LOCALVARIABLE b J L0 L7 2 -MAXSTACK = 9 -MAXLOCALS = 26 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args0(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDuration2$args1(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDuration2.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDurationSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDurationSampled deleted file mode 100644 index 0bf8a6de8..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDurationSampled +++ /dev/null @@ -1,77 +0,0 @@ -LCONST_0 -LSTORE 4 -LCONST_0 -LSTORE 6 -ICONST_0 -ISTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.$btrace$$level : I -DUP -ISTORE 9 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I] [resources/OnMethodTest java/lang/String J] -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 6 -L2I -ISTORE 8 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I] [resources/OnMethodTest java/lang/String J] -LSTORE 10 -ASTORE 12 -ASTORE 13 -ALOAD 13 -ALOAD 12 -LLOAD 10 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -DUP2 -LSTORE 14 -LLOAD 14 -LCONST_0 -ALOAD 12 -LLOAD 10 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampled$args (JJLjava/lang/String;J)V -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I J java/lang/String resources/OnMethodTest] [J] -L4 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L4 0 -LOCALVARIABLE a Ljava/lang/String; L0 L4 1 -LOCALVARIABLE b J L0 L4 2 -MAXSTACK = 9 -MAXLOCALS = 16 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampled$args(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDurationSampledMulti b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDurationSampledMulti deleted file mode 100644 index e1eeab415..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallDurationSampledMulti +++ /dev/null @@ -1,120 +0,0 @@ -LCONST_0 -LSTORE 4 -LCONST_0 -LSTORE 6 -ICONST_0 -ISTORE 8 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.$btrace$$level : I -DUP -ISTORE 9 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I] [resources/OnMethodTest java/lang/String J] -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 6 -L2I -ISTORE 8 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I] [resources/OnMethodTest java/lang/String J] -LSTORE 10 -ASTORE 12 -ASTORE 13 -ALOAD 13 -ALOAD 12 -LLOAD 10 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -DUP2 -LSTORE 14 -LLOAD 14 -LCONST_0 -ALOAD 12 -LLOAD 10 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args (JJLjava/lang/String;J)V -L3 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I J java/lang/String resources/OnMethodTest] [J] -LCONST_0 -LSTORE 16 -LCONST_0 -LSTORE 18 -ICONST_0 -ISTORE 20 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.$btrace$$level : I -DUP -ISTORE 21 -IFLE L4 -L5 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I J java/lang/String resources/OnMethodTest T T J J I I] [J java/lang/String J] -ICONST_3 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitTimed (I)J -DUP2 -LSTORE 18 -L2I -ISTORE 20 -L4 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I J java/lang/String resources/OnMethodTest T T J J I I] [J java/lang/String J] -LSTORE 22 -ASTORE 24 -ALOAD 24 -LLOAD 22 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.$btrace$$level : I -ICONST_1 -IF_ICMPLT L6 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -DUP2 -LSTORE 25 -LLOAD 25 -LCONST_0 -ALOAD 24 -LLOAD 22 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args (JJLjava/lang/String;J)V -L6 -FRAME FULL [resources/OnMethodTest java/lang/String J J J I I J java/lang/String resources/OnMethodTest T T J J I I J java/lang/String] [J J] -LSTORE 27 -L7 -LINENUMBER 132 L7 -LLOAD 27 -L8 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L8 0 -LOCALVARIABLE a Ljava/lang/String; L0 L8 1 -LOCALVARIABLE b J L0 L8 2 -LOCALVARIABLE i J L7 L8 27 -MAXSTACK = 11 -MAXLOCALS = 29 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallDurationSampledMulti$args(JJLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel1", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="/callTarget.*/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Duration;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallDurationSampledMulti.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallNoArgs deleted file mode 100644 index 12d217f6f..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallNoArgs +++ /dev/null @@ -1,40 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallNoArgs$args ()V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J] [resources/OnMethodTest java/lang/String J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallNoArgs$args()V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 0 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturn deleted file mode 100644 index 9fead4f0a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturn +++ /dev/null @@ -1,54 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -ALOAD 7 -ALOAD 6 -LLOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 8 -LLOAD 8 -ALOAD 6 -LLOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturn$args (JLjava/lang/String;J)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 7 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturn$args(JLjava/lang/String;J)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturnAugmented b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturnAugmented deleted file mode 100644 index ace84dda5..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturnAugmented +++ /dev/null @@ -1,55 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -ALOAD 7 -ALOAD 6 -LLOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 8 -ALOAD 6 -LLOAD 4 -LLOAD 8 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented$args (Ljava/lang/String;JJ)J -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented$args(Ljava/lang/String;JJ)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 3 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LCONST_1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturnAugmented1 b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturnAugmented1 deleted file mode 100644 index 2480db1e1..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallReturnAugmented1 +++ /dev/null @@ -1,57 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -ALOAD 7 -ALOAD 6 -LLOAD 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -LSTORE 8 -LLOAD 8 -ALOAD 6 -LLOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented1$args (JLjava/lang/String;J)J -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String resources/OnMethodTest] [J] -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallReturnAugmented1$args(JLjava/lang/String;J)J -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -LLOAD 0 -LRETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -LLOAD 0 -LCONST_1 -LADD -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -LLOAD 0 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallReturnAugmented1.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -LRETURN -MAXSTACK = 4 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallSampled b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallSampled deleted file mode 100644 index e4b920876..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallSampled +++ /dev/null @@ -1,82 +0,0 @@ -ICONST_0 -ISTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.$btrace$$level : I -DUP -ISTORE 5 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hit (I)Z -ISTORE 4 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] -LSTORE 6 -ASTORE 8 -ASTORE 9 -ILOAD 5 -IFLE L3 -L4 -FRAME APPEND [J java/lang/String resources/OnMethodTest] -ILOAD 4 -IFEQ L5 -L3 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.$btrace$$level : I -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -ALOAD 8 -LLOAD 6 -ALOAD 9 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampled$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L5 -FRAME SAME -ALOAD 9 -ALOAD 8 -LLOAD 6 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a Ljava/lang/String; L0 L6 1 -LOCALVARIABLE b J L0 L6 2 -MAXSTACK = 8 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampled$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Const) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampled.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallSampledAdaptive b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallSampledAdaptive deleted file mode 100644 index 774434c85..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallSampledAdaptive +++ /dev/null @@ -1,82 +0,0 @@ -ICONST_0 -ISTORE 4 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.$btrace$$level : I -DUP -ISTORE 5 -IFLE L1 -L2 -FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] -ICONST_2 -INVOKESTATIC org/openjdk/btrace/instr/MethodTracker.hitAdaptive (I)Z -ISTORE 4 -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J I I] [resources/OnMethodTest java/lang/String J] -LSTORE 6 -ASTORE 8 -ASTORE 9 -ILOAD 5 -IFLE L3 -L4 -FRAME APPEND [J java/lang/String resources/OnMethodTest] -ILOAD 4 -IFEQ L5 -L3 -FRAME SAME -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.$btrace$$level : I -ICONST_1 -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -ALOAD 8 -LLOAD 6 -ALOAD 9 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampledAdaptive$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L5 -FRAME SAME -ALOAD 9 -ALOAD 8 -LLOAD 6 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a Ljava/lang/String; L0 L6 1 -LOCALVARIABLE b J L0 L6 2 -MAXSTACK = 8 -MAXLOCALS = 10 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallSampledAdaptive$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -@Lorg/openjdk/btrace/core/annotations/Sampled;(kind=Lorg/openjdk/btrace/core/annotations/Sampled$Sampler;.Adaptive) // invisible -// annotable parameter count: 7 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 5 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 6 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallSampledAdaptive.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 8 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallStatic deleted file mode 100644 index d8d12e572..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/MethodCallStatic +++ /dev/null @@ -1,56 +0,0 @@ -LSTORE 4 -ASTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 6 -LLOAD 4 -LDC "static long resources.OnMethodTest#callTargetStatic(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevel" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallStatic$args (Ljava/lang/Object;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L1 -FRAME FULL [resources/OnMethodTest java/lang/String J J java/lang/String] [J] -ALOAD 6 -LLOAD 4 -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -MAXSTACK = 9 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$MethodCallStatic$args(Ljava/lang/Object;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevel", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTargetStatic"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 3 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 5 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/MethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NativeWithReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NativeWithReturn deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NativeWithoutReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NativeWithoutReturn deleted file mode 100644 index e69de29bb..000000000 diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewAfter deleted file mode 100644 index e0269d410..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewAfter +++ /dev/null @@ -1,49 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -LDC "java.util.HashMap" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewAfter$args (Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest java/util/HashMap] [java/util/HashMap] -ASTORE 2 -L2 -LINENUMBER 106 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE m Ljava/util/Map; L2 L3 2 -MAXSTACK = 4 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewAfter$args(Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newObject", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEW, clazz="/.*/", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayIntAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayIntAfter deleted file mode 100644 index 3b80ee5ce..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayIntAfter +++ /dev/null @@ -1,60 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntAfter$args (Ljava/lang/Object;[I)V -FRAME FULL [resources/OnMethodTest [I] [[I] -ASTORE 2 -L2 -LINENUMBER 110 L2 -ASTORE 3 -L3 -LINENUMBER 111 L3 -ASTORE 4 -L4 -LINENUMBER 112 L4 -ASTORE 5 -L5 -LINENUMBER 113 L5 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a [I L2 L6 2 -LOCALVARIABLE b [[I L3 L6 3 -LOCALVARIABLE c [Ljava/lang/String; L4 L6 4 -LOCALVARIABLE d [[Ljava/lang/String; L5 L6 5 -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntAfter$args(Ljava/lang/Object;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="int", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayIntBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayIntBefore deleted file mode 100644 index 5954c784a..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayIntBefore +++ /dev/null @@ -1,66 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "int" -ICONST_1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L1 -FRAME SAME1 I -L2 -LINENUMBER 110 L2 -ICONST_1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.$btrace$$level : I -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "int" -ICONST_2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME FULL [resources/OnMethodTest [I] [I I] -L4 -LINENUMBER 111 L4 -L5 -LINENUMBER 112 L5 -L6 -LINENUMBER 113 L6 -L7 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L7 0 -LOCALVARIABLE a [I L2 L7 1 -LOCALVARIABLE b [[I L4 L7 2 -LOCALVARIABLE c [Ljava/lang/String; L5 L7 3 -LOCALVARIABLE d [[Ljava/lang/String; L6 L7 4 -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayIntBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="int"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayIntBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayStringAfter b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayStringAfter deleted file mode 100644 index 79bd25416..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayStringAfter +++ /dev/null @@ -1,54 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -DUP -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -ALOAD 3 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringAfter$args (Ljava/lang/Object;[Ljava/lang/String;)V -FRAME FULL [resources/OnMethodTest [I [[I [Ljava/lang/String;] [[Ljava/lang/String;] -ASTORE 4 -L4 -LINENUMBER 112 L4 -ASTORE 5 -L5 -LINENUMBER 113 L5 -L6 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L6 0 -LOCALVARIABLE a [I L1 L6 1 -LOCALVARIABLE b [[I L2 L6 2 -LOCALVARIABLE c [Ljava/lang/String; L4 L6 4 -LOCALVARIABLE d [[Ljava/lang/String; L5 L6 5 -MAXSTACK = 3 -MAXLOCALS = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringAfter$args(Ljava/lang/Object;[Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="java.lang.String", where=Lorg/openjdk/btrace/core/annotations/Where;.AFTER), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringAfter.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayStringBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayStringBefore deleted file mode 100644 index 2489dfc7d..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewArrayStringBefore +++ /dev/null @@ -1,62 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L3 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L3 -ALOAD 0 -LDC "java.lang.String" -ICONST_1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L3 -FRAME FULL [resources/OnMethodTest [I [[I] [I] -L4 -LINENUMBER 112 L4 -ICONST_1 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.$btrace$$level : I -IF_ICMPLT L5 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L5 -ALOAD 0 -LDC "java.lang.String" -ICONST_2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args (Ljava/lang/Object;Ljava/lang/String;I)V -L5 -FRAME FULL [resources/OnMethodTest [I [[I [Ljava/lang/String;] [I I] -L6 -LINENUMBER 113 L6 -L7 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L7 0 -LOCALVARIABLE a [I L1 L7 1 -LOCALVARIABLE b [[I L2 L7 2 -LOCALVARIABLE c [Ljava/lang/String; L4 L7 3 -LOCALVARIABLE d [[Ljava/lang/String; L6 L7 4 -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewArrayStringBefore$args(Ljava/lang/Object;Ljava/lang/String;I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newArray", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEWARRAY, clazz="java.lang.String"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewArrayStringBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewBefore b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewBefore deleted file mode 100644 index b807d736c..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NewBefore +++ /dev/null @@ -1,44 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -LDC "java.util.HashMap" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NewBefore$args (Ljava/lang/Object;Ljava/lang/String;)V -L1 -FRAME SAME -L2 -LINENUMBER 106 L2 -L3 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L3 0 -LOCALVARIABLE m Ljava/util/Map; L2 L3 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NewBefore$args(Ljava/lang/Object;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="newObject", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.NEW, clazz="/.*/"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 2 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NewBefore.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 2 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NoArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NoArgs deleted file mode 100644 index 41185cf48..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NoArgs +++ /dev/null @@ -1,37 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgs$argsEmpty (Ljava/lang/Object;)V -FRAME SAME - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgs$argsEmpty(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NoArgsEntryReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NoArgsEntryReturn deleted file mode 100644 index 23902f577..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/NoArgsEntryReturn +++ /dev/null @@ -1,85 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.$btrace$$level : I -DUP -ISTORE 6 -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyEntry (Ljava/lang/Object;)V -FRAME APPEND [I] -ILOAD 6 -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -ALOAD 0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyReturn (Ljava/lang/Object;)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L2 0 -LOCALVARIABLE a Ljava/lang/String; L0 L2 1 -LOCALVARIABLE b J L0 L2 2 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 4 -LOCALVARIABLE d [I L0 L2 5 -MAXSTACK = 4 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyEntry(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "entry" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$NoArgsEntryReturn$argsEmptyReturn(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "return" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/NoArgsEntryReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgs deleted file mode 100644 index aadecf772..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgs +++ /dev/null @@ -1,39 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ALOAD 0 -LLOAD 1 -ALOAD 3 -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgs$args (Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgs$args(Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args$static", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 5 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgsReturn b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgsReturn deleted file mode 100644 index 34ce3e548..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgsReturn +++ /dev/null @@ -1,51 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.$btrace$$level : I -ICONST_1 -IF_ICMPLT L1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L1 -DUP2 -LSTORE 5 -ALOAD 0 -LLOAD 5 -LLOAD 1 -ALOAD 3 -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsReturn$args (Ljava/lang/String;JJ[Ljava/lang/String;[I)V -L1 -FRAME SAME1 J -L2 -LOCALVARIABLE a Ljava/lang/String; L0 L2 0 -LOCALVARIABLE b J L0 L2 1 -LOCALVARIABLE c [Ljava/lang/String; L0 L2 3 -LOCALVARIABLE d [I L0 L2 4 -MAXSTACK = 9 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsReturn$args(Ljava/lang/String;JJ[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args$static", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.RETURN), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Return;() // parameter 1 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsReturn.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgsSelf deleted file mode 100644 index a9738cfb4..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticArgsSelf +++ /dev/null @@ -1,42 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ACONST_NULL -ALOAD 0 -LLOAD 1 -ALOAD 3 -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsSelf$args (Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -FRAME SAME -MAXSTACK = 6 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticArgsSelf$args(Ljava/lang/Object;Ljava/lang/String;J[Ljava/lang/String;[I)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="args$static", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticMethodCall b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticMethodCall deleted file mode 100644 index d50ffb524..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticMethodCall +++ /dev/null @@ -1,58 +0,0 @@ -LSTORE 4 -ASTORE 6 -ASTORE 7 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 6 -LLOAD 4 -ALOAD 7 -LDC "special long resources.OnMethodTest#callTarget(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevelStatic" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCall$args (Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L2 -FRAME FULL [java/lang/String J resources/OnMethodTest J java/lang/String resources/OnMethodTest] [J] -ALOAD 7 -ALOAD 6 -LLOAD 4 -L3 -LOCALVARIABLE a Ljava/lang/String; L0 L3 0 -LOCALVARIABLE b J L0 L3 1 -LOCALVARIABLE instance Lresources/OnMethodTest; L1 L3 3 -MAXSTACK = 9 -MAXLOCALS = 8 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCall$args(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevelStatic", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTarget"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 6 (visible) -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 3 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 4 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 5 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCall.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 7 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticMethodCallStatic b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticMethodCallStatic deleted file mode 100644 index 6f6848e8d..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticMethodCallStatic +++ /dev/null @@ -1,53 +0,0 @@ -LSTORE 4 -ASTORE 6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 6 -LLOAD 4 -LDC "static long resources.OnMethodTest#callTargetStatic(java.lang.String, long)" -LDC "resources.OnMethodTest" -LDC "callTopLevelStatic" -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCallStatic$args (Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -L2 -FRAME APPEND [resources/OnMethodTest J java/lang/String] -ALOAD 6 -LLOAD 4 -L3 -LOCALVARIABLE a Ljava/lang/String; L0 L3 0 -LOCALVARIABLE b J L0 L3 1 -LOCALVARIABLE instance Lresources/OnMethodTest; L1 L3 3 -MAXLOCALS = 7 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticMethodCallStatic$args(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="callTopLevelStatic", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.CALL, clazz="/.*\\.OnMethodTest/", method="callTargetStatic"), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 5 (visible) -@Lorg/openjdk/btrace/core/annotations/TargetMethodOrField;(fqn=true) // parameter 2 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 3 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 4 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticMethodCallStatic.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 6 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticNoArgs b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticNoArgs deleted file mode 100644 index c4e5eea19..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticNoArgs +++ /dev/null @@ -1,35 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgs$argsEmpty ()V -FRAME SAME -MAXSTACK = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgs$argsEmpty()V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="noargs$static", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgs.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 0 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticNoArgsSelf b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticNoArgsSelf deleted file mode 100644 index 4601b588e..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/StaticNoArgsSelf +++ /dev/null @@ -1,38 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.$btrace$$level : I -ICONST_1 -IF_ICMPLT L0 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L0 -ACONST_NULL -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgsSelf$argsEmpty (Ljava/lang/Object;)V -FRAME SAME -MAXSTACK = 2 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$StaticNoArgsSelf$argsEmpty(Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="noargs$static", enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 1 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args empty" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/StaticNoArgsSelf.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 1 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncEntry b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncEntry deleted file mode 100644 index 5d2372589..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncEntry +++ /dev/null @@ -1,58 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.$btrace$$level : I -ICONST_1 -IF_ICMPLT L6 -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LDC "sync" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncEntry$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L6 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest] -L7 -LINENUMBER 127 L7 -GOTO L8 -ASTORE 3 -ALOAD 3 -L8 -LINENUMBER 128 L8 -L5 -FRAME SAME1 java/lang/Throwable -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="sync", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_ENTRY), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncExit b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncExit deleted file mode 100644 index 82c479eec..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncExit +++ /dev/null @@ -1,72 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -L6 -LINENUMBER 127 L6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.$btrace$$level : I -ICONST_1 -IF_ICMPLT L7 -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L7 -FRAME FULL [resources/OnMethodTest resources/OnMethodTest resources/OnMethodTest] [resources/OnMethodTest] -GOTO L8 -ASTORE 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.$btrace$$level : I -ICONST_1 -IF_ICMPLT L9 -DUP -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L9 -FRAME FULL [resources/OnMethodTest java/lang/Object T java/lang/Throwable java/lang/Object] [java/lang/Object] -ALOAD 3 -L8 -LINENUMBER 128 L8 -FRAME FULL [resources/OnMethodTest] [] -L5 -FRAME SAME1 java/lang/Throwable -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="sync", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_EXIT), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncMEntry b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncMEntry deleted file mode 100644 index 68a411106..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncMEntry +++ /dev/null @@ -1,58 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.$btrace$$level : I -ICONST_1 -IF_ICMPLT L6 -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L6 -ALOAD 0 -LDC "syncM" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncMEntry$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L6 -FRAME FULL [resources/OnMethodTest java/lang/Object java/lang/Object] [java/lang/Object] -L7 -LINENUMBER 167 L7 -GOTO L8 -ASTORE 3 -ALOAD 3 -L8 -LINENUMBER 168 L8 -L5 -FRAME SAME1 java/lang/Throwable -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 4 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMEntry$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="syncM", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_ENTRY), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMEntry.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncMExit b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncMExit deleted file mode 100644 index 79e7d2d58..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/SyncMExit +++ /dev/null @@ -1,72 +0,0 @@ -TRYCATCHBLOCK L4 L5 L5 java/lang/Throwable -L6 -LINENUMBER 167 L6 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.$btrace$$level : I -ICONST_1 -IF_ICMPLT L7 -DUP -ASTORE 2 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L7 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 2 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L7 -FRAME FULL [resources/OnMethodTest java/lang/Object java/lang/Object] [java/lang/Object] -GOTO L8 -ASTORE 3 -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.$btrace$$level : I -ICONST_1 -IF_ICMPLT L9 -DUP -ASTORE 4 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L9 -ALOAD 0 -LDC "resources.OnMethodTest" -ALOAD 4 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -L9 -FRAME FULL [resources/OnMethodTest java/lang/Object T java/lang/Throwable java/lang/Object] [java/lang/Object] -ALOAD 3 -L8 -LINENUMBER 168 L8 -FRAME FULL [resources/OnMethodTest] [] -L5 -FRAME SAME1 java/lang/Throwable -ATHROW -LOCALVARIABLE this Lresources/OnMethodTest; L4 L5 0 -MAXSTACK = 4 -MAXLOCALS = 5 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$SyncMExit$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="syncM", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.SYNC_EXIT), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 3 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 2 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/SyncMExit.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 3 \ No newline at end of file diff --git a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Throw b/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Throw deleted file mode 100644 index 4b064833d..000000000 --- a/btrace-instr/src/test/resources/instrumentorTestData/static/onmethod/leveled/Throw +++ /dev/null @@ -1,58 +0,0 @@ -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.$btrace$$level : I -ICONST_1 -IF_ICMPLT L2 -DUP -ASTORE 1 -INVOKESTATIC org/openjdk/btrace/runtime/LinkingFlag.get ()I -IFNE L2 -ALOAD 0 -LDC "resources.OnMethodTest" -LDC "exception" -ALOAD 1 -INVOKESTATIC resources/OnMethodTest.$btrace$org$openjdk$btrace$runtime$auxiliary$Throw$args (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V -L2 -FRAME FULL [resources/OnMethodTest java/io/IOException] [java/io/IOException] -FRAME FULL [resources/OnMethodTest] [java/io/IOException] -ASTORE 2 -L3 -LINENUMBER 85 L3 -ALOAD 2 -L4 -LINENUMBER 87 L4 -L5 -LOCALVARIABLE e Ljava/io/IOException; L3 L4 2 -LOCALVARIABLE this Lresources/OnMethodTest; L0 L5 0 -MAXSTACK = 5 -MAXLOCALS = 3 - -// access flags 0xA -private static $btrace$org$openjdk$btrace$runtime$auxiliary$Throw$args(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V -@Lorg/openjdk/btrace/core/annotations/OnMethod;(clazz="/.*\\.OnMethodTest/", method="exception", location=@Lorg/openjdk/btrace/core/annotations/Location;(value=Lorg/openjdk/btrace/core/annotations/Kind;.THROW), enableAt=@Lorg/openjdk/btrace/core/annotations/Level;(value=">=1")) -// annotable parameter count: 4 (visible) -@Lorg/openjdk/btrace/core/annotations/Self;() // parameter 0 -@Lorg/openjdk/btrace/core/annotations/ProbeClassName;() // parameter 1 -@Lorg/openjdk/btrace/core/annotations/ProbeMethodName;() // parameter 2 -@Lorg/openjdk/btrace/core/annotations/TargetInstance;() // parameter 3 -TRYCATCHBLOCK L0 L1 L1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKESTATIC org/openjdk/btrace/runtime/BTraceRuntimeAccess.enter (Lorg/openjdk/btrace/core/BTraceRuntimeBridge;)Z -IFNE L0 -RETURN -L0 -FRAME SAME -LDC "args" -INVOKESTATIC org/openjdk/btrace/core/BTraceUtils.println (Ljava/lang/Object;)V -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -L1 -FRAME SAME1 java/lang/Throwable -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -DUP_X1 -SWAP -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.handleException (Ljava/lang/Throwable;)V (itf) -GETSTATIC org/openjdk/btrace/runtime/auxiliary/Throw.runtime : Lorg/openjdk/btrace/core/BTraceRuntimeBridge; -INVOKEINTERFACE org/openjdk/btrace/core/BTraceRuntimeBridge.leave ()V (itf) -RETURN -MAXSTACK = 3 -MAXLOCALS = 4 \ No newline at end of file diff --git a/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/BTraceRuntimeImpl_8.java b/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/BTraceRuntimeImpl_8.java index f523fbb74..5101cec82 100644 --- a/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/BTraceRuntimeImpl_8.java +++ b/btrace-runtime/src/main/java/org/openjdk/btrace/runtime/BTraceRuntimeImpl_8.java @@ -195,12 +195,28 @@ public void newPerfCounter(Object value, String name, String desc) { @CallerSensitive @Override public ClassLoader getCallerClassLoader(int stackDec) { - return Reflection.getCallerClass(stackDec + 1).getClassLoader(); + int depth = stackDec + 1; + Class cls; + while ((cls = Reflection.getCallerClass(depth)) != null) { + if (!cls.getName().startsWith("org.openjdk.btrace.runtime.auxiliary.")) { + return cls.getClassLoader(); + } + depth++; + } + return null; } @Override public Class getCallerClass(int stackDec) { - return Reflection.getCallerClass(stackDec + 1); + int depth = stackDec + 1; + Class cls; + while ((cls = Reflection.getCallerClass(depth)) != null) { + if (!cls.getName().startsWith("org.openjdk.btrace.runtime.auxiliary.")) { + return cls; + } + depth++; + } + return null; } @Override diff --git a/btrace-runtime/src/main/java11/org/openjdk/btrace/runtime/BTraceRuntimeImpl_11.java b/btrace-runtime/src/main/java11/org/openjdk/btrace/runtime/BTraceRuntimeImpl_11.java index 93a1f0c7c..28cba7022 100644 --- a/btrace-runtime/src/main/java11/org/openjdk/btrace/runtime/BTraceRuntimeImpl_11.java +++ b/btrace-runtime/src/main/java11/org/openjdk/btrace/runtime/BTraceRuntimeImpl_11.java @@ -274,6 +274,9 @@ public ClassLoader getCallerClassLoader(int stackDec) { StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE) .forEach( f -> { + if (f.getDeclaringClass().getName().startsWith("org.openjdk.btrace.runtime.auxiliary.")) { + return; + } if (cont.getAndDecrement() == 0) { cl.compareAndSet(null, f.getDeclaringClass().getClassLoader()); } @@ -288,6 +291,9 @@ public Class getCallerClass(int stackDec) { StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE) .forEach( f -> { + if (f.getDeclaringClass().getName().startsWith("org.openjdk.btrace.runtime.auxiliary.")) { + return; + } if (cont.getAndDecrement() == 0) { cl.compareAndSet(null, f.getDeclaringClass()); } diff --git a/btrace-runtime/src/main/java15/org/openjdk/btrace/runtime/Indy.java b/btrace-runtime/src/main/java15/org/openjdk/btrace/runtime/Indy.java deleted file mode 100644 index 653938155..000000000 --- a/btrace-runtime/src/main/java15/org/openjdk/btrace/runtime/Indy.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.openjdk.btrace.runtime; - -import org.openjdk.btrace.core.HandlerRepository; - -import java.lang.invoke.CallSite; -import java.lang.invoke.ConstantCallSite; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; - -/** Invoke-dynamic linking support class */ -public final class Indy { - // Indy must reside in bootstrap but the HandlerRepository implementation is in agent area. - // This field will be dynamically set from the actual HandlerRepository implementation class - // static initializer. - public static volatile HandlerRepository repository = null; - - public static CallSite bootstrap( - MethodHandles.Lookup caller, String name, MethodType type, String probeClassName) - throws Exception { - assert repository != null; - MethodHandle mh; - try { - byte[] classData = - repository.getProbeHandler( - caller.lookupClass().getName(), probeClassName, name, type.toMethodDescriptorString()); - - caller = - caller.defineHiddenClass(classData, false, MethodHandles.Lookup.ClassOption.NESTMATE); - mh = caller.findStatic(caller.lookupClass(), name.substring(name.lastIndexOf("$") + 1), type); - } catch (Throwable t) { - // if unable to properly link just ignore the instrumentation - MethodHandle noopHandle = - MethodHandles.lookup().findStatic(Indy.class, "noop", MethodType.methodType(void.class)); - mh = MethodHandles.dropArguments(noopHandle, 0, type.parameterArray()); - } - - return new ConstantCallSite(mh); - } - - public static void noop() {} -} diff --git a/btrace-runtime/src/main/java9/org/openjdk/btrace/runtime/BTraceRuntimeImpl_9.java b/btrace-runtime/src/main/java9/org/openjdk/btrace/runtime/BTraceRuntimeImpl_9.java index b54c30c38..7d9e9c35a 100644 --- a/btrace-runtime/src/main/java9/org/openjdk/btrace/runtime/BTraceRuntimeImpl_9.java +++ b/btrace-runtime/src/main/java9/org/openjdk/btrace/runtime/BTraceRuntimeImpl_9.java @@ -222,6 +222,9 @@ public ClassLoader getCallerClassLoader(int stackDec) { StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE) .forEach( f -> { + if (f.getDeclaringClass().getName().startsWith("org.openjdk.btrace.runtime.auxiliary.")) { + return; + } if (cont.getAndDecrement() == 0) { cl.compareAndSet(null, f.getDeclaringClass().getClassLoader()); } @@ -236,6 +239,9 @@ public Class getCallerClass(int stackDec) { StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE) .forEach( f -> { + if (f.getDeclaringClass().getName().startsWith("org.openjdk.btrace.runtime.auxiliary.")) { + return; + } if (cont.getAndDecrement() == 0) { cl.compareAndSet(null, f.getDeclaringClass()); } diff --git a/docs/README.md b/docs/README.md index 1a1364691..d5add2248 100644 --- a/docs/README.md +++ b/docs/README.md @@ -68,7 +68,7 @@ Tip: Want latency histograms fast? See [Quick Start: Histogram Metrics Extension ### Deployment & Operations - **Installation** → [Getting Started: Installation](gettingStarted.md#installation) -- **Three Deployment Modes** → [Getting Started: Running BTrace](gettingStarted.md#three-ways-to-run-btrace) +- **Deployment Modes** → [Getting Started: Running BTrace](gettingStarted.md#four-ways-to-run-btrace) - **Docker & Containers** → [Getting Started: Containers](gettingStarted.md#btrace-in-containers-and-kubernetes) - **Kubernetes** → [Getting Started: K8s](gettingStarted.md#btrace-in-containers-and-kubernetes), [FAQ: Microservices](faq.md#can-i-use-btrace-with-microservices), [Troubleshooting: K8s](troubleshooting.md#kubernetes-and-cloud-deployments) - **Performance Tuning** → [FAQ: Performance Impact](faq.md#whats-the-performance-impact-of-btrace), [Troubleshooting: Performance](troubleshooting.md#performance-issues) @@ -87,6 +87,12 @@ Tip: Want latency histograms fast? See [Quick Start: Histogram Metrics Extension - **JMX Export** → [Quick Reference: @Export](quickReference.md#export), [FAQ: Monitoring Integration](faq.md#can-i-integrate-btrace-with-monitoring-systems) - **Service Mesh** → [FAQ: Service Mesh](faq.md#does-btrace-work-with-service-meshes-istiolinkerd) +### Architecture +- **Masked JAR** → [Masked JAR Architecture](architecture/MaskedJarArchitecture.md) — single-JAR distribution with classdata masking +- **v2 Binary Protocol** → [Version 2 Protocol Architecture](architecture/Version2ProtocolArchitecture.md) — custom binary serialization +- **Extension Framework** → [Extension invokedynamic Bridge](architecture/ExtensionInvokeDynamicBridge.md), [Extension Configuration](architecture/ExtensionConfiguration.md), [Extension Manifest](architecture/ExtensionManifestFormat.md), [Extension Storage](architecture/ExtensionStorageDesign.md) +- **Instrumentation** → [BTrace Instrumentation Analysis](architecture/BTraceInstrAnalysis.md) + ## Sample Scripts BTrace includes 50+ sample scripts demonstrating real-world use cases: @@ -124,7 +130,7 @@ BTrace is an open-source project welcoming contributions. To contribute: ## Version Information - **Current Version**: Check [GitHub Releases](https://github.com/btraceio/btrace/releases/latest) -- **Java Compatibility**: Java 8-20 +- **Java Compatibility**: Java 8-25 - **License**: GPLv2 with Classpath Exception ## Documentation Feedback diff --git a/docs/architecture/MaskedJarArchitecture.md b/docs/architecture/MaskedJarArchitecture.md new file mode 100644 index 000000000..498c48de3 --- /dev/null +++ b/docs/architecture/MaskedJarArchitecture.md @@ -0,0 +1,149 @@ +# Masked JAR Architecture + +## Overview + +BTrace uses a single-JAR distribution (`btrace.jar`) with a **classdata masking** technique to minimize bootstrap classloader pollution. This architecture packs agent, client, and shared classes into one JAR while keeping only essential API classes visible to the bootstrap classloader. + +The key insight: files with a `.classdata` extension are invisible to the JVM's built-in classloading, so non-bootstrap classes can coexist in the same JAR without leaking into the bootstrap classloader. + +## Problem + +Traditional Java agents add their entire JAR to the bootstrap classloader via `Boot-Class-Path: .` in the manifest. For BTrace, this would expose ~1500+ classes (ASM, compiler, instrumentation engine, client) to every class in the JVM. This causes: + +- Namespace pollution (classes visible where they shouldn't be) +- Potential conflicts with application dependencies (e.g., different ASM versions) +- Increased memory footprint in the bootstrap classloader + +The previous multi-JAR approach (`btrace-agent.jar`, `btrace-boot.jar`, `btrace-client.jar`) solved this by splitting classes across JARs but introduced hardcoded co-location assumptions that broke alternative distribution methods like jbang and Maven repositories. + +## Architecture + +### JAR Structure + +``` +btrace.jar (~2.9 MB) +├── org/openjdk/btrace/boot/*.class # Entry point (Loader, MaskedClassLoader, MaskedJarUtils) +├── org/openjdk/btrace/core/*.class # Bootstrap: core API (~42 classes) +├── org/openjdk/btrace/core/extensions/*.class # Bootstrap: extension API +├── org/openjdk/btrace/core/types/*.class # Bootstrap: type definitions +├── org/openjdk/btrace/core/jfr/*.class # Bootstrap: JFR integration +├── org/openjdk/btrace/runtime/*.class # Bootstrap: runtime support +├── org/openjdk/btrace/libs/org/slf4j/** # Bootstrap: relocated SLF4J +├── META-INF/btrace/agent/*.classdata # Masked: agent classes +├── META-INF/btrace/client/*.classdata # Masked: client classes +├── META-INF/btrace/shared/*.classdata # Masked: shared classes (ASM, protocol, etc.) +└── META-INF/MANIFEST.MF +``` + +**Bootstrap classes** (~112 total): Only the core API, runtime support, and SLF4J logging are stored as regular `.class` files. These are visible to the bootstrap classloader because the manifest declares `Boot-Class-Path: .`. + +**Masked classes** (~1600+): Agent, client, and shared classes are stored as `.classdata` files under `META-INF/btrace/`. The JVM's class loading ignores these files entirely. They are loaded on demand by `MaskedClassLoader`. + +### Manifest + +``` +Premain-Class: org.openjdk.btrace.boot.Loader +Agent-Class: org.openjdk.btrace.boot.Loader +Main-Class: org.openjdk.btrace.boot.Loader +Can-Redefine-Classes: true +Can-Retransform-Classes: true +Boot-Class-Path: . +BTrace-Agent-Main: org.openjdk.btrace.agent.Main +BTrace-Client-Main: org.openjdk.btrace.client.Main +``` + +`Loader` is the single entry point for all three modes. The actual agent/client main classes are specified as manifest attributes and loaded reflectively via `MaskedClassLoader`. + +## Components + +### btrace-boot Module + +**Location:** `btrace-boot/` + +Contains three classes, all loaded by the bootstrap classloader: + +#### Loader (`org.openjdk.btrace.boot.Loader`) + +Entry point for all three modes: + +| Mode | Entry Method | Invocation | +|------|-------------|------------| +| Load-time agent | `premain(String, Instrumentation)` | `-javaagent:btrace.jar` | +| Dynamic attach | `agentmain(String, Instrumentation)` | `VirtualMachine.loadAgent()` | +| Client CLI | `main(String[])` | `java -jar btrace.jar` | + +Each mode creates a `MaskedClassLoader` for the appropriate section (agent or client), loads the main class from the manifest attribute, and invokes it reflectively. + +**Agent mode classloader hierarchy:** +``` +Bootstrap CL (core API, runtime, Loader) + └── MaskedClassLoader[agent] (parent=null) + Loads from: META-INF/btrace/agent/*.classdata + Fallback: META-INF/btrace/shared/*.classdata +``` + +Using `null` as the parent ensures bootstrap-visible classes (like `BTraceRuntimeAccess`) are loaded from the bootstrap classloader rather than the agent's classloader. This is critical because probe classes—defined via the bootstrap classloader—must see the same class instances the agent uses. + +**Client mode classloader hierarchy:** +``` +Bootstrap CL (core API, runtime, Loader) + └── System CL + └── MaskedClassLoader[client] (parent=System CL) + Loads from: META-INF/btrace/client/*.classdata + Fallback: META-INF/btrace/shared/*.classdata +``` + +#### MaskedClassLoader (`org.openjdk.btrace.boot.MaskedClassLoader`) + +A `URLClassLoader` subclass that loads classes from `.classdata` files. The lookup order for `findClass(name)`: + +1. Check section-specific path: `META-INF/btrace/{section}/{class-path}.classdata` +2. Check shared path: `META-INF/btrace/shared/{class-path}.classdata` +3. Throw `ClassNotFoundException` (delegates to parent via standard classloader contract) + +Resource loading (`findResource`, `getResourceAsStream`) follows the same pattern: section-specific first, then shared, then the JAR root. + +#### MaskedJarUtils (`org.openjdk.btrace.boot.MaskedJarUtils`) + +Utility class for detecting masked JARs. A JAR is identified as masked by the presence of a `META-INF/btrace/shared/` entry. Used by `Client.java` and integration tests to detect whether they are running from a masked JAR or the legacy multi-JAR layout. + +### btrace-bootstrap Module + +**Location:** `btrace-bootstrap/` + +A build-only module that defines which classes belong in the bootstrap section via a `bootIncludes` filter closure. This filter is used by the `btraceJar` task in `btrace-dist/build.gradle` to separate classes into `.class` (bootstrap) vs `.classdata` (masked) during JAR assembly. + +**Bootstrap inclusion criteria:** +- `org/openjdk/btrace/core/` — core API (excluding Messages) +- `org/openjdk/btrace/runtime/` — runtime support +- `org/openjdk/btrace/core/extensions/` — extension API +- `org/openjdk/btrace/libs/org/slf4j/` — relocated SLF4J (logging from bootstrap code) + +**Explicitly excluded from bootstrap:** +- ASM classes (loaded via shared section) +- JCTools queues (loaded via shared section) +- Communication protocol classes +- Annotation and handler classes + +## Build Process + +The `btrace-dist/build.gradle` `btraceJar` task assembles the masked JAR: + +1. **`prepareAgentClassdata`**: Extracts classes from the agent shadow JAR, renames `.class` → `.classdata`, places under `META-INF/btrace/agent/` +2. **`prepareClientClassdata`**: Same for the client shadow JAR, placed under `META-INF/btrace/client/` +3. **`btraceJar`**: Combines bootstrap `.class` files (filtered by `btrace-bootstrap`) with the `.classdata` sections and shared classes into the final JAR + +Shared classes (ASM, protocol, etc.) are automatically placed in `META-INF/btrace/shared/` and are accessible to both agent and client classloaders. + +## Debugging + +Enable debug output with: +```bash +java -Dbtrace.boot.debug=true -jar btrace.jar ... +``` + +This prints classloader decisions to stderr, prefixed with `[BTrace Boot]`. + +## Backward Compatibility + +The masked JAR coexists with the legacy multi-JAR distribution. Detection logic in `Client.java` and `RuntimeTest` checks for `btrace.jar` first and falls back to `btrace-agent.jar` if not found. The `--agent-jar` and `--boot-jar` CLI flags allow explicit path overrides for any layout. diff --git a/docs/architecture/Version2ProtocolArchitecture.md b/docs/architecture/Version2ProtocolArchitecture.md index 84469cfb0..37f9ad696 100644 --- a/docs/architecture/Version2ProtocolArchitecture.md +++ b/docs/architecture/Version2ProtocolArchitecture.md @@ -1,8 +1,8 @@ # BTrace v2 Binary Protocol Architecture -**Document Version:** 1.0 -**Last Updated:** December 2025 -**Status:** Implementation in Progress +**Document Version:** 1.1 +**Last Updated:** February 2026 +**Status:** Implemented (v2.3.0+) --- @@ -383,7 +383,7 @@ Command status = wire.read(in); └──────────────┴──────────────┴────────────────────────────┘ ``` -**Version Byte:** Always `0x02` for v2 protocol +**Version Byte:** Current version is `0x03` (bumped from `0x02` after binary format changes to ErrorCommand and GridDataCommand) **Type Byte:** Command type identifier (0-16) @@ -584,17 +584,21 @@ agent.onCommand(v1Cmd); **Special Cases:** 1. **ErrorCommand:** - - v1: Contains full `Throwable` object - - v2: Contains error code + message string - - **Conversion:** Extract message from Throwable, discard stack trace - - **Rationale:** Stack traces don't serialize well across languages + - v1: Contains full `Throwable` object (type + message + stack trace) + - v2: Contains exception class name, message, and stack trace as strings + - **Conversion:** Adapter extracts exception class, message, and stack trace from the `Throwable`; on deserialization, wraps them in a `RemoteException` that preserves the original type and trace 2. **GridDataCommand:** - - v1: Object[][] (mixed types) - - v2: Typed cells (String, Integer, Long, Float, Double, Boolean, null) - - **Conversion:** Type preservation via explicit type codes + - v1: Object[][] (mixed types), optional column names + - v2: Typed cells (String, Integer, Long, Float, Double, Boolean, HistogramData, null), column names preserved + - **Conversion:** Type preservation via explicit type codes; `HistogramData` has a dedicated encoding -3. **StatusCommand:** +3. **NumberMapDataCommand:** + - v1: `Map` (can carry any `Number` subclass) + - v2: Typed encoding for int/long/float/double plus dedicated codes for `BigInteger` and `BigDecimal` + - **Conversion:** Preserves precision for all standard `Number` types + +4. **StatusCommand:** - v1: Single int (positive=success, negative=failure) - v2: flag (int) + success (boolean) - **Conversion:** `flag = abs(v1), success = (v1 > 0)` @@ -760,28 +764,16 @@ public class WireIOV2Adapter implements WireProtocol { ### For Developers -#### Phase 1: Testing (Current Phase) -- Expand test coverage for all 17 command types -- Add edge case tests (null values, large payloads) -- Improve error handling -- Run performance benchmarks - -#### Phase 2: Integration -- Implement protocol negotiation -- Refactor RemoteClient and Client -- Add WireProtocol abstraction -- Test backward compatibility - -#### Phase 3: Validation -- Integration tests with real agent/client -- Backward compatibility test matrix -- Performance benchmarks -- Stress tests - -#### Phase 4: Rollout +#### Completed +- All 17 command types implemented and tested +- Protocol negotiation implemented +- RemoteClient and Client refactored with WireProtocol abstraction +- Backward compatibility verified (v1 clients work with v2 agents and vice versa) - Default to v2 with automatic fallback to v1 -- Monitor for issues -- Gradual adoption across environments + +#### Post-Release Technical Debt +- Add v2-only end-to-end integration test suite +- Stress tests under sustained high-frequency tracing ### Rollback Plan @@ -860,11 +852,12 @@ The BTrace v2 binary protocol delivers significant performance improvements (3-6 - Performance gains are substantial and validated by benchmarks - Migration is transparent to end users -**Next Steps:** -- Complete Phase 1 testing -- Implement protocol negotiation (Phase 2) -- Integrate into RemoteClient/Client (Phase 3) -- Validate with comprehensive tests (Phase 4) +**Implementation status:** +- Protocol version bumped to 3 after binary format changes +- All 17 command types covered by unit tests (26+ tests) +- ErrorCommand preserves exception class, message, and stack trace via RemoteException +- GridDataCommand preserves HistogramData and column names +- NumberMapDataCommand preserves BigInteger and BigDecimal --- @@ -872,5 +865,4 @@ The BTrace v2 binary protocol delivers significant performance improvements (3-6 - Implementation: `btrace-core/src/main/java/org/openjdk/btrace/core/comm/v2/` - Tests: `btrace-core/src/test/java/org/openjdk/btrace/core/comm/v2/` -- Plan: `/Users/jaroslav.bachorik/.claude/plans/flickering-sleeping-fern.md` - README: `btrace-core/src/main/java/org/openjdk/btrace/core/comm/v2/Readme.md` diff --git a/docs/plans/DistributionRestructuring.md b/docs/plans/DistributionRestructuring.md index 918284791..ffe31dec7 100644 --- a/docs/plans/DistributionRestructuring.md +++ b/docs/plans/DistributionRestructuring.md @@ -1,967 +1,57 @@ -# BTrace Distribution Restructuring Plan +# Plan: InvokeDynamic Isolation (Distribution Phase 3) -## Current Status +**Status:** Not Started +**Target:** v3.x (long-term) +**Prerequisites:** Masked JAR architecture (completed, see [MaskedJarArchitecture.md](../architecture/MaskedJarArchitecture.md)) -**Phase 1 (Alternative 1) - COMPLETE ✅** -- ✅ btrace-api module created -- ✅ apiJar task implemented (generates 14MB JAR) -- ✅ uberJar task implemented (generates 16MB JAR with embedded agent/boot JARs) -- ✅ Build system updated and tested -- ✅ CLI flags implementation (--agent-jar, --boot-jar, --extract-agent) -- ✅ Extraction command implemented -- ✅ Agent discovery logic updated (Client.java) -- ✅ Boot JAR override support (via existing bootClassPath mechanism) -- ✅ Usage messages updated -- ✅ Documentation updated with jbang examples -- ✅ Unit tests created (ClientTest, MainTest - 14 test cases) -- ✅ Test fixes for CI (reflection exception handling) -- ✅ Versioning plugin re-enabled -- ✅ PR created and ready for review +## Background -**Implementation Details:** -- **Pull Request:** #786 (Draft) -- **Branch:** btrace-feature-distro-tmp -- **Commits:** - - a1acfe95: feat: add --agent-jar, --boot-jar, --extract-agent CLI flags - - cd8fc7d3: test: add unit tests for CLI flags and JAR extraction - - 8f700b41: dist: add btrace-api module and uber JAR build configuration - - 3fb3ab37: test: fix reflection exception handling in MainTest - - 631e4d1b: build: enable versioning plugin in btrace-client -- **Files Changed:** 11 files, +1556 additions, -26 deletions -- **Base Branch:** develop (8979a800) - -**Last Updated:** 2026-01-01 - ---- +The current masked JAR architecture reduces bootstrap classloader pollution to ~112 classes. This plan proposes further reducing the bootstrap footprint to ~50 KB by replacing direct method calls in instrumented bytecode with `invokedynamic` instructions, following the approach pioneered by Elastic APM. ## Goal -Restructure BTrace distribution to support both: -1. **jbang integration** - Enable easy distribution and oneliner support via jbang -2. **Simplified structure** - Reduce complexity while maintaining functionality - -## User Requirements - -- **Dual goals**: Both jbang support AND simplified distribution equally important -- **Compatibility**: Gradual migration path (support old and new distributions for 1-2 versions) -- **JAR generation**: Both build-time AND runtime generation of btrace-agent.jar from btrace.jar -- **API JAR**: Full compile-time API with annotation processor (not just runtime) - -## Research Summary - -### Current BTrace Architecture -- **Three-JAR structure**: agent (system CL), boot (bootstrap CL), client (standalone) -- **Bootstrap classloader**: Only runtime API, core classes, services - minimized via manifest Boot-Class-Path -- **Hardcoded co-location**: Client discovers agent JAR by path manipulation, agent discovers boot JAR similarly -- **Files**: btrace-dist/build.gradle (assembly), btrace-agent/Main.java (boot discovery lines 748-753), btrace-client/Client.java (agent discovery lines 370-387) - -### Industry Research Findings -**OpenTelemetry**: Three-tier classloader (system → bootstrap → isolated agent CL), custom Gradle plugin for bootstrap marking -**Datadog dd-trace-java**: Multiple shadow JARs, custom DatadogClassLoader, agent-bootstrap module -**Elastic APM**: invokedynamic for isolation (only IndyBootstrapDispatcher in bootstrap), no shading needed -**ByteBuddy**: Separate API and agent JARs, ClassInjector API for bootstrap, lazy loading - -**Common patterns**: Minimal bootstrap, separate API from impl, shadow/shade plugins, child-first classloaders +Reduce the bootstrap classloader footprint from ~112 classes (~200 KB) to a single dispatcher class (~50 KB) by routing all instrumented bytecode through `invokedynamic`. -### jbang Blockers -- **Problem**: Hardcoded JAR co-location breaks with Maven repository structure (~/.m2/repository/) -- **Solution from existing analysis**: Add --agent-jar and --boot-jar CLI flags -- **Oneliner support**: Would benefit from simplified single-JAR entry point +## Architecture ---- +Based on Elastic APM's approach: instrumented bytecode uses `INVOKEDYNAMIC` instead of direct calls to BTrace runtime API. A tiny `IndyDispatcher` in the bootstrap classloader resolves these calls at first invocation. -## Alternative 1: "Embedded JARs with Dynamic Extraction" ⭐ - -### Architecture - -``` -btrace.jar (4+ MB - uber JAR) -├── META-INF/embedded/ -│ ├── btrace-agent.jar # Pre-built, ready to extract -│ └── btrace-boot.jar # Pre-built, ready to extract -├── org/openjdk/btrace/ -│ ├── client/** # Full client code -│ ├── agent/** # Full agent code -│ ├── compiler/** # Compiler -│ ├── core/** # Core classes -│ ├── runtime/** # Runtime API -│ └── instr/** # Instrumentation -└── Manifest: - Main-Class: org.openjdk.btrace.client.Main - BTrace-Agent-Embedded: META-INF/embedded/btrace-agent.jar - BTrace-Boot-Embedded: META-INF/embedded/btrace-boot.jar - -btrace-api.jar (~500 KB - compile-time API) -├── org.openjdk.btrace.core.annotations.* # All annotations -├── org.openjdk.btrace.compiler.processor.* # Annotation processor -└── org.openjdk.btrace.api.* # Shim/stub implementations - └── BTraceUtils (stub methods with empty bodies) ``` - -### Key Features - -- **Build-time generation**: agentJar and bootJar built separately, then embedded into uberJar -- **Runtime extraction**: `btrace --extract-agent [--output-dir DIR]` command -- **jbang integration**: Add `--agent-jar` and `--boot-jar` CLI flags for explicit paths -- **Backward compatibility**: Keep existing btrace-agent.jar, btrace-boot.jar, btrace-client.jar - -### Migration Path - -**Phase 1 (v2.3.0)**: Introduce new JARs alongside existing -**Phase 2 (v2.4.0)**: Deprecate old structure -**Phase 3 (v2.5.0)**: Remove old JARs - -### Pros and Cons - -**Pros**: -- ✅ Full backward compatibility during transition -- ✅ Simple mental model: btrace.jar has everything -- ✅ Works with jbang (via extraction or CLI flags) -- ✅ No classloader complexity changes -- ✅ Supports both build-time and runtime generation -- ✅ Minimal code changes - -**Cons**: -- ❌ Larger JAR size (~4 MB vs 2.3 MB, contains duplicates) -- ❌ Extraction overhead on first use (minimal, ~100ms) -- ❌ Doesn't reduce bootstrap classloader pollution (same as current) - ---- - -## Alternative 2: "Modular Bootstrap with Manifest Filtering" - -### Architecture - -``` -btrace.jar (3.5 MB - uber JAR with smart classloading) -├── org/openjdk/btrace/ -│ ├── client/** -│ ├── agent/** -│ ├── compiler/** -│ └── bootstrap/ # NEW - explicit bootstrap module -│ ├── core/** # Only classes needed in bootstrap -│ ├── runtime/** # Only runtime API -│ └── BootstrapLoader.java -└── Manifest: - Main-Class: org.openjdk.btrace.client.Main - BTrace-Bootstrap-Packages: org/openjdk/btrace/bootstrap/ - BTrace-Agent-Main: org.openjdk.btrace.agent.Main -``` - -### Key Features - -- **New btrace-bootstrap module**: Explicit separation of bootstrap classes -- **Manifest-driven filtering**: Agent JAR generated by filtering uber JAR using manifest metadata -- **Dynamic temp JAR creation**: Creates bootstrap JAR at runtime from manifest packages -- **Single JAR dual-use**: btrace.jar can serve as both client and -javaagent - -### Pros and Cons - -**Pros**: -- ✅ Single JAR can serve as both client and agent -- ✅ No duplicate classes (smaller than Alternative 1) -- ✅ Explicit bootstrap marking via module system -- ✅ Dynamic bootstrap JAR creation (no pre-extraction needed) -- ✅ Works with jbang -- ✅ Cleaner architecture (explicit modules) - -**Cons**: -- ❌ Requires new btrace-bootstrap module (refactoring) -- ❌ Temp JAR creation overhead (~100ms on agent startup) -- ❌ More complex build configuration (custom plugin) -- ❌ Manifest-driven filtering may miss edge cases - ---- - -## Alternative 3: "InvokeDynamic Isolation" (Long-term) - -### Architecture - -Based on Elastic APM's approach - use invokedynamic to eliminate need for most bootstrap classes. - -``` -btrace-bootstrap-minimal.jar (50 KB - TINY!) +btrace-bootstrap-minimal.jar (~50 KB) └── org/openjdk/btrace/indy/ └── IndyDispatcher.java # Only class in bootstrap CL ``` -### Key Concept - -**Current**: Instrumented bytecode directly calls BTrace runtime API -**InvokeDynamic**: Instrumented bytecode uses INVOKEDYNAMIC instruction, resolved via IndyDispatcher in bootstrap CL - -### Pros and Cons - -**Pros**: -- ✅ Minimal bootstrap footprint (50 KB vs 1.1 MB!) -- ✅ Modern architecture aligned with industry best practices -- ✅ Better classloader isolation -- ✅ JIT can inline through invokedynamic (performance) -- ✅ Simplified dependency management (no shading needed) -- ✅ Works perfectly with jbang - -**Cons**: -- ❌ Requires extensive refactoring (all instrumentation) -- ❌ Higher implementation complexity -- ❌ Requires Java 7+ (invokedynamic) -- ❌ Longer migration path (3+ versions) -- ❌ Performance overhead of invokedynamic resolution (first call only) -- ❌ Debugging is harder (indirect calls) - ---- - -## Recommendation: Hybrid Phased Approach - -### Strategy - -**Phase 1 (v2.3.0 - Immediate)**: Implement Alternative 1 -- Fastest path to jbang support -- Minimal code changes -- Full backward compatibility - -**Phase 2 (v2.4.0 - Medium-term)**: Add Alternative 2 elements -- Cleaner module boundaries -- Reduces JAR size -- Better maintainability - -**Phase 3 (v3.0.0 - Long-term)**: Consider Alternative 3 -- Industry best practice -- Requires significant refactoring -- Better done incrementally after Alt 1+2 - -### Justification - -1. **Alternative 1 works immediately** - No risky refactoring, proven patterns -2. **Alternative 2 improves architecture** - Natural evolution once Alt 1 is stable -3. **Alternative 3 is future-proof** - Best done after establishing new distribution structure - ---- - -## Implementation Plan: Phase 1 (Alternative 1) - -### 1. Create btrace-api Module - -**New module structure**: -``` -btrace-api/ -├── build.gradle -└── src/ - ├── main/java/org/openjdk/btrace/api/ - │ └── BTraceUtils.java (stub implementations) - └── main/resources/META-INF/services/ - └── javax.annotation.processing.Processor -``` - -**build.gradle**: -```gradle -plugins { - id 'java-library' -} - -dependencies { - implementation project(':btrace-core') - implementation project(':btrace-compiler') -} - -// Generate stub BTraceUtils with empty method bodies -task generateApiStubs { - // Parse btrace-runtime BTraceUtils - // Generate stub version with same signatures but empty bodies -} -``` - -### 2. Update btrace-dist/build.gradle - -**Add apiJar task**: -```gradle -task apiJar(type: ShadowJar) { - from(project(':btrace-core').sourceSets.main.output) { - include 'org/openjdk/btrace/core/annotations/**' - include 'org/openjdk/btrace/core/types/**' - } - from(project(':btrace-compiler').sourceSets.main.output) { - include 'org/openjdk/btrace/compiler/processor/**' - } - from(project(':btrace-api').sourceSets.main.output) - - manifest { - attributes 'Automatic-Module-Name': 'org.openjdk.btrace.api' - } - - archiveBaseName = 'btrace-api' -} -``` - -**Add uberJar task**: -```gradle -task uberJar(type: ShadowJar) { - dependsOn agentJar, bootJar - - // Include all modules - from(project(':btrace-client').sourceSets.main.output) - from(project(':btrace-agent').sourceSets.main.output) - from(project(':btrace-compiler').sourceSets.main.output) - from(project(':btrace-core').sourceSets.main.output) - from(project(':btrace-runtime').sourceSets.main.output) - from(project(':btrace-instr').sourceSets.main.output) - - // Embed pre-built JARs - from(agentJar.outputs.files) { - into 'META-INF/embedded' - rename { 'btrace-agent.jar' } - } - from(bootJar.outputs.files) { - into 'META-INF/embedded' - rename { 'btrace-boot.jar' } - } - - manifest { - attributes( - 'Main-Class': 'org.openjdk.btrace.client.Main', - 'BTrace-Agent-Embedded': 'META-INF/embedded/btrace-agent.jar', - 'BTrace-Boot-Embedded': 'META-INF/embedded/btrace-boot.jar', - 'BTrace-Version': version - ) - } - - archiveBaseName = 'btrace' -} -``` - -### 3. Add CLI Flags to Client - -**btrace-client/src/main/java/org/openjdk/btrace/client/Main.java**: - -Add PicoCLI options: -```java -@Option(names = {"--agent-jar"}, description = "Path to btrace-agent.jar (overrides auto-discovery)") -private File agentJarOverride; - -@Option(names = {"--boot-jar"}, description = "Path to btrace-boot.jar (overrides auto-discovery)") -private File bootJarOverride; - -@Option(names = {"--extract-agent"}, description = "Extract embedded agent JARs to directory") -private String extractAgentDir; -``` - -Modify agent discovery in Client.java: -```java -private String discoverAgentJar() { - // If --agent-jar provided, use it - if (agentJarOverride != null && agentJarOverride.exists()) { - return agentJarOverride.getAbsolutePath(); - } - - // Check for embedded JAR - if (isEmbeddedJarAvailable()) { - return extractEmbeddedAgentJar(); - } - - // Fall back to co-location discovery (existing logic) - return clientJarPath.replace("btrace-client.jar", "btrace-agent.jar"); -} -``` - -### 4. Implement Extraction Command - -**btrace-client/src/main/java/org/openjdk/btrace/client/Main.java**: - -```java -private void handleExtractAgent() { - if (extractAgentDir == null) { - return; // Not requested - } - - File outputDir = new File(extractAgentDir); - outputDir.mkdirs(); - - URL btraceLoc = Main.class.getProtectionDomain().getCodeSource().getLocation(); - try (JarFile btrace = new JarFile(new File(btraceLoc.toURI()))) { - extractJar(btrace, "META-INF/embedded/btrace-agent.jar", - new File(outputDir, "btrace-agent.jar")); - extractJar(btrace, "META-INF/embedded/btrace-boot.jar", - new File(outputDir, "btrace-boot.jar")); - - System.out.println("Extracted agent JARs to: " + outputDir.getAbsolutePath()); - System.exit(0); - } -} - -private void extractJar(JarFile source, String entryPath, File target) throws IOException { - JarEntry entry = source.getJarEntry(entryPath); - if (entry == null) { - throw new IOException("Embedded JAR not found: " + entryPath); - } - - try (InputStream in = source.getInputStream(entry); - OutputStream out = new FileOutputStream(target)) { - byte[] buffer = new byte[8192]; - int bytesRead; - while ((bytesRead = in.read(buffer)) != -1) { - out.write(buffer, 0, bytesRead); - } - } -} -``` - -### 5. Update Build Process - -**settings.gradle**: -```gradle -include 'btrace-api' -``` - -**Update distribution tasks** to include new JARs: -```gradle -task explodeJars { - dependsOn uberJar, apiJar, agentJar, bootJar, clientJar - - doLast { - copy { - from uberJar.outputs.files - from apiJar.outputs.files - from agentJar.outputs.files - from bootJar.outputs.files - from clientJar.outputs.files - into "${buildDir}/resources/main/${version}/libs" - } - } -} -``` - -### 6. Update Documentation - -**docs/GettingStarted.md**: Add section on new distribution structure -**docs/Readme.md**: Update with jbang usage examples -**CHANGELOG.md**: Document new JARs and CLI flags - ---- - -## Implementation Notes - -### Completed Work (2026-01-01) - -#### 1. btrace-api Module -**Location:** `btrace-api/` - -**Dependencies:** -```gradle -dependencies { - implementation project(':btrace-core') - implementation project(':btrace-compiler') -} -``` - -**Auto-discovered:** The module is automatically included by `settings.gradle` pattern matching (any directory with `build.gradle` starting with `btrace-`). - -#### 2. apiJar Task -**Location:** `btrace-dist/build.gradle:183-204` - -**Implementation:** -- Uses ShadowJar to create `btrace-api.jar` (14MB) -- Includes: annotations, types from btrace-core; processor from btrace-compiler -- No relocation/shading needed (API JAR) -- Sets `Automatic-Module-Name` manifest attribute - -**Output:** `btrace-dist/build/resources/main/v2.3.0-SNAPSHOT/libs/btrace-api.jar` - -#### 3. uberJar Task -**Location:** `btrace-dist/build.gradle:206-246` - -**Implementation:** -- Uses ShadowJar to merge all modules -- Relocates jctools, asm, slf4j to avoid conflicts -- **Embeds pre-built JARs** using `doLast` + Ant zip task: - ```groovy - doLast { - ant.zip(destfile: uberJarFile, update: true) { - zipfileset(file: agentJar, fullpath: 'META-INF/embedded/btrace-agent.jar') - zipfileset(file: bootJar, fullpath: 'META-INF/embedded/btrace-boot.jar') - } - } - ``` -- Sets manifest attributes for Main-Class and embedded JAR paths - -**Output:** `btrace-dist/build/resources/main/v2.3.0-SNAPSHOT/libs/btrace.jar` (16MB) - -**Embedded files verified:** -- `META-INF/embedded/btrace-agent.jar` (867KB) -- `META-INF/embedded/btrace-boot.jar` (1.1MB) - -#### 4. Build Dependencies Updated -**Location:** `btrace-dist/build.gradle:391-398` - -All distribution tasks now depend on `apiJar` and `uberJar`: -- buildTgz, buildZip, buildSdkmanZip -- buildDeb, buildRpm -- buildDockerContext - -#### 5. Bug Fixes -- Restored `Service` import in `MethodVerifier.java` (removed by previous refactoring) -- Removed incorrect `@Override` annotations in `BTraceRuntimeAccess.java` -- Re-added `btrace-services-api` dependency to `btrace-instr` - -### Deviations from Original Plan - -1. **Embedding Approach:** Used Ant zip task in `doLast` instead of Shadow's `from()` to prevent JAR extraction -2. **API JAR Content:** Includes full classes instead of stubs (simpler, works for compile-time) -3. **No generateApiStubs task:** Not needed with current approach - -### Implementation Updates (2026-01-01) - -#### 1. CLI Flags Added to Main.java -**Location:** `btrace-client/src/main/java/org/openjdk/btrace/client/Main.java` - -**New static fields:** -- `AGENT_JAR_OVERRIDE` - stores path to override agent JAR -- `BOOT_JAR_OVERRIDE` - stores path to override boot JAR -- `EXTRACT_AGENT_DIR` - stores directory for agent extraction - -**New CLI flags:** -- `--agent-jar ` - Override agent JAR auto-discovery -- `--boot-jar ` - Override boot JAR auto-discovery -- `--extract-agent [dir]` - Extract embedded JARs (defaults to current directory) - -#### 2. Extraction Command Implemented -**Location:** `btrace-client/src/main/java/org/openjdk/btrace/client/Main.java:470-518` - -**Methods:** -- `handleExtractAgent()` - Main extraction logic -- `extractJar(JarFile, String, File)` - Helper to extract single JAR entry - -**Behavior:** -- Extracts `META-INF/embedded/btrace-agent.jar` and `META-INF/embedded/btrace-boot.jar` -- Creates output directory if needed -- Prints success message with extracted file locations -- Exits with code 0 on success, 1 on failure - -#### 3. Client.java Updates -**Location:** `btrace-client/src/main/java/org/openjdk/btrace/client/Client.java` - -**New fields:** -- `agentJarOverride` - Path override for agent JAR -- `bootJarOverride` - Path override for boot JAR - -**New constructor:** -```java -public Client(int port, String outputFile, String probeDescPath, - boolean debug, boolean trackRetransforms, boolean trusted, - boolean dumpClasses, String dumpDir, String statsdDef, - String agentJarOverride, String bootJarOverride) -``` - -**Updated attach() method** (`Client.java:401-451`): -- Checks `agentJarOverride` first -- Falls back to `extractEmbeddedAgentJar()` if running from uber JAR -- Falls back to co-location discovery as last resort -- Handles `bootJarOverride` by prepending to bootCp - -**New method `extractEmbeddedAgentJar()`** (`Client.java:884-930`): -- Checks if running from uber JAR (looks for `META-INF/embedded/btrace-agent.jar`) -- Extracts to temp directory with `deleteOnExit()` -- Returns extracted path or null if not found - -#### 4. Usage Messages Updated -**Location:** `btrace-core/src/main/resources/org/openjdk/btrace/core/messages.properties:100-102` - -Added three new lines to btrace.usage: -``` ---agent-jar Specify path to btrace-agent.jar (overrides auto-discovery) ---boot-jar Specify path to btrace-boot.jar (overrides auto-discovery) ---extract-agent [dir] Extract embedded agent JARs to directory (default: current dir) -``` - -#### 5. Boot JAR Override -**Implementation:** No changes needed in agent Main.java - -**Reason:** The existing `Args.BOOT_CLASS_PATH` mechanism already supports boot JAR override: -1. Client.java passes `bootJarOverride` to `attach()` as `bootCp` parameter -2. `attach()` adds it to `agentArgs` as `BOOT_CLASS_PATH=...` -3. Agent Main.java already reads `BOOT_CLASS_PATH` from `argMap` (line 696) -4. Agent prepends it to the discovered boot path or replaces "." with it (lines 697-704) - -#### 6. Documentation Updates with JBang Examples -**Locations:** -- `docs/GettingStarted.md` -- `Readme.md` - -**Changes to gettingStarted.md:** -1. Added new "JBang Installation" section after package manager installation - - Installation instructions for multiple platforms - - Basic usage examples with Maven coordinates - - Extract agent JARs example - - Benefits list - -2. Renamed "Three Ways to Run BTrace" to "Four Ways to Run BTrace" - - Added "JBang Mode" as method #1 (recommended) - - Included multiple JBang usage examples - - Added `--agent-jar` and `--boot-jar` flags to attach mode options - -**Changes to Readme.md:** -1. Restructured Installation section with JBang as primary option - - "JBang (Easiest - Recommended)" as first subsection - - Moved traditional installation to "Binary Distribution" subsection - - Added cross-reference to gettingStarted.md - -2. Updated Quick Start section - - Added "With JBang" examples first - - Kept traditional examples under "With installed BTrace" - -**JBang Examples Added:** -```bash -# Basic usage -jbang btrace - -# With full Maven coordinates -jbang org.openjdk.btrace:btrace-client: - -# Extract agent JARs -jbang btrace --extract-agent ~/.btrace - -# Override JAR paths (for Maven repo layout) -jbang btrace --agent-jar ~/.m2/repository/org/openjdk/btrace/btrace-agent//btrace-agent-.jar \ - --boot-jar ~/.m2/repository/org/openjdk/btrace/btrace-boot//btrace-boot-.jar \ - -``` - -#### 7. Unit Tests Created -**Location:** `btrace-client/src/test/java/org/openjdk/btrace/client/` - -**Test Files:** -1. `ClientTest.java` - 7 test cases for Client class functionality -2. `MainTest.java` - 7 test cases for Main class extraction and CLI - -**Test Coverage:** -- Constructor with JAR overrides -- Agent JAR override precedence -- Boot JAR override handling -- Embedded JAR extraction logic -- Error handling for missing entries -- Large file extraction (buffer testing) -- CLI flag field validation -- Backward compatibility verification - -**Test Framework:** JUnit 5 (Jupiter) with @TempDir for temporary file management - -**Running Tests:** -```bash -./gradlew :btrace-client:test -./gradlew :btrace-client:test --tests ClientTest -./gradlew :btrace-client:test --tests MainTest -``` - -### Next Steps - -1. ~~Add CLI flags to btrace-client Main.java~~ ✅ -2. ~~Implement extraction command logic~~ ✅ -3. ~~Update agent/boot discovery in Client.java~~ ✅ -4. ~~Update documentation (gettingStarted.md, Readme.md)~~ ✅ -5. ~~Add unit tests~~ ✅ -6. Manual integration testing (when build system is ready) - ---- - -## Critical Files to Modify - -### New Files -- `btrace-api/build.gradle` -- `btrace-api/src/main/java/org/openjdk/btrace/api/BTraceUtils.java` -- `btrace-dist/src/main/resources/bin/btrace2` (new wrapper script) -- `docs/plans/DistributionRestructuring.md` (this document) - -### Modified Files -- `settings.gradle` - Add btrace-api module -- `btrace-dist/build.gradle` - Add uberJar, apiJar tasks -- `btrace-client/src/main/java/org/openjdk/btrace/client/Main.java` - Add CLI flags, extraction command -- `btrace-client/src/main/java/org/openjdk/btrace/client/Client.java:370-387` - Update agent discovery -- `btrace-agent/src/main/java/org/openjdk/btrace/agent/Main.java:748-753` - Support --boot-jar flag -- `btrace-dist/src/main/resources/bin/btrace` - Update to support new flags -- `docs/GettingStarted.md` - Document new distribution -- `docs/Readme.md` - Add jbang examples - ---- - -## Testing Strategy - -### Unit Tests -1. Test embedded JAR extraction -2. Test CLI flag parsing -3. Test agent discovery with overrides - -### Integration Tests -1. Test btrace.jar as client with traditional distribution -2. Test btrace.jar with jbang (mock Maven repo structure) -3. Test extraction command -4. Test backward compatibility (old scripts/tools still work) - -### Manual Testing -1. Install via jbang: `jbang org.openjdk.btrace:btrace:2.3.0` -2. Run with oneliner: `jbang btrace -n '@count; MyClass::*() { @count++ }'` -3. Extract and use: `jbang btrace --extract-agent ~/.btrace && jbang btrace --agent-jar ~/.btrace/btrace-agent.jar MyScript.java` - ---- - -## Timeline Estimate - -**Phase 1 (Alternative 1)**: -- btrace-api module: 2-3 days -- uber JAR build: 1-2 days -- CLI flags and extraction: 2-3 days -- Testing and documentation: 2-3 days -- **Total**: ~1-2 weeks - -**Phase 2 (Alternative 2 additions)**: -- btrace-bootstrap module: 3-5 days -- Manifest filtering: 2-3 days -- Testing: 2-3 days -- **Total**: ~1-2 weeks - -**Phase 3 (Alternative 3)**: -- Research and prototyping: 1 week -- Instrumentation refactoring: 2-3 weeks -- Extension system updates: 1 week -- Testing and migration: 1-2 weeks -- **Total**: ~2-3 months - ---- - -## Success Criteria - -### Phase 1 -- [x] btrace.jar built successfully with embedded JARs (16MB with 867KB agent + 1.1MB boot) -- [x] btrace-api.jar created (14MB with annotations, types, and annotation processor) -- [x] `btrace --extract-agent` works correctly -- [x] `--agent-jar` and `--boot-jar` flags work with jbang (docker-based attach test passes with Testcontainers 2.0.3) -- [x] Backward compatibility: existing bin/btrace still works -- [x] Distribution size increase acceptable (16MB uber JAR vs 2.3MB client JAR) - -### Phase 2 -- [x] btrace-bootstrap module created -- [x] btrace-boot module created (Loader + MaskedClassLoader) -- [x] btraceJar task builds masked JAR structure -- [x] Client mode works (`--version`, usage help) -- [x] JAR size reduced to ~2.9MB -- [x] Bootstrap pollution minimized (112 classes, target was ~200-300) ✅ -- [x] No duplicate classes in distribution -- [x] Integration tests updated to support new JAR structure -- [ ] Single btrace.jar works as -javaagent (needs testing) -- [ ] Full integration test pass - -### Phase 3 -- [ ] Bootstrap JAR reduced to <100KB -- [ ] Performance measurements show no regression -- [ ] All instrumentation migrated to invokedynamic -- [ ] Extension system still functional - ---- - -## Phase 2 Implementation: Classdata Masking (2025-01-25) - -### Overview - -Implemented single JAR with `.classdata` masking to minimize bootstrap classloader pollution: -- Bootstrap classes stored as `*.class` (visible to bootstrap CL) -- Agent/client classes stored as `*.classdata` (loaded by custom MaskedClassLoader) -- Self-referencing `Boot-Class-Path: .` - -### New Module: btrace-boot - -**Location:** `btrace-boot/` - -**Files:** -- `build.gradle` - Simple Java library build -- `src/main/java/org/openjdk/btrace/boot/Loader.java` - Entry point + MaskedClassLoader - -**Loader.java features:** -- `premain(String args, Instrumentation inst)` - Agent load-time entry -- `agentmain(String args, Instrumentation inst)` - Dynamic attach entry -- `main(String[] args)` - Client CLI entry -- `MaskedClassLoader` inner class - Loads `.classdata` files from `META-INF/btrace/{agent,client}/` -- Reads main class names from manifest attributes (`BTrace-Agent-Main`, `BTrace-Client-Main`) -- Debug mode via `-Dbtrace.boot.debug=true` - -### Build Changes: btrace-dist/build.gradle - -**New tasks:** -- `btraceJar` - Creates the masked JAR structure -- `prepareAgentClassdata` - Extracts agent classes from agentJar and renames to `.classdata` -- `prepareClientClassdata` - Extracts client classes from clientJar and renames to `.classdata` - -**Modified tasks:** -- `uberJar` - Now has classifier 'uber' (outputs `btrace-uber.jar`) -- `clientJar` - Changed SLF4J/ASM relocation to match bootstrap (fixes type mismatch) - -### JAR Structure - -``` -btrace.jar (3.6MB) -├── org/openjdk/btrace/boot/Loader*.class # Entry point (3 classes) -├── org/openjdk/btrace/core/*.class # Bootstrap: core API -├── org/openjdk/btrace/runtime/*.class # Bootstrap: runtime -├── org/openjdk/btrace/extension/*.class # Bootstrap: extensions -├── org/openjdk/btrace/libs/org/objectweb/asm/* # Bootstrap: relocated ASM -├── org/openjdk/btrace/libs/org/slf4j/* # Bootstrap: relocated SLF4J -├── org/openjdk/btrace/libs/boot/org/jctools/* # Bootstrap: relocated JCTools -├── META-INF/btrace/agent/*.classdata # Masked agent classes (520) -├── META-INF/btrace/client/*.classdata # Masked client classes (951) -└── META-INF/MANIFEST.MF -``` - -**Manifest attributes:** -``` -Premain-Class: org.openjdk.btrace.boot.Loader -Agent-Class: org.openjdk.btrace.boot.Loader -Main-Class: org.openjdk.btrace.boot.Loader -Can-Redefine-Classes: true -Can-Retransform-Classes: true -Boot-Class-Path: . -BTrace-Version: 3.0.0-SNAPSHOT -BTrace-Agent-Main: org.openjdk.btrace.agent.Main -BTrace-Client-Main: org.openjdk.btrace.client.Main -``` - -### Outstanding Issue: Bootstrap Class Count - -**Current state:** 736 classes in bootstrap (target: ~200-300) - -**Problem packages (should NOT be in bootstrap):** -``` -~290 classes - org/jctools/queues/** # Only need maps/util -~52 classes - org/objectweb/asm/tree/** # Only need core ASM -~26 classes - org/slf4j/impl/** + helpers/** # Only need API -``` - -**Root cause:** `btrace-bootstrap/build.gradle` includes filter is too broad: -```groovy -// Current - too broad: -if (it.path.startsWith('org/objectweb/asm/')) { - // Excludes commons/util/xml but includes tree/ - return true -} -return it.path.startsWith('org/jctools/') // Includes ALL jctools -``` - -### Next Steps +**Current:** Instrumented bytecode directly calls BTrace runtime API (requires API in bootstrap CL). +**Proposed:** Instrumented bytecode uses `INVOKEDYNAMIC`, resolved by `IndyDispatcher`. The actual runtime API lives in an isolated classloader, not bootstrap. -#### Step 1: Fix btrace-bootstrap includes filter +### Benefits -Update `btrace-bootstrap/build.gradle` `bootIncludes` closure: +- Minimal bootstrap footprint (~50 KB vs ~200 KB) +- Better classloader isolation (no BTrace types leaked to application) +- No dependency shading needed (runtime in isolated CL) +- JIT can inline through `invokedynamic` (no performance loss after warmup) +- Cleaner architecture aligned with industry best practices -```groovy -def bootIncludes = { - // ... existing checks for directories and jars ... +### Risks - // btrace-core - include all except Messages (hoisted to agent) - if (it.path.startsWith('org/openjdk/btrace/core/')) { - if (it.path == 'org/openjdk/btrace/core/Messages.class' - || it.path == 'org/openjdk/btrace/core/messages.properties') { - return false - } - return true - } +- Requires rewriting all instrumentation code generation +- Higher implementation complexity +- Requires Java 7+ (already satisfied: BTrace requires Java 8+) +- Debugging instrumented code is harder (indirect calls) +- First-call overhead from `invokedynamic` resolution (mitigated by JIT) - // ASM - only core classes, NOT tree/analysis - if (it.path.startsWith('org/objectweb/asm/')) { - if (it.path.startsWith('org/objectweb/asm/tree/') || - it.path.startsWith('org/objectweb/asm/commons/') || - it.path.startsWith('org/objectweb/asm/util/') || - it.path.startsWith('org/objectweb/asm/xml/')) { - return false - } - return true - } +## Implementation Outline - // JCTools - only maps and essential utilities, NOT queues - if (it.path.startsWith('org/jctools/')) { - return it.path.startsWith('org/jctools/maps/') || - it.path.startsWith('org/jctools/util/') - } - - // SLF4J - only API, NOT impl/helpers - if (it.path.startsWith('org/slf4j/')) { - if (it.path.startsWith('org/slf4j/impl/') || - it.path.startsWith('org/slf4j/helpers/')) { - return false - } - return true - } - - // META-INF/services - filter as before - if (it.path.startsWith('META-INF/services')) { - return !it.path.contains('com.sun.') && !it.path.contains('javax.annotation.') - } - - // Runtime and extension - return it.path.startsWith('org/openjdk/btrace/runtime/') || - it.path.startsWith('org/openjdk/btrace/extension/') -} -``` - -#### Step 2: Rebuild and verify bootstrap count - -```bash -./gradlew clean :btrace-dist:btraceJar --no-daemon - -# Verify bootstrap class count (target: ~200-300) -jar -tf btrace-dist/build/resources/main/v3.0.0-SNAPSHOT/libs/btrace.jar | grep '\.class$' | wc -l - -# Check by package -jar -tf btrace-dist/build/resources/main/v3.0.0-SNAPSHOT/libs/btrace.jar | \ - grep '\.class$' | sed 's|/[^/]*\.class$||' | sort | uniq -c | sort -rn -``` - -#### Step 3: Test client mode - -```bash -java -jar btrace-dist/build/resources/main/v3.0.0-SNAPSHOT/libs/btrace.jar --version -java -jar btrace-dist/build/resources/main/v3.0.0-SNAPSHOT/libs/btrace.jar -``` - -#### Step 4: Test agent mode - -```bash -# Start a simple Java app -java -cp myapp.jar MyApp & -PID=$! - -# Test attach with masked JAR -java -jar btrace.jar $PID MyScript.bt - -# Or test as -javaagent (requires script) -java -javaagent:btrace.jar=script=MyScript.class -jar myapp.jar -``` - -#### Step 5: Run integration tests - -```bash -./gradlew :integration-tests:test -``` - -#### Step 6: Test jbang compatibility - -```bash -# Install locally -./gradlew publishToMavenLocal - -# Test with jbang -jbang run io.btrace:btrace:3.0.0-SNAPSHOT --version -``` - -### Progress File - -Detailed session progress saved to: `docs/progress/classdata-masking-implementation.md` - -### Commits - -- `485067c0` - feat(dist): add btrace-boot module with classdata masking -- `3687b1f7` - WIP: pending changes - ---- +1. Create `IndyDispatcher` bootstrap class with `CallSite` factory methods +2. Modify `Instrumentor` to emit `INVOKEDYNAMIC` instead of `INVOKESTATIC` for BTrace runtime calls +3. Move runtime API out of bootstrap into agent-isolated classloader +4. Update `MaskedClassLoader` to serve as the isolated runtime CL +5. Remove bootstrap classes except `IndyDispatcher` +6. Comprehensive testing: all instrumentation tests must pass with new dispatch ## References -- [jbang Integration Analysis](./jbang-integration-analysis.md) -- [Oneliner Language Feasibility](./OnelinerLanguageFeasibility.md) -- [OpenTelemetry Java Agent Structure](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/contributing/javaagent-structure.md) - [Elastic APM invokedynamic Blog](https://www.elastic.co/blog/embracing-invokedynamic-to-tame-class-loaders-in-java-agents) -- [Datadog dd-trace-java](https://github.com/DataDog/dd-trace-java) +- [OpenTelemetry Java Agent Structure](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/contributing/javaagent-structure.md) +- [Masked JAR Architecture](../architecture/MaskedJarArchitecture.md) (current approach) diff --git a/docs/plans/OnelinerLanguageFeasibility.md b/docs/plans/OnelinerLanguageFeasibility.md deleted file mode 100644 index 1e03b3559..000000000 --- a/docs/plans/OnelinerLanguageFeasibility.md +++ /dev/null @@ -1,448 +0,0 @@ -# BTrace Oneliner Language - Feasibility Study - -## Executive Summary - -Creating a DTrace-style oneliner language for BTrace is **highly feasible** and would leverage existing infrastructure. All three alternatives compile to standard BTrace Java internally, reusing the existing compiler and instrumentation engine. - -**Recommendation**: Start with **Alternative 2 (Moderate)** - it provides the best balance of simplicity and capability for production debugging while remaining approachable for learning. - ---- - -## Implementation Status - -### ✅ Phase 1: Alternative 1 (Minimal) - COMPLETED - -**Completed**: January 2026 - -**Implementation Summary:** -- **Core Components** (~1200 LoC): - - `OnelinerLexer.java` (150 LoC) - Tokenizer with regex and string support - - `OnelinerParser.java` (300 LoC) - Recursive descent parser - - `OnelinerAST.java` (200 LoC) - AST node definitions - - `OnelinerValidator.java` (150 LoC) - Semantic validation - - `OnelinerCodeGenerator.java` (350 LoC) - Java source generation - - `OnelinerException.java` (50 LoC) - Error handling with position tracking - -- **Test Suite** (58 tests): - - 26 parser unit tests - - 22 code generator unit tests - - 10 integration tests (end-to-end compilation) - -- **CLI Integration**: - - Added `-n`/`--oneliner` flag to Main.java:256 - - Oneliner compilation flow in Main.java:331 - - Updated messages.properties with usage documentation - -- **Documentation** (~1200 lines): - - `docs/OnelinerGuide.md` (600+ lines) - Comprehensive guide - - Updated `Readme.md` with oneliner examples - - Updated `docs/Readme.md` documentation hub - - Updated `docs/GettingStarted.md` with 2-minute quick start - -**Capabilities Delivered:** -- ✅ Probe points: `@entry`, `@return`, `@error` -- ✅ Actions: `print`, `count`, `time`, `stack` -- ✅ Filters: `if duration>NUMBERms`, `if args[N]==VALUE` -- ✅ Patterns: Wildcards (`*`, `?`) and regex (`/pattern/`) -- ✅ Class patterns with package wildcards (`javax.swing.*`, `javax.swing.**`) -- ✅ Method patterns with wildcards and regex -- ✅ Special method names: ``, `` -- ✅ Multiple actions per probe -- ✅ Stack traces with configurable depth - -**Examples Working:** -```bash -# Trace Swing UI updates -btrace -n 'javax.swing.*::setText @entry { print method, args }' 1234 - -# Count HashMap operations -btrace -n 'java.util.HashMap::get @entry { count }' 1234 - -# Find slow database queries -btrace -n 'java.sql.Statement::execute* @return if duration>100ms { print method, duration }' 1234 - -# Track OutOfMemoryError with stack -btrace -n 'java.lang.OutOfMemoryError:: @return { stack(10) }' 1234 -``` - -**Pull Request**: #788 (Draft, labeled with AI) - -**Branch**: `btrace-feature-oneliner` - -**Code Quality:** -- ✅ Google Java Format applied (spotlessApply) -- ✅ No compiler warnings -- ✅ SLF4J logging for debug mode -- ✅ Clear error messages with position tracking -- ✅ Comprehensive test coverage - -### 🔜 Phase 2: Alternative 2 (Moderate) - PLANNED - -**Timeline**: 4-6 weeks after Phase 1 merge - -**Planned Features:** -- Aggregations: `@hist=histogram`, `@avg=avg`, `@min=min`, `@max=max`, `@sum=sum` -- Multi-probe support: `probe1 | probe2 | probe3` -- CALL location: `@call:Target::method` -- Enhanced filters with AND/OR logic -- Grouping with multiple keys: `by method, class` -- Aggregation actions: `@hist << duration by method` - -**Estimated Scope:** -- Parser enhancements: ~300 LoC -- Code generator updates: ~200 LoC -- Additional tests: ~30 tests -- Documentation updates: ~200 lines - -### 📋 Phase 3: Alternative 3 (Comprehensive) - DEFERRED - -Future consideration based on user feedback and demand for advanced features. - ---- - -## Key Requirements - -- **Execution**: Both CLI (`btrace -n "oneliner"`) and file-based with simplified syntax -- **Implementation**: Compile to Java internally (leverage existing compiler/instrumentation) -- **Priority use cases**: (1) ops/SRE quick debugging, (2) educational, (3) rapid prototyping -- **Philosophy**: Keep it minimal - focus on 80% use cases - ---- - -## Alternative 1: MINIMAL - "Quick Debug Mode" - -### Philosophy -Absolute simplest syntax for common tracing. Single probe point, single action. DTrace-inspired but more readable. - -### Syntax -``` -class-pattern::method-pattern @location [filter] { action } -``` - -### Capabilities -- **Probe points**: `entry`, `return`, `error` -- **Actions**: `print`, `count`, `time`, `stack` -- **Filters**: `if duration>NUMBERms`, `if args[N]==VALUE` - -### Examples -```bash -# Trace all Swing method entries -btrace -n 'javax.swing.*::* @entry { print }' - -# Count HashMap.get calls -btrace -n 'java.util.HashMap::get @entry { count }' - -# Time slow JDBC queries (>100ms) -btrace -n 'java.sql.Statement::execute* @return if duration>100ms { print method,duration }' - -# Print stack on OutOfMemoryError -btrace -n 'java.lang.OutOfMemoryError:: @return { print stack }' - -# Trace file opens with arguments -btrace -n 'java.io.FileInputStream:: @entry { print args }' -``` - -### Code Generation Example -Input: -``` -javax.swing.JButton::setText @entry { print method,args } -``` - -Generated Java: -```java -@BTrace -class BTraceOneliner { - @OnMethod(clazz="javax.swing.JButton", method="setText") - static void probe(@ProbeMethodName String method, AnyType[] args) { - println(method + " " + str(args)); - } -} -``` - -### Complexity -- **Parser**: ~200 LoC (simple regex-based) -- **Learning curve**: 5 minutes -- **Coverage**: 60% of use cases - -### Limitations -- Single probe point per invocation -- No state/aggregations -- No method call interception (CALL) -- No field access tracking - ---- - -## Alternative 2: MODERATE - "Production Debug Mode" ⭐ RECOMMENDED - -### Philosophy -Balance between simplicity and power. Supports aggregations, multiple probes, basic predicates. Ideal for production debugging and learning. - -### Syntax -``` -[@counter-defs;]* probe-spec [filter] { action-list } [| probe-spec {...}]* -``` - -### Capabilities -- **Probe points**: `entry`, `return`, `error`, `call:Target::method` -- **Actions**: `print`, `count`, aggregations (`histogram`, `avg`, `min`, `max`), `time`, `stack` -- **Filters**: Duration, arguments, return values with comparison operators -- **State**: Named counters and aggregations -- **Multi-probe**: Via `|` separator - -### Examples -```bash -# Count method calls aggregated by method name -btrace -n 'javax.swing.*::* @entry { count @calls by method }' - -# Histogram of JDBC query durations -btrace -n '@hist=histogram; java.sql.Statement::execute* @return { @hist << duration by method }' - -# Track slow operations with details -btrace -n 'com.myapp.*::* @return if duration>50ms { print method,duration,args; stack }' - -# Multiple probes: track object creation and method calls -btrace -n 'com.myapp.User:: @entry { count @created } | - com.myapp.User::* @entry { count @calls }' - -# Intercept method calls within a method -btrace -n 'com.myapp.Controller::handleRequest @call:java.sql.Connection::prepareStatement { print args }' - -# Average response time by endpoint -btrace -n '@avg=avg; com.myapp.Controller::handle* @return { @avg << duration by method }' - -# Count file operations by filename -btrace -n 'java.io.FileInputStream:: @entry { count @files by arg[0] }' -``` - -### Code Generation Example -Input: -``` -@hist=histogram; java.sql.Statement::execute* @return { @hist << duration by method } -``` - -Generated Java: -```java -@BTrace -class BTraceOneliner { - private static Aggregation hist = - Aggregations.newAggregation(AggregationFunction.QUANTIZE); - - @OnMethod(clazz="java.sql.Statement", method="/execute.*/", - location=@Location(Kind.RETURN)) - static void probe(@ProbeMethodName String method, @Duration long duration) { - AggregationKey key = Aggregations.newAggregationKey(method); - Aggregations.addToAggregation(hist, key, (int)(duration/1000)); - } - - @OnEvent - static void onEvent() { - Aggregations.printAggregation("hist", hist); - } -} -``` - -### Complexity -- **Parser**: ~500 LoC (recursive descent) -- **Learning curve**: 30 minutes -- **Coverage**: 85% of use cases - -### Why Recommended -- Covers production debugging needs (aggregations are critical) -- Still simple enough for quick learning -- Supports multiple probe points for complex scenarios -- Moderate implementation cost (~4-6 weeks after Alternative 1) - ---- - -## Alternative 3: COMPREHENSIVE - "Script Mode" - -### Philosophy -Full expressiveness while maintaining oneliner compactness. Supports all probe points, stateful tracking, custom variables. Closer to full BTrace. - -### Capabilities -- **Probe points**: All 11 BTrace kinds (entry, return, error, call, new, throw, catch, get, set, line, sync_entry, sync_exit) -- **Actions**: Full BTraceUtils suite -- **State**: Maps, counters, profilers, custom variables -- **Predicates**: Complex expressions with logical operators -- **Event handlers**: `onevent` for reporting - -### Examples -```bash -# Full profiler with percentiles -btrace -n 'var prof=profiler; -javax.swing.*::* @entry { prof.enter(method) } | -javax.swing.*::* @return { prof.exit(method, duration) }; -onevent { print prof }' - -# Track JDBC queries with context -btrace -n 'var queries=map[String,Number]; var count=counter; -+java.sql.Statement::execute* @entry { queries[arg[0]]=timestamp } | -+java.sql.Statement::execute* @return if duration>100ms { - print "Slow query:", arg[0], "duration:", duration; - stack(5); count++ -}; -onevent { print "Total slow:", count; print queries }' - -# Memory leak detector -btrace -n 'var created=counter; var finalized=counter; -java.util.HashMap:: @entry { created++ } | -java.util.HashMap::finalize @entry { finalized++ }; -onevent { print "Created:", created, "Finalized:", finalized }' - -# Field modification tracking -btrace -n 'com.myapp.User::name @set { print "Field set to:", arg[0], "by:", method }' - -# Synchronization contention tracking -btrace -n 'var locks=histogram; * ::* @sync_entry { locks << 1 by class }' -``` - -### Complexity -- **Parser**: ~1500 LoC (full recursive descent with type checking) -- **Learning curve**: 2-3 hours -- **Coverage**: 98% of use cases - -### Use Cases -- Complex profiling scenarios -- Memory leak investigation -- Advanced performance analysis -- Power users who need full BTrace capabilities - ---- - -## Comparative Analysis - -| Feature | Alternative 1 | Alternative 2 ⭐ | Alternative 3 | -|---------|---------------|---------------|---------------| -| **Probe Points** | 3 | 4 | 11 | -| **Actions** | 5 basic | 8 + aggregations | 15+ | -| **State** | None | Counters only | Maps, profilers | -| **Predicates** | Basic filters | Duration + args | Full expressions | -| **Multi-probe** | No | Yes | Yes | -| **Aggregations** | No | 4 types | All types | -| **Parser LoC** | ~200 | ~500 | ~1500 | -| **Learn time** | 5 min | 30 min | 2-3 hours | -| **Coverage** | 60% | 85% | 98% | -| **Implementation** | 2-3 weeks | +4-6 weeks | +8-12 weeks | - -### Same Task Comparison -Task: "Track JDBC query durations over 100ms" - -**Alternative 1:** -``` -java.sql.Statement::execute* @return if duration>100ms { print method,duration } -``` - -**Alternative 2:** -``` -@slow=histogram; java.sql.Statement::execute* @return if duration>100ms { - @slow << duration by method -} -``` - -**Alternative 3:** -``` -var queries=histogram; var stacks=map[String,String]; -java.sql.Statement::execute* @return if duration>100ms { - queries << duration by method; - stacks[method]=jstackStr(5) -}; -onevent { print queries; print stacks } -``` - ---- - -## Implementation Strategy - -### Phased Approach (Recommended) - -**Phase 1: Alternative 1** (2-3 weeks) -- Validate concept with users -- Establish CLI pattern (`btrace -n "oneliner"`) -- Simple parser and code generator -- Get feedback on syntax choices - -**Phase 2: Alternative 2** (4-6 weeks) -- Add aggregations (critical for production use) -- Add multi-probe support via `|` -- Add CALL location for method interception -- Enhanced predicates - -**Phase 3: Alternative 3** (Optional, 8-12 weeks) -- Add all remaining probe points -- Add stateful variables (maps, profilers) -- Add event handlers -- Complex predicate expressions - -### Technical Approach - -1. **CLI Integration** - Add `-n` flag to `btrace-client/src/main/java/org/openjdk/btrace/client/Main.java` -2. **Parser** - New `btrace-compiler/src/main/java/org/openjdk/btrace/compiler/oneliner/OnelinerParser.java` -3. **Code Generator** - Generate standard BTrace Java source -4. **Delegation** - Use existing `Compiler` class for compilation -5. **Runtime** - Zero changes needed, use existing `BTraceUtils` - -### File Structure -``` -btrace-compiler/src/main/java/org/openjdk/btrace/compiler/oneliner/ -├── OnelinerParser.java # Parser (complexity varies by alternative) -├── OnelinerAST.java # AST nodes -├── OnelinerCodeGen.java # Java code generator -├── OnelinerValidator.java # Semantic validation -└── OnelinerException.java # Error handling -``` - -### Critical Files -- `btrace-client/src/main/java/org/openjdk/btrace/client/Main.java` - CLI flag parsing -- `btrace-compiler/src/main/java/org/openjdk/btrace/compiler/Compiler.java` - Compilation hook -- `btrace-core/src/main/java/org/openjdk/btrace/core/BTraceUtils.java` - Action reference -- `btrace-core/src/main/java/org/openjdk/btrace/core/annotations/Kind.java` - Probe point mapping - ---- - -## References - -### DTrace Oneliner Resources -- [Brendan Gregg's DTrace Oneliners](https://www.brendangregg.com/DTrace/dtrace_oneliners.txt) - Classic reference -- [Oracle Linux DTrace Guide](https://docs.oracle.com/cd/F61410_01/dtrace-guide/OL-DTRACE-GUIDE.pdf) - Updated January 2025 -- [DTrace Scripts GitHub](https://github.com/cadets/dtrace-scripts/blob/master/one_liners.md) - Community examples - -### DTrace Syntax Patterns -- Probe specification: `provider:module:function:name` -- Actions: `{ trace(), printf(), count(), sum() }` -- Aggregations: `@name[key] = function()` -- Predicates: `/condition/` - ---- - -## Feasibility Assessment - -### Advantages -✅ Reuses existing BTrace infrastructure (compiler, runtime, instrumentation) -✅ No performance overhead vs. hand-written scripts -✅ Incremental implementation path -✅ Addresses real pain point (writing full Java classes is heavy) -✅ Educational value (learn BTrace concepts via simple syntax) - -### Challenges -⚠️ Syntax design requires careful user testing -⚠️ Error messages must be clear (syntax errors in oneliners can be cryptic) -⚠️ Documentation and examples critical for adoption -⚠️ Need to handle edge cases gracefully - -### Risks (Low) -- Parser maintenance overhead (mitigated by keeping grammar simple) -- User confusion about limitations vs. full BTrace (mitigated by clear docs) -- Code generation bugs (mitigated by comprehensive tests) - ---- - -## Conclusion - -**All three alternatives are feasible.** Alternative 2 provides the optimal balance for production use while remaining accessible to newcomers. A phased implementation starting with Alternative 1 allows validation of the approach before investing in more complex features. - -**Next Steps:** -1. User feedback on syntax preferences (DTrace-like vs. more verbose?) -2. Prototype Alternative 1 parser (~200 LoC) -3. Generate 5-10 test cases and validate generated code -4. Iterate on syntax based on readability -5. Implement Alternative 2 features incrementally diff --git a/docs/progress/classdata-masking-implementation.md b/docs/progress/classdata-masking-implementation.md deleted file mode 100644 index 099ab5b93..000000000 --- a/docs/progress/classdata-masking-implementation.md +++ /dev/null @@ -1,179 +0,0 @@ -# Implementation Progress: Single JAR with .classdata Masking - -**Date:** 2026-02-08 -**Status:** Complete - Bootstrap optimization done, integration tests updated - ---- - -## What Was Implemented - -### 1. New Module: btrace-boot -**Location:** `btrace-boot/` - -Created new module with: -- `build.gradle` - Simple Java library build -- `src/main/java/org/openjdk/btrace/boot/Loader.java` - Entry point and MaskedClassLoader - -**Loader.java features:** -- `premain(String args, Instrumentation inst)` - Agent load-time entry -- `agentmain(String args, Instrumentation inst)` - Dynamic attach entry -- `main(String[] args)` - Client CLI entry -- `MaskedClassLoader` inner class - Loads `.classdata` files from `META-INF/btrace/{agent,client}/` -- Reads main class names from manifest attributes (`BTrace-Agent-Main`, `BTrace-Client-Main`) -- Debug mode via `-Dbtrace.boot.debug=true` - -### 2. Build Changes: btrace-dist/build.gradle - -**New tasks:** -- `btraceJar` - Creates the masked JAR structure -- `prepareAgentClassdata` - Extracts agent classes from agentJar and renames to `.classdata` -- `prepareClientClassdata` - Extracts client classes from clientJar and renames to `.classdata` - -**Modified tasks:** -- `uberJar` - Now has classifier 'uber' (outputs `btrace-uber.jar`) -- `clientJar` - Changed SLF4J/ASM relocation to match bootstrap (fixes type mismatch) - -**Publishing:** -- Updated to publish `btraceJar` as the primary artifact - -### 3. Current JAR Structure -``` -btrace.jar (~2.9MB) -├── org/openjdk/btrace/boot/*.class # Entry point (4 classes) -├── org/openjdk/btrace/core/*.class # Bootstrap: core API (42 classes) -├── org/openjdk/btrace/core/extensions/*.class # Bootstrap: extensions (9 classes) -├── org/openjdk/btrace/core/types/*.class # Bootstrap: types (5 classes) -├── org/openjdk/btrace/core/jfr/*.class # Bootstrap: JFR (5 classes) -├── org/openjdk/btrace/runtime/*.class # Bootstrap: runtime (3 classes) -├── org/openjdk/btrace/libs/org/slf4j/** # Bootstrap: relocated SLF4J (44 classes) -├── META-INF/btrace/agent/*.classdata # Masked agent classes (655) -├── META-INF/btrace/client/*.classdata # Masked client classes (779) -├── META-INF/btrace/shared/*.classdata # Shared classes: ASM, comm (197) -└── META-INF/MANIFEST.MF - -Total bootstrap: 112 classes (target was 200-300) -``` - -**Note:** ASM is correctly in the shared section (loaded by MaskedClassLoader) since bootstrap classes don't depend on it. - -**Manifest attributes:** -``` -Premain-Class: org.openjdk.btrace.boot.Loader -Agent-Class: org.openjdk.btrace.boot.Loader -Main-Class: org.openjdk.btrace.boot.Loader -Can-Redefine-Classes: true -Can-Retransform-Classes: true -Boot-Class-Path: . -BTrace-Version: 3.0.0-SNAPSHOT -BTrace-Agent-Main: org.openjdk.btrace.agent.Main -BTrace-Client-Main: org.openjdk.btrace.client.Main -``` - ---- - -## What Works - -1. **Client mode** - `java -jar btrace.jar --version` works -2. **Usage help** - `java -jar btrace.jar` shows help -3. **Build** - `./gradlew :btrace-dist:btraceJar` succeeds -4. **JAR structure** - Correct separation of .class and .classdata files - ---- - -## Resolved: Bootstrap Class Count Optimized - -**Current state:** 112 classes in bootstrap (target was 200-300) ✅ - -**Bootstrap class breakdown:** -``` -42 org/openjdk/btrace/core -16 org/openjdk/btrace/libs/org/slf4j/helpers -10 org/openjdk/btrace/libs/org/slf4j/impl - 9 org/openjdk/btrace/libs/org/slf4j - 9 org/openjdk/btrace/core/extensions - 5 org/openjdk/btrace/libs/org/slf4j/event - 5 org/openjdk/btrace/core/types - 5 org/openjdk/btrace/core/jfr - 4 org/openjdk/btrace/libs/org/slf4j/spi - 4 org/openjdk/btrace/boot - 3 org/openjdk/btrace/runtime -``` - -**Key optimizations made:** -- ASM moved to shared classdata (loaded by MaskedClassLoader, not bootstrap) -- JCTools queues excluded from bootstrap -- Only essential core classes in bootstrap -- comm/annotations/handlers in shared section - ---- - -## Completed Steps - -### 1. Bootstrap Class Optimization ✅ -The btrace-bootstrap module now correctly filters classes: -- Only essential core/runtime/extension classes in bootstrap -- ASM moved to shared classdata section -- JCTools excluded from bootstrap -- Result: 112 classes (below 200-300 target) - -### 2. Integration Test Updates ✅ -Updated test infrastructure to support new JAR structure: -- `RuntimeTest.createClientForTests()` - checks for btrace.jar first, falls back to btrace-agent.jar -- `RuntimeTest.locateAgent()` - prefers btrace.jar over btrace-agent.jar -- `JBangAttachDockerTest` - handles both JAR structures - -### 3. Client Mode Verified ✅ -```bash -java -jar btrace.jar --version # Works -java -jar btrace.jar # Shows usage -java --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -jar btrace.jar -l # Lists JVMs -``` - -## Remaining Steps - -### 1. Test jbang compatibility -```bash -./gradlew publishToMavenLocal -jbang run io.btrace:btrace:3.0.0-SNAPSHOT script.java -``` - -### 2. Run full integration tests -```bash -./gradlew :integration-tests:test -Pintegration -``` -Note: May need to kill any lingering BTrace processes on port 2020 - ---- - -## Files Modified - -| File | Change | -|------|--------| -| `btrace-boot/build.gradle` | **NEW** - Build config for boot module | -| `btrace-boot/src/main/java/org/openjdk/btrace/boot/Loader.java` | **NEW** - Entry point + MaskedClassLoader | -| `btrace-dist/build.gradle` | Added btraceJar task, prepare*Classdata tasks, updated dependencies | -| `btrace-bootstrap/build.gradle` | **NEEDS UPDATE** - Reduce bootstrap includes | - ---- - -## Commands to Continue - -```bash -# Rebuild after fixing bootstrap includes -./gradlew clean :btrace-dist:btraceJar --no-daemon - -# Verify bootstrap class count (target: ~200-300) -jar -tf btrace-dist/build/resources/main/v3.0.0-SNAPSHOT/libs/btrace.jar | grep '\.class$' | wc -l - -# Test client mode -java -jar btrace-dist/build/resources/main/v3.0.0-SNAPSHOT/libs/btrace.jar --version - -# Run integration tests -./gradlew :integration-tests:test -``` - ---- - -## Session Reference -Full conversation transcript available at: -`/Users/jbachorik/.claude/projects/-Users-jbachorik-src-btrace-archive-work/67d7634c-01ab-4c6b-95fc-3e2eb8f73a87.jsonl` diff --git a/docs/review/Version230ReadinessReview.md b/docs/review/Version230ReadinessReview.md deleted file mode 100644 index 8eb177686..000000000 --- a/docs/review/Version230ReadinessReview.md +++ /dev/null @@ -1,184 +0,0 @@ -# 2.3.0 Readiness Review (Develop vs v2.2.6) - -Scope: broad review for minor-release readiness, with explicit constraint that cross-version wire-compatibility (v1<->v2) is not required. Only v1<->v1 or v2<->v2 should be considered valid. - -**Reviewer:** Senior Java Engineer Review (2026-01-25) -**Commits reviewed:** 50+ commits, 767 files changed, ~61k additions - ---- - -## Executive Summary - -The 2.3.0 release introduces three major features: (1) DTrace-style oneliner language, (2) extension framework with permission model, and (3) v2 binary protocol enhancements. All previously identified high/medium severity issues have been resolved with appropriate test coverage. Several new concerns are documented below for consideration before release. - ---- - -## Findings (ordered by severity) - -### High - -- **[RESOLVED]** v2 protocol drops detailed error information. In v1, `ErrorCommand` serializes a full `Throwable` (type + stack). In v2, the adapter maps it to a `BinaryErrorCommand` that only carries the message and then re-wraps it into a new `RuntimeException`, losing the original type and stack trace. - - **Resolution:** `BinaryErrorCommand` now carries exception class, message, and stack trace; the adapter preserves these via a `RemoteException`. `BinaryProtocol.VERSION` bumped to 2 since the binary format changed. - - Files: `btrace-core/src/main/java/org/openjdk/btrace/core/comm/v2/BinaryErrorCommand.java`, `CommandAdapter.java`, `BinaryProtocol.java`, `RemoteException.java` - - **Verification:** 26 v2 protocol tests passing including `testBinaryErrorCommand`, `testBinaryErrorCommandNullMessage` - -### Medium - -- **[RESOLVED]** v2 numeric map encoding is lossy for non-primitive `Number` types. `NumberMapDataCommand` in v1 can carry any `Number` (e.g., `BigInteger`, `BigDecimal`), but v2 `NumberEncoding` only supports int/long/float/double and coerces all other `Number` implementations to `long`. - - **Resolution:** `NumberEncoding` now preserves `BigInteger` and `BigDecimal` via dedicated type codes. - - **Verification:** `testBinaryNumberMapDataCommand` test covers BigInteger/BigDecimal round-trip - -- **[RESOLVED]** Grid/aggregation output behavior changes under v2. `GridDataCommand` prints histograms via `HistogramData.print()` and can apply a custom format, but v2 `ScalarEncoding` does not support `HistogramData` and falls back to `toString()`. - - **Resolution:** `ScalarEncoding` now preserves `HistogramData`, and `GridDataCommand` carries column names so the adapter can round-trip them. - - **Verification:** `testBinaryGridDataCommand` covers HistogramData with column names - -- **[RESOLVED] Extension framework resource management concerns:** - 1. **JarFile leak in ExtensionLoaderImpl.load()** - `JarFile` created at lines 197-199 and 238-239 was never closed after `instrumentation.appendToBootstrapClassLoaderSearch()`. - - **Resolution:** Changed to use try-with-resources to properly close JarFile after bootstrap classpath append. - 2. **URLClassLoader not closed** - Extension classloaders are not closed when scripts detach or agent shuts down. - - **Status:** Deferred - extensions are loaded once at agent startup and live for the process lifetime. - 3. **Race condition in extension loading** - The `isLoaded()` check was not atomic with the subsequent `setClassLoader()` call. - - **Resolution:** Added `synchronized` block on descriptor to prevent concurrent loading of the same extension. - -- **[RESOLVED] Extension context thread-safety:** The `context` field in `Extension.java:47` was not volatile. If an extension method is called from a different thread before `initialize()` completes, the context assignment may not be visible. - - `btrace-core/src/main/java/org/openjdk/btrace/core/extensions/Extension.java:47, 87-92` - - **Resolution:** Added `volatile` modifier to `context` field. - -### Low - -- JDK 8 attach uses a retry loop to treat `AgentLoadException("0")` as success when the agent port is reachable. This addresses a HotSpot quirk but could theoretically mask a rare race where another process binds the port between the earlier availability check and the post-load probe. - - `btrace-client/src/main/java/org/openjdk/btrace/client/Client.java:587-634` - -- **[RESOLVED] Oneliner code generator uses fixed class name** - `OnelinerCodeGenerator` used hardcoded `BTraceOneliner` class name. - - **Resolution:** Added overloaded `generate(OnelinerNode, String)` method to allow callers to specify custom class names. - -- **[RESOLVED] PermissionPolicy uses non-thread-safe HashSet** - `allowExtIds` and `denyExtIds` at lines 28-29 used plain `HashSet`. - - **Resolution:** Changed to use `ConcurrentHashMap.newKeySet()` for thread-safe operations. - -- **[RESOLVED] DTraceExtension silently ignores parse errors** - Exception caught at lines 196-199 silently ignored failure to parse process ID from args. - - **Resolution:** Added null/length check, proper logging for NumberFormatException (debug) and other exceptions (warn). - ---- - -## New Feature Assessment - -### Oneliner Language - -**Status:** Ready for release - -**Implementation Quality:** -- Clean separation: Lexer -> Parser -> Validator -> CodeGenerator pipeline -- AST design is sound with proper validation at each stage -- Good error messages with position tracking - -**Test Coverage:** -- 24 parser tests (all passing) -- 19 code generator tests (all passing) -- 10 integration compilation tests (all passing) -- **Gap:** No end-to-end runtime integration test - -**Files reviewed:** -- `btrace-compiler/src/main/java/org/openjdk/btrace/compiler/oneliner/OnelinerLexer.java` (320 lines) -- `btrace-compiler/src/main/java/org/openjdk/btrace/compiler/oneliner/OnelinerParser.java` (373 lines) -- `btrace-compiler/src/main/java/org/openjdk/btrace/compiler/oneliner/OnelinerCodeGenerator.java` (316 lines) -- `btrace-compiler/src/main/java/org/openjdk/btrace/compiler/oneliner/OnelinerValidator.java` (161 lines) - -### Extension Framework - -**Status:** Ready for release with caveats (see resource management concerns above) - -**Implementation Quality:** -- Well-designed API with `Extension`, `ExtensionContext`, `ExtensionDescriptor`, `ServiceDescriptor` -- Three-tier permission model (Default/Standard/Privileged) is reasonable -- Flexible discovery from built-in, user, and environment repositories with priority resolution -- ServiceLoader + conventional naming fallback for implementation loading - -**Architecture Highlights:** -- Extensions split into API (bootstrap classpath) and impl (URLClassLoader) JARs -- Permission enforcement at compile-time (verifier) and runtime (context) -- Failed extension tracking with helpful error messages - -**Built-in Extensions:** -- `btrace-utils` (PrinterService) - minimal, correct -- `btrace-statsd` - creates UDP socket per call, no persistent resources -- `btrace-dtrace` - proper resource cleanup in `close()` method - -**Files reviewed:** -- `btrace-core/src/main/java/org/openjdk/btrace/core/extensions/` (7 files) -- `btrace-extension/src/main/java/org/openjdk/btrace/extension/` (ExtensionRegistry, ExtensionLoader, impl/) -- `btrace-runtime/src/main/java/org/openjdk/btrace/runtime/ExtensionContextImpl.java` - -### v2 Binary Protocol Enhancements - -**Status:** Ready for release - -**Test Coverage:** Comprehensive - 26 tests covering all command types including: -- Error commands with exception class, message, stack trace -- NumberMap with BigInteger/BigDecimal -- GridData with HistogramData and column names -- All 13 previously untested command types now covered - -**Protocol Version:** Correctly bumped to VERSION=2 - ---- - -## Testing Gaps - -1. **No v2-only integration test suite** - Unit tests verify serialization/deserialization, but no end-to-end test runs a script through v2 protocol and validates client output. - -2. **No `btrace-ext-cli` module tests** - Extension CLI commands appear untested. - -3. **Oneliner runtime integration** - Parser/generator tested, but no test that attaches to a JVM with an oneliner script and validates probe output. - -4. **Extension lifecycle integration** - No test verifies extensions are properly closed when scripts detach. - -5. **Extension loading concurrency** - No test exercises concurrent extension loading scenarios. - ---- - -## API/ABI Compatibility - -### Breaking Changes (Expected for Minor Release) -- Permission annotations removed: `@RequestPermission`, `@RequestPermissions`, `@RequiresPermission`, `@RequiresPermissions` (commit f476295e) -- Extension framework is new API - no backward compatibility concern -- v2 protocol version bumped (v1<->v2 compatibility out of scope) - -### Binary Compatibility -- Compiled BTrace scripts from 2.2.x should continue to work (no bytecode format changes) -- JDK compatibility maintained: source=8, target=8, compiled with JDK 11 - ---- - -## Recommendations - -### Before Release (Recommended) -1. ~~Add `volatile` to `Extension.context` field for thread-safety~~ **DONE** -2. ~~Consider adding JarFile close after bootstrap classpath append~~ **DONE** -3. ~~Add `synchronized` block in `ExtensionLoaderImpl.load()` for extension loading race~~ **DONE** -4. ~~Fix PermissionPolicy thread-safety~~ **DONE** -5. ~~Fix DTraceExtension silent error handling~~ **DONE** -6. ~~Make OnelinerCodeGenerator class name configurable~~ **DONE** - -### Post-Release (Technical Debt) -1. Add v2 protocol end-to-end integration test -2. Add oneliner runtime integration test -3. Add extension lifecycle cleanup test - ---- - -## Conclusion - -The 2.3.0 release is **ready for release**: -1. All identified high/medium/low severity issues have been resolved -2. v2 protocol enhancements complete with comprehensive test coverage (26 tests) -3. Extension framework resource management and thread-safety issues addressed -4. Oneliner language feature complete with configurable class names -5. Test coverage is good at unit level; integration test gaps documented as post-release technical debt - -The new features (oneliner language, extension framework) are well-designed and implemented. All code changes have been committed to `jb/prepare_2.3.0` branch. - ---- - -## Notes -- Cross-version interoperability (v1 client <-> v2 agent or vice versa) is out of scope by design and is not treated as a release risk here. -- Files in `docs/review/` are not to be committed.