stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jiangli Zhou 2015-07-31 16:00:29 -04:00
commit 47e90bb79c
8 changed files with 367 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2015, 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
@ -83,6 +83,10 @@ final class Finalizer extends FinalReference<Object> { /* Package-private; must
add();
}
static ReferenceQueue<Object> getQueue() {
return queue;
}
/* Invoked by VM */
static void register(Object finalizee) {
new Finalizer(finalizee);

80
jdk/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java Normal file
View File

@ -0,0 +1,80 @@
/*
* Copyright (c) 2015, 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 java.lang.ref;
import java.util.Map;
import java.util.HashMap;
import java.util.Arrays;
import java.util.Comparator;
/**
* This FinalizerHistogram class is for GC.finalizer_info diagnostic command support.
* It is invoked by the VM.
*/
final class FinalizerHistogram {
private static final class Entry {
private int instanceCount;
private final String className;
int getInstanceCount() {
return instanceCount;
}
void increment() {
instanceCount += 1;
}
Entry(String className) {
this.className = className;
}
}
// Method below is called by VM and VM expect certain
// entry class layout.
static Entry[] getFinalizerHistogram() {
Map<String, Entry> countMap = new HashMap<>();
ReferenceQueue<Object> queue = Finalizer.getQueue();
queue.forEach(r -> {
Object referent = r.get();
if (referent != null) {
countMap.computeIfAbsent(
referent.getClass().getName(), Entry::new).increment();
/* Clear stack slot containing this variable, to decrease
the chances of false retention with a conservative GC */
referent = null;
}
});
Entry fhe[] = countMap.values().toArray(new Entry[countMap.size()]);
Arrays.sort(fhe,
Comparator.comparingInt(Entry::getInstanceCount).reversed());
return fhe;
}
}

4
jdk/src/java.base/share/classes/java/lang/ref/Reference.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2015, 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
@ -101,7 +101,7 @@ public abstract class Reference<T> {
* Inactive: this
*/
@SuppressWarnings("rawtypes")
Reference next;
volatile Reference next;
/* When active: next element in a discovered reference list maintained by GC (or this if last)
* pending: next element in the pending list (or null if last)

39
jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2015, 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
@ -25,6 +25,8 @@
package java.lang.ref;
import java.util.function.Consumer;
/**
* Reference queues, to which registered reference objects are appended by the
* garbage collector after the appropriate reachability changes are detected.
@ -75,13 +77,12 @@ public class ReferenceQueue<T> {
}
}
@SuppressWarnings("unchecked")
private Reference<? extends T> reallyPoll() { /* Must hold lock */
Reference<? extends T> r = head;
if (r != null) {
head = (r.next == r) ?
null :
r.next; // Unchecked due to the next field having a raw type in Reference
@SuppressWarnings("unchecked")
Reference<? extends T> rn = r.next;
head = (rn == r) ? null : rn;
r.queue = NULL;
r.next = r;
queueLength--;
@ -164,4 +165,32 @@ public class ReferenceQueue<T> {
return remove(0);
}
/**
* Iterate queue and invoke given action with each Reference.
* Suitable for diagnostic purposes.
* WARNING: any use of this method should make sure to not
* retain the referents of iterated references (in case of
* FinalReference(s)) so that their life is not prolonged more
* than necessary.
*/
void forEach(Consumer<? super Reference<? extends T>> action) {
for (Reference<? extends T> r = head; r != null;) {
action.accept(r);
@SuppressWarnings("unchecked")
Reference<? extends T> rn = r.next;
if (rn == r) {
if (r.queue == ENQUEUED) {
// still enqueued -> we reached end of chain
r = null;
} else {
// already dequeued: r.queue == NULL; ->
// restart from head when overtaken by queue poller(s)
r = head;
}
} else {
// next in chain
r = rn;
}
}
}
}

13
jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
View File

@ -552,8 +552,10 @@ public class Introspector {
// Java Beans introspection
//
Class<?> clazz = complex.getClass();
Method readMethod = JavaBeansAccessor.getReadMethod(clazz, element);
if (readMethod == null) {
Method readMethod;
if (JavaBeansAccessor.isAvailable()) {
readMethod = JavaBeansAccessor.getReadMethod(clazz, element);
} else {
// Java Beans not available so use simple introspection
// to locate method
readMethod = SimpleIntrospector.getReadMethod(clazz, element);
@ -676,7 +678,12 @@ public class Introspector {
* {@code null} if no method is found.
*/
static Method getReadMethod(Class<?> clazz, String property) {
// first character in uppercase (compatibility with JavaBeans)
if (Character.isUpperCase(property.charAt(0))) {
// the property name must start with a lower-case letter
return null;
}
// first character after 'get/is' prefix must be in uppercase
// (compatibility with JavaBeans)
property = property.substring(0, 1).toUpperCase(Locale.ENGLISH) +
property.substring(1);
String getMethod = GET_METHOD_PREFIX + property;

28
jdk/test/com/sun/jmx/mbeanserver/introspector/BeanClass.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2015, 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.
*/
public class BeanClass {
public int getNumber() {return 1;}
public boolean isAvailable() {return false;}
}

104
jdk/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java Normal file
View File

@ -0,0 +1,104 @@
/*
* Copyright (c) 2015, 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.
*/
import java.lang.reflect.Method;
/*
* @test
* @bug 8129215
* @summary The test checks whether the SimpleIntrospector is honoring the
* the JavaBeans property naming convention of always starting
* with a lower-case letter
*
* @author Jaroslav Bachorik
* @modules java.management
* @run clean SimpleIntrospectorTest
* @run build SimpleIntrospectorTest BeanClass
* @run main SimpleIntrospectorTest
*/
public class SimpleIntrospectorTest {
private static Method INTROSPECT_GETTER;
public static void main(String ... args) throws Exception {
Class clz = Class.forName(
"com.sun.jmx.mbeanserver.Introspector$SimpleIntrospector"
);
INTROSPECT_GETTER = clz.getDeclaredMethod(
"getReadMethod",
Class.class,
String.class
);
INTROSPECT_GETTER.setAccessible(true);
boolean result = true;
result &= checkNumberValid();
result &= checkNumberInvalid();
result &= checkAvailableValid();
result &= checkAvailableInvalid();
if (!result) {
throw new Error();
}
}
private static boolean checkNumberValid() throws Exception {
return checkGetter(false, "number");
}
private static boolean checkNumberInvalid() throws Exception {
return checkGetter(true, "Number");
}
private static boolean checkAvailableValid() throws Exception {
return checkGetter(false, "available");
}
private static boolean checkAvailableInvalid() throws Exception {
return checkGetter(true, "Available");
}
private static boolean checkGetter(boolean nullExpected, String name)
throws Exception {
Method m = getReadMethod(BeanClass.class, name);
boolean result = (m != null);
if (nullExpected) result = !result;
if (result) {
return true;
}
if (nullExpected) {
System.err.println("SimpleIntrospector resolved an unknown getter " +
"for attribute '"+ name +"'");
} else {
System.err.println("SimpleIntrospector fails to resolve getter " +
"for attribute '"+ name +"'");
}
return false;
}
private static Method getReadMethod(Class clz, String attr)
throws Exception {
return (Method)INTROSPECT_GETTER.invoke(null, clz, attr);
}
}

104
jdk/test/java/lang/ref/FinalizerHistogramTest.java Normal file
View File

@ -0,0 +1,104 @@
/*
* Copyright (c) 2015, 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.
*/
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import java.lang.reflect.Method;
import java.lang.reflect.Field;
/*
* @test
* @summary Unit test for FinalizerHistogram
* @run main FinalizerHistogramTest
*/
public class FinalizerHistogramTest {
static ReentrantLock lock = new ReentrantLock();
static volatile int wasInitialized = 0;
static volatile int wasTrapped = 0;
static final int objectsCount = 1000;
static class MyObject {
public MyObject() {
// Make sure object allocation/deallocation is not optimized out
wasInitialized += 1;
}
protected void finalize() {
// Trap the object in a finalization queue
wasTrapped += 1;
lock.lock();
}
}
public static void main(String[] argvs) {
try {
lock.lock();
for(int i = 0; i < objectsCount; ++i) {
new MyObject();
}
System.out.println("Objects intialized: " + objectsCount);
System.gc();
while(wasTrapped < 1);
Class<?> klass = Class.forName("java.lang.ref.FinalizerHistogram");
Method m = klass.getDeclaredMethod("getFinalizerHistogram");
m.setAccessible(true);
Object entries[] = (Object[]) m.invoke(null);
Class<?> entryKlass = Class.forName("java.lang.ref.FinalizerHistogram$Entry");
Field name = entryKlass.getDeclaredField("className");
name.setAccessible(true);
Field count = entryKlass.getDeclaredField("instanceCount");
count.setAccessible(true);
System.out.println("Unreachable instances waiting for finalization");
System.out.println("#instances class name");
System.out.println("-----------------------");
boolean found = false;
for (Object entry : entries) {
Object e = entryKlass.cast(entry);
System.out.printf("%10d %s\n", count.get(e), name.get(e));
if (((String) name.get(e)).indexOf("MyObject") != -1 ) {
found = true;
}
}
if (!found) {
throw new RuntimeException("MyObject is not found in test output");
}
System.out.println("Test PASSED");
} catch(Exception e) {
System.err.println("Test failed with " + e);
e.printStackTrace(System.err);
throw new RuntimeException("Test failed");
} finally {
lock.unlock();
}
}
}