An implementation of the JVMDebugger interface. The basic debug
facilities are implemented through ptrace interface in the JNI code
@@ -238,8 +249,7 @@
/* called from attach methods */
private void findABIVersion() throws DebuggerException {
- if (lookupByName0("libjvm.so", "__vt_10JavaThread") != 0 ||
- lookupByName0("libjvm_g.so", "__vt_10JavaThread") != 0) {
+ if (lookupByName0("libjvm.so", "__vt_10JavaThread") != 0) {
// old C++ ABI
useGCC32ABI = false;
} else {
diff -r 4674e409a9e6 -r a1cc1d1e7ce5 src/share/vm/prims/jvmtiClassFileReconstituter.cpp
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Tue May 07 18:51:31 2013 -0400
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Tue May 07 16:17:43 2013 -0700
@@ -350,13 +350,13 @@
// u2 bootstrap_arguments[num_bootstrap_arguments];
// } bootstrap_methods[num_bootstrap_methods];
// }
-void JvmtiClassFileReconstituter::write_boostrapmethod_attribute() {
+void JvmtiClassFileReconstituter::write_bootstrapmethod_attribute() {
Array* operands = cpool()->operands();
write_attribute_name_index("BootstrapMethods");
int num_bootstrap_methods = ConstantPool::operand_array_length(operands);
// calculate length of attribute
- int length = sizeof(u2); // num_boostrap_methods
+ int length = sizeof(u2); // num_bootstrap_methods
for (int n = 0; n < num_bootstrap_methods; n++) {
u2 num_bootstrap_arguments = cpool()->operand_argument_count_at(n);
length += sizeof(u2); // bootstrap_method_ref
@@ -657,7 +657,7 @@
write_annotations_attribute("RuntimeVisibleAnnotations", anno);
}
if (cpool()->operands() != NULL) {
- write_boostrapmethod_attribute();
+ write_bootstrapmethod_attribute();
}
}
diff -r 4674e409a9e6 -r a1cc1d1e7ce5 src/share/vm/prims/jvmtiClassFileReconstituter.hpp
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Tue May 07 18:51:31 2013 -0400
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Tue May 07 16:17:43 2013 -0700
@@ -127,7 +127,7 @@
void write_signature_attribute(u2 generic_signaure_index);
void write_attribute_name_index(const char* name);
void write_annotations_attribute(const char* attr_name, AnnotationArray* annos);
- void write_boostrapmethod_attribute();
+ void write_bootstrapmethod_attribute();
address writeable_address(size_t size);
void write_u1(u1 x);
diff -r 4674e409a9e6 -r a1cc1d1e7ce5 test/runtime/ClassUnload/KeepAliveClass.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/ClassUnload/KeepAliveClass.java Tue May 07 16:17:43 2013 -0700
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test KeepAliveClass
+ * @summary This test case uses a java.lang.Class instance to keep a class alive.
+ * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary
+ * @library classes
+ * @build KeepAliveClass test.Empty
+ * @build ClassUnloadCommon
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass
+ */
+
+import java.lang.ref.SoftReference;
+import sun.hotspot.WhiteBox;
+
+/**
+ * Test that verifies that classes are not unloaded when specific types of references are kept to them.
+ */
+public class KeepAliveClass {
+ private static final String className = "test.Empty";
+ private static final WhiteBox wb = WhiteBox.getWhiteBox();
+ public static Object escape = null;
+
+ public static void main(String... args) throws Exception {
+ ClassLoader cl = ClassUnloadCommon.newClassLoader();
+ Class c = cl.loadClass(className);
+ Object o = c.newInstance();
+ o = null; cl = null;
+ escape = c;
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testClass (1) alive: " + isAlive);
+
+ ClassUnloadCommon.failIf(!isAlive, "should be alive");
+ }
+
+ ClassUnloadCommon.triggerUnloading();
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testClass (2) alive: " + isAlive);
+
+ ClassUnloadCommon.failIf(!isAlive, "should be alive");
+ }
+ c = null;
+ escape = null;
+ ClassUnloadCommon.triggerUnloading();
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testClass (3) alive: " + isAlive);
+ ClassUnloadCommon.failIf(isAlive, "should be unloaded");
+ }
+
+ }
+}
diff -r 4674e409a9e6 -r a1cc1d1e7ce5 test/runtime/ClassUnload/KeepAliveClassLoader.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/ClassUnload/KeepAliveClassLoader.java Tue May 07 16:17:43 2013 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test KeepAliveClassLoader
+ * @summary This test case uses a java.lang.ClassLoader instance to keep a class alive.
+ * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary
+ * @library classes
+ * @build KeepAliveClassLoader test.Empty
+ * @build ClassUnloadCommon
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader
+ */
+
+import sun.hotspot.WhiteBox;
+
+/**
+ * Test that verifies that classes are not unloaded when specific types of references are kept to them.
+ */
+public class KeepAliveClassLoader {
+ private static final String className = "test.Empty";
+ private static final WhiteBox wb = WhiteBox.getWhiteBox();
+ public static Object escape = null;
+
+
+ public static void main(String... args) throws Exception {
+ ClassLoader cl = ClassUnloadCommon.newClassLoader();
+ Class c = cl.loadClass(className);
+ Object o = c.newInstance();
+ o = null; c = null;
+ escape = cl;
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testClassLoader (1) alive: " + isAlive);
+
+ ClassUnloadCommon.failIf(!isAlive, "should be alive");
+ }
+ ClassUnloadCommon.triggerUnloading();
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testClassLoader (2) alive: " + isAlive);
+
+ ClassUnloadCommon.failIf(!isAlive, "should be alive");
+ }
+ cl = null;
+ escape = null;
+ ClassUnloadCommon.triggerUnloading();
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testClassLoader (3) alive: " + isAlive);
+ ClassUnloadCommon.failIf(isAlive, "should be unloaded");
+ }
+
+ }
+}
diff -r 4674e409a9e6 -r a1cc1d1e7ce5 test/runtime/ClassUnload/KeepAliveObject.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/ClassUnload/KeepAliveObject.java Tue May 07 16:17:43 2013 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test KeepAliveObject
+ * @summary This test case uses a class instance to keep the class alive.
+ * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary
+ * @library classes
+ * @build KeepAliveObject test.Empty
+ * @build ClassUnloadCommon
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject
+ */
+
+import sun.hotspot.WhiteBox;
+
+/**
+ * Test that verifies that classes are not unloaded when specific types of references are kept to them.
+ */
+public class KeepAliveObject {
+ private static final String className = "test.Empty";
+ private static final WhiteBox wb = WhiteBox.getWhiteBox();
+ public static Object escape = null;
+
+ public static void main(String... args) throws Exception {
+ ClassLoader cl = ClassUnloadCommon.newClassLoader();
+ Class c = cl.loadClass(className);
+ Object o = c.newInstance();
+ cl = null; c = null;
+ escape = o;
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testObject (1) alive: " + isAlive);
+
+ ClassUnloadCommon.failIf(!isAlive, "should be alive");
+ }
+
+ ClassUnloadCommon.triggerUnloading();
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testObject (2) alive: " + isAlive);
+
+ ClassUnloadCommon.failIf(!isAlive, "should be alive");
+ }
+ o = null;
+ escape = null;
+ ClassUnloadCommon.triggerUnloading();
+
+ {
+ boolean isAlive = wb.isClassAlive(className);
+ System.out.println("testObject (3) alive: " + isAlive);
+ ClassUnloadCommon.failIf(isAlive, "should be unloaded");
+ }
+
+ }
+}
diff -r 4674e409a9e6 -r a1cc1d1e7ce5 test/runtime/ClassUnload/KeepAliveSoftReference.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/ClassUnload/KeepAliveSoftReference.java Tue May 07 16:17:43 2013 -0700
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test KeepAliveSoftReference
+ * @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive.
+ * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary
+ * @library classes
+ * @build KeepAliveSoftReference test.Empty
+ * @build ClassUnloadCommon
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference
+ */
+
+import java.lang.ref.SoftReference;
+import sun.hotspot.WhiteBox;
+
+/**
+ * Test that verifies that classes are not unloaded when specific types of references are kept to them.
+ */
+public class KeepAliveSoftReference {
+ private static final String className = "test.Empty";
+ private static final WhiteBox wb = WhiteBox.getWhiteBox();
+
+ public static void main(String... args) throws Exception {
+ ClassLoader cl = ClassUnloadCommon.newClassLoader();
+ Class c = cl.loadClass(className);
+ Object o = c.newInstance();
+ SoftReference