/hg/release/icedtea7-forest-2.6/jdk: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 26 13:48:49 UTC 2017
changeset 87112b310c97 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=87112b310c97
author: adinn
date: Wed Apr 26 03:32:27 2017 +0100
8174729, PR3361: Race Condition in java.lang.reflect.WeakCache
Summary: Race can occur between Proxy.getProxyClass and Proxy.isProxyClass
Reviewed-by: mchung
changeset 1495652a19f1 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1495652a19f1
author: andrew
date: Wed Apr 26 05:22:52 2017 +0100
PR3370: Disable ARM32 JIT by default in jdk_generic_profile.sh
changeset fb3599f6b861 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fb3599f6b861
author: andrew
date: Wed Apr 26 05:35:52 2017 +0100
Bump to icedtea-2.6.10pre01
changeset 0d146ddb8e58 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0d146ddb8e58
author: andrew
date: Wed Apr 26 14:56:01 2017 +0100
Added tag icedtea-2.6.10pre01 for changeset fb3599f6b861
diffstat:
.hgtags | 1 +
make/jdk_generic_profile.sh | 5 +-
src/share/classes/java/lang/reflect/WeakCache.java | 8 +-
test/java/lang/reflect/Proxy/ProxyRace.java | 91 ++++++++++++++++++++++
4 files changed, 99 insertions(+), 6 deletions(-)
diffs (140 lines):
diff -r e8821d591081 -r 0d146ddb8e58 .hgtags
--- a/.hgtags Wed Apr 05 06:08:25 2017 +0100
+++ b/.hgtags Wed Apr 26 14:56:01 2017 +0100
@@ -653,3 +653,4 @@
296a14de4d24c06fe768e7ee99eb41563ed13e62 icedtea-2.6.9pre01
86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
ce87b1399385bed9fb08935a8f8a950b5215dab5 icedtea-2.6.9
+fb3599f6b8615b848b54b51122d58c823a9a4ee9 icedtea-2.6.10pre01
diff -r e8821d591081 -r 0d146ddb8e58 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Wed Apr 05 06:08:25 2017 +0100
+++ b/make/jdk_generic_profile.sh Wed Apr 26 14:56:01 2017 +0100
@@ -667,11 +667,12 @@
fi
# IcedTea default; turn on the ARM32 JIT
-export ARM32JIT=true
+# Disabled for now due to PR2942
+export ARM32JIT=false
# IcedTea versioning
export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.6.9"
+export PACKAGE_VERSION="2.6.10pre01"
export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
echo "Building ${DERIVATIVE_ID}"
diff -r e8821d591081 -r 0d146ddb8e58 src/share/classes/java/lang/reflect/WeakCache.java
--- a/src/share/classes/java/lang/reflect/WeakCache.java Wed Apr 05 06:08:25 2017 +0100
+++ b/src/share/classes/java/lang/reflect/WeakCache.java Wed Apr 26 14:56:01 2017 +0100
@@ -253,11 +253,11 @@
// wrap value with CacheValue (WeakReference)
CacheValue<V> cacheValue = new CacheValue<>(value);
+ // put into reverseMap
+ reverseMap.put(cacheValue, Boolean.TRUE);
+
// try replacing us with CacheValue (this should always succeed)
- if (valuesMap.replace(subKey, this, cacheValue)) {
- // put also in reverseMap
- reverseMap.put(cacheValue, Boolean.TRUE);
- } else {
+ if (!valuesMap.replace(subKey, this, cacheValue)) {
throw new AssertionError("Should not reach here");
}
diff -r e8821d591081 -r 0d146ddb8e58 test/java/lang/reflect/Proxy/ProxyRace.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/lang/reflect/Proxy/ProxyRace.java Wed Apr 26 14:56:01 2017 +0100
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2017, 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.lang.reflect.Proxy;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @test
+ * @bug 8174729
+ * @summary Proxy.getProxyClass() / Proxy.isProxyClass() race detector
+ * @run main ProxyRace
+ * @author plevart
+ */
+
+public class ProxyRace {
+
+ static final int threads = 8;
+
+ static volatile ClassLoader classLoader;
+ static volatile boolean terminate;
+ static final AtomicInteger racesDetected = new AtomicInteger();
+
+ public static void main(String[] args) throws Exception {
+
+ final Phaser phaser = new Phaser(threads) {
+ @Override
+ protected boolean onAdvance(int phase, int registeredParties) {
+ // install new ClassLoader on each advance
+ classLoader = new CL();
+ return terminate;
+ }
+ };
+
+ ExecutorService exe = Executors.newFixedThreadPool(threads);
+
+ for (int i = 0; i < threads; i++) {
+ exe.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (phaser.arriveAndAwaitAdvance() >= 0) {
+ Class<?> proxyClass = Proxy.getProxyClass(classLoader, Runnable.class);
+ if (!Proxy.isProxyClass(proxyClass)) {
+ racesDetected.incrementAndGet();
+ }
+ }
+ }
+ });
+ }
+
+ Thread.sleep(5000L);
+
+ terminate = true;
+ exe.shutdown();
+ exe.awaitTermination(5L, TimeUnit.SECONDS);
+
+ System.out.println(racesDetected.get() + " races detected");
+ if (racesDetected.get() != 0) {
+ throw new RuntimeException(racesDetected.get() + " races detected");
+ }
+ }
+
+ static class CL extends ClassLoader {
+ public CL() {
+ super(ClassLoader.getSystemClassLoader());
+ }
+ }
+}
More information about the distro-pkg-dev
mailing list