adding changes for 1.2.0.1 release - includes fix for BYTEMAN-66

bytemanproject · Dec 3, 2009 · 2eedaf4 · 2eedaf4
1 parent 1403486
commit 2eedaf4
Show file tree

Hide file tree

Showing 12 changed files with 403 additions and 7 deletions.
diff --git a/build-release-pkgs.xml b/build-release-pkgs.xml
@@ -86,10 +86,10 @@
     <property name="svnbase"
     value="https://svn.jboss.org/repos/byteman/tags"/>
     <!-- The tag as it appears under svnbase -->
-    <property name="tag" value="Byteman_1_2_0"/>
+    <property name="tag" value="Byteman_1_2_0_1"/>
     <!-- The file name base for the user downloadable files. Derive it
     from the tag -->
-    <property name="filename" value="1.2.0"/>
+    <property name="filename" value="1.2.0.1"/>
     <!-- the location the Byteman web site content svn is checked out to -->
     <property name="cmsdir" value="/home/adinn/jboss/byteman/"/>
     <!-- the location the maven repository svn is checked out to.

diff --git a/sample/src/org/jboss/byteman/sample/helper/ThreadMonitorHelper.java b/sample/src/org/jboss/byteman/sample/helper/ThreadMonitorHelper.java
@@ -213,7 +213,11 @@ public void traceRun(Runnable runnable, Object key)
         StackTraceElement[] stack = Thread.currentThread().getStackTrace();
 
         buffer.append("    from ");
-        printlnFrame(buffer, i);
+        if (i < l - 1) {
+            printlnFrame(buffer, i + 1);
+        } else {
+            buffer.append(" VM runtime\n");
+        }
         trace(key, buffer.toString());
     }
 }
diff --git a/src/org/jboss/byteman/agent/Transformer.java b/src/org/jboss/byteman/agent/Transformer.java
@@ -287,10 +287,10 @@ public byte[] transform(ClassLoader loader,
                         // TODO -- we probably don't want to inject twice in such cases so we ought to remember whether
                         // TODO -- we have seen an interface before
                         String interfaceName = interfaces[i].getName();
-                        newBuffer = tryTransform(newBuffer, internalName, loader, classBeingRedefined, interfaceName, false, true);
+                        newBuffer = tryTransform(newBuffer, internalName, loader, classBeingRedefined, interfaceName, true, true);
                         dotIdx = interfaceName.lastIndexOf('.');
                         if (dotIdx >= 0) {
-                            newBuffer = tryTransform(newBuffer, internalName, loader, classBeingRedefined, interfaceName.substring(dotIdx + 1), false, true);
+                            newBuffer = tryTransform(newBuffer, internalName, loader, classBeingRedefined, interfaceName.substring(dotIdx + 1), true, true);
                         }
                     }
 

diff --git a/tests/build.xml b/tests/build.xml
@@ -434,6 +434,48 @@
             -->
             <test name="org.jboss.byteman.tests.misc.TestRecursiveTriggers"/>
         </junit>
+        <junit fork="true" showoutput="true">
+            <classpath>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
+                <pathelement location="${junit.home}/${junit.jar}"/>
+            </classpath>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/misc/TestOverridingInjection.txt"/>
+            <!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg  value="-Xnoagent"/>
+            <jvmarg  value="-Djava.compiler=NONE"/>
+            <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
+            -->
+            <test name="org.jboss.byteman.tests.misc.TestOverridingInjection"/>
+        </junit>
+        <junit fork="true" showoutput="true">
+            <classpath>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
+                <pathelement location="${junit.home}/${junit.jar}"/>
+            </classpath>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/misc/TestInterfaceInjection.txt"/>
+            <!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg  value="-Xnoagent"/>
+            <jvmarg  value="-Djava.compiler=NONE"/>
+            <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
+            -->
+            <test name="org.jboss.byteman.tests.misc.TestInterfaceInjection"/>
+        </junit>
+        <junit fork="true" showoutput="true">
+            <classpath>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
+                <pathelement location="${junit.home}/${junit.jar}"/>
+            </classpath>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/misc/TestOverridingInterfaceInjection.txt"/>
+            <!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg  value="-Xnoagent"/>
+            <jvmarg  value="-Djava.compiler=NONE"/>
+            <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
+            -->
+            <test name="org.jboss.byteman.tests.misc.TestOverridingInterfaceInjection"/>
+        </junit>
     </target>
 
     <target name="tests.misc.compiled">
@@ -452,6 +494,63 @@
             -->
             <test name="org.jboss.byteman.tests.misc.TestRecursiveTriggers"/>
         </junit>
+        <junit fork="true" showoutput="true">
+            <classpath>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
+                <pathelement location="${junit.home}/${junit.jar}"/>
+            </classpath>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/misc/TestOverridingInjection.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <!-- uncomment to dump generated code
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
+            -->
+            <!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg  value="-Xnoagent"/>
+            <jvmarg  value="-Djava.compiler=NONE"/>
+            <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
+            -->
+            <test name="org.jboss.byteman.tests.misc.TestOverridingInjection"/>
+        </junit>
+        <junit fork="true" showoutput="true">
+            <classpath>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
+                <pathelement location="${junit.home}/${junit.jar}"/>
+            </classpath>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/misc/TestInterfaceInjection.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <!-- uncomment to dump generated code
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
+            -->
+            <!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg  value="-Xnoagent"/>
+            <jvmarg  value="-Djava.compiler=NONE"/>
+            <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
+            -->
+            <test name="org.jboss.byteman.tests.misc.TestInterfaceInjection"/>
+        </junit>
+        <junit fork="true" showoutput="true">
+            <classpath>
+                <pathelement location="${build.lib.dir}/byteman-tests.jar"/>
+                <pathelement location="${junit.home}/${junit.jar}"/>
+            </classpath>
+            <jvmarg value="-javaagent:${byteman.home}/${byteman.jar}=script:${scripts.dir}/misc/TestOverridingInterfaceInjection.txt"/>
+            <jvmarg value="-Dorg.jboss.byteman.compileToBytecode"/>
+            <!-- uncomment to dump generated code
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes"/>
+            <jvmarg value="-Dorg.jboss.byteman.dump.generated.classes.directory=dump"/>
+            -->
+            <!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg  value="-Xnoagent"/>
+            <jvmarg  value="-Djava.compiler=NONE"/>
+            <jvmarg  value="-Xrunjdwp:transport=dt_socket,server=n,suspend=y,address=5005"/>
+            -->
+            <test name="org.jboss.byteman.tests.misc.TestOverridingInterfaceInjection"/>
+        </junit>
     </target>
 
     <target name="tests.bugfixes">

diff --git a/tests/dd/scripts/misc/TestInterfaceInjection.txt b/tests/dd/scripts/misc/TestInterfaceInjection.txt
@@ -0,0 +1,33 @@
+##############################################################################
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+# @authors Andrew Dinn
+#
+
+RULE test entry trigger for interface method
+INTERFACE TestInterface
+METHOD testMethod()
+HELPER org.jboss.byteman.tests.helpers.Default
+AT ENTRY
+BIND test : Test = $0.getTest()
+IF TRUE
+DO test.log("ENTRY triggered in TestInterface.testMethod")
+ENDRULE
diff --git a/tests/dd/scripts/misc/TestOverridingInjection.txt b/tests/dd/scripts/misc/TestOverridingInjection.txt
@@ -0,0 +1,43 @@
+##############################################################################
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+# @authors Andrew Dinn
+#
+
+RULE test overriding entry trigger for constructor
+CLASS ^TestEntryExitAuxiliary
+METHOD <init>(Test)
+HELPER org.jboss.byteman.tests.helpers.Default
+AT ENTRY
+BIND test : Test = $1
+IF TRUE
+DO test.log("ENTRY triggered in constructor")
+ENDRULE
+
+RULE test overriding entry trigger for method
+CLASS ^TestEntryExitAuxiliary
+METHOD testMethod()
+HELPER org.jboss.byteman.tests.helpers.Default
+AT ENTRY
+BIND test : Test = $0.getTest()
+IF TRUE
+DO test.log("ENTRY triggered in ^TestEntryExitAuxiliary.testMethod")
+ENDRULE
diff --git a/tests/dd/scripts/misc/TestOverridingInterfaceInjection.txt b/tests/dd/scripts/misc/TestOverridingInterfaceInjection.txt
@@ -0,0 +1,33 @@
+##############################################################################
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+# @authors Andrew Dinn
+#
+
+RULE test overriding entry trigger for interface method
+INTERFACE ^TestInterface
+METHOD testMethod()
+HELPER org.jboss.byteman.tests.helpers.Default
+AT ENTRY
+BIND test : Test = $0.getTest()
+IF TRUE
+DO test.log("ENTRY triggered in ^TestInterface.testMethod")
+ENDRULE
diff --git a/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliary.java b/tests/src/org/jboss/byteman/tests/auxiliary/TestEntryExitAuxiliary.java
@@ -28,8 +28,7 @@
 /**
  * Auxiliary class used by entry and exit location test classes
  */
-public class TestEntryExitAuxiliary
+public class TestEntryExitAuxiliary implements TestInterface {
-{
     protected Test test;
 
     public TestEntryExitAuxiliary(Test test)

diff --git a/tests/src/org/jboss/byteman/tests/auxiliary/TestInterface.java b/tests/src/org/jboss/byteman/tests/auxiliary/TestInterface.java
@@ -0,0 +1,12 @@
+package org.jboss.byteman.tests.auxiliary;
+
+import org.jboss.byteman.tests.Test;
+
+/**
+ * Interface used to test injection through interfaces
+ */
+public interface TestInterface {
+    void testMethod();
+
+    Test getTest();
+}
diff --git a/tests/src/org/jboss/byteman/tests/misc/TestInterfaceInjection.java b/tests/src/org/jboss/byteman/tests/misc/TestInterfaceInjection.java
@@ -0,0 +1,56 @@
+package org.jboss.byteman.tests.misc;
+
+import org.jboss.byteman.tests.Test;
+import org.jboss.byteman.tests.auxiliary.TestEntryExitAuxiliarySub;
+import org.jboss.byteman.tests.auxiliary.TestEntryExitAuxiliary;
+
+/**
+ * Test class to ensure injection into interfaces without overriding works as expected
+ */
+public class TestInterfaceInjection extends Test
+{
+    public TestInterfaceInjection()
+    {
+        super(TestInterfaceInjection.class.getName());
+    }
+
+    public void test()
+    {
+        // this is much the same as the TestEntry code but we use an interface rule to inject
+        // rule trace into the parent testMethod. note we cannot inject into constructors via
+        // an interface rule
+
+        try {
+        TestEntryExitAuxiliary testAuxiliary;
+        log("creating TestEntryExitAuxiliarySub");
+        testAuxiliary = new TestEntryExitAuxiliarySub(this);
+        log("created TestEntryExitAuxiliarySub");
+        log("calling TestEntryExitAuxiliarySub.testMethod");
+        testAuxiliary.testMethod();
+        log("called TestEntryExitAuxiliarySub.testMethod");
+        } catch (Exception e) {
+            log(e);
+        }
+
+        checkOutput();
+    }
+
+    @Override
+    public String getExpected() {
+        logExpected("creating TestEntryExitAuxiliarySub");
+        // parent constructor will log first
+        logExpected("inside TestEntryExitAuxiliary(Test)");
+        logExpected("inside TestEntryExitAuxiliarySub(Test)");
+        logExpected("created TestEntryExitAuxiliarySub");
+        // we should only see injected coed ein the superclass method
+        logExpected("calling TestEntryExitAuxiliarySub.testMethod");
+        logExpected("inside TestEntryExitAuxiliarySub.testMethod");
+        logExpected("calling TestEntryExitAuxiliary.testMethod");
+        logExpected("ENTRY triggered in TestInterface.testMethod");
+        logExpected("inside TestEntryExitAuxiliary.testMethod");
+        logExpected("called TestEntryExitAuxiliary.testMethod");
+        logExpected("called TestEntryExitAuxiliarySub.testMethod");
+
+        return super.getExpected();
+    }
+}