--- a/jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.lang;
import java.io.File;
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
@@ -172,6 +172,11 @@
*/
private final int fixedKeySize; // in bytes, -1 if no restriction
+ /*
+ * needed to enforce ISE thrown when updateAAD is called after update for GCM mode.
+ */
+ private boolean updateCalled;
+
/**
* Creates an instance of AES cipher with default ECB mode and
* PKCS5Padding.
@@ -304,6 +309,7 @@
protected void engineInit(int opmode, Key key, SecureRandom random)
throws InvalidKeyException {
checkKeySize(key, fixedKeySize);
+ updateCalled = false;
core.init(opmode, key, random);
}
@@ -336,6 +342,7 @@
SecureRandom random)
throws InvalidKeyException, InvalidAlgorithmParameterException {
checkKeySize(key, fixedKeySize);
+ updateCalled = false;
core.init(opmode, key, params, random);
}
@@ -344,6 +351,7 @@
SecureRandom random)
throws InvalidKeyException, InvalidAlgorithmParameterException {
checkKeySize(key, fixedKeySize);
+ updateCalled = false;
core.init(opmode, key, params, random);
}
@@ -368,6 +376,7 @@
*/
protected byte[] engineUpdate(byte[] input, int inputOffset,
int inputLen) {
+ updateCalled = true;
return core.update(input, inputOffset, inputLen);
}
@@ -397,6 +406,7 @@
protected int engineUpdate(byte[] input, int inputOffset, int inputLen,
byte[] output, int outputOffset)
throws ShortBufferException {
+ updateCalled = true;
return core.update(input, inputOffset, inputLen, output,
outputOffset);
}
@@ -433,7 +443,9 @@
*/
protected byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)
throws IllegalBlockSizeException, BadPaddingException {
- return core.doFinal(input, inputOffset, inputLen);
+ byte[] out = core.doFinal(input, inputOffset, inputLen);
+ updateCalled = false;
+ return out;
}
/**
@@ -476,8 +488,10 @@
byte[] output, int outputOffset)
throws IllegalBlockSizeException, ShortBufferException,
BadPaddingException {
- return core.doFinal(input, inputOffset, inputLen, output,
- outputOffset);
+ int outLen = core.doFinal(input, inputOffset, inputLen, output,
+ outputOffset);
+ updateCalled = false;
+ return outLen;
}
/**
@@ -574,6 +588,9 @@
*/
@Override
protected void engineUpdateAAD(byte[] src, int offset, int len) {
+ if (core.getMode() == CipherCore.GCM_MODE && updateCalled) {
+ throw new IllegalStateException("AAD must be supplied before encryption/decryption starts");
+ }
core.updateAAD(src, offset, len);
}
@@ -606,6 +623,9 @@
*/
@Override
protected void engineUpdateAAD(ByteBuffer src) {
+ if (core.getMode() == CipherCore.GCM_MODE && updateCalled) {
+ throw new IllegalStateException("AAD must be supplied before encryption/decryption starts");
+ }
if (src != null) {
int aadLen = src.limit() - src.position();
if (aadLen != 0) {
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
@@ -124,7 +124,7 @@
private static final int PCBC_MODE = 4;
private static final int CTR_MODE = 5;
private static final int CTS_MODE = 6;
- private static final int GCM_MODE = 7;
+ static final int GCM_MODE = 7;
/*
* variables used for performing the GCM (key+iv) uniqueness check.
@@ -196,7 +196,7 @@
cipher = new CounterMode(rawImpl);
unitBytes = 1;
padding = null;
- } else if (modeUpperCase.startsWith("GCM")) {
+ } else if (modeUpperCase.equals("GCM")) {
// can only be used for block ciphers w/ 128-bit block size
if (blockSize != 16) {
throw new NoSuchAlgorithmException
@@ -223,6 +223,15 @@
}
}
+ /**
+ * Returns the mode of this cipher.
+ *
+ * @return the parsed cipher mode
+ */
+ int getMode() {
+ return cipherMode;
+ }
+
private static int getNumOfUnit(String mode, int offset, int blockSize)
throws NoSuchAlgorithmException {
int result = blockSize; // use blockSize as default value
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -49,6 +49,16 @@
static int DEFAULT_TAG_LEN = AES_BLOCK_SIZE;
static int DEFAULT_IV_LEN = 12; // in bytes
+ // In NIST SP 800-38D, GCM input size is limited to be no longer
+ // than (2^36 - 32) bytes. Otherwise, the counter will wrap
+ // around and lead to a leak of plaintext.
+ // However, given the current GCM spec requirement that recovered
+ // text can only be returned after successful tag verification,
+ // we are bound by limiting the data size to the size limit of
+ // java byte array, e.g. Integer.MAX_VALUE, since all data
+ // can only be returned by the doFinal(...) call.
+ private static final int MAX_BUF_SIZE = Integer.MAX_VALUE;
+
// buffer for AAD data; if null, meaning update has been called
private ByteArrayOutputStream aadBuffer = new ByteArrayOutputStream();
private int sizeOfAAD = 0;
@@ -89,9 +99,13 @@
}
}
- // ivLen in bits
- private static byte[] getLengthBlock(int ivLen) {
+ private static byte[] getLengthBlock(int ivLenInBytes) {
+ long ivLen = ((long)ivLenInBytes) << 3;
byte[] out = new byte[AES_BLOCK_SIZE];
+ out[8] = (byte)(ivLen >>> 56);
+ out[9] = (byte)(ivLen >>> 48);
+ out[10] = (byte)(ivLen >>> 40);
+ out[11] = (byte)(ivLen >>> 32);
out[12] = (byte)(ivLen >>> 24);
out[13] = (byte)(ivLen >>> 16);
out[14] = (byte)(ivLen >>> 8);
@@ -99,13 +113,22 @@
return out;
}
- // aLen and cLen both in bits
- private static byte[] getLengthBlock(int aLen, int cLen) {
+ private static byte[] getLengthBlock(int aLenInBytes, int cLenInBytes) {
+ long aLen = ((long)aLenInBytes) << 3;
+ long cLen = ((long)cLenInBytes) << 3;
byte[] out = new byte[AES_BLOCK_SIZE];
+ out[0] = (byte)(aLen >>> 56);
+ out[1] = (byte)(aLen >>> 48);
+ out[2] = (byte)(aLen >>> 40);
+ out[3] = (byte)(aLen >>> 32);
out[4] = (byte)(aLen >>> 24);
out[5] = (byte)(aLen >>> 16);
out[6] = (byte)(aLen >>> 8);
out[7] = (byte)aLen;
+ out[8] = (byte)(cLen >>> 56);
+ out[9] = (byte)(cLen >>> 48);
+ out[10] = (byte)(cLen >>> 40);
+ out[11] = (byte)(cLen >>> 32);
out[12] = (byte)(cLen >>> 24);
out[13] = (byte)(cLen >>> 16);
out[14] = (byte)(cLen >>> 8);
@@ -142,13 +165,20 @@
} else {
g.update(iv);
}
- byte[] lengthBlock = getLengthBlock(iv.length*8);
+ byte[] lengthBlock = getLengthBlock(iv.length);
g.update(lengthBlock);
j0 = g.digest();
}
return j0;
}
+ private static void checkDataLength(int processed, int len) {
+ if (processed > MAX_BUF_SIZE - len) {
+ throw new ProviderException("SunJCE provider only supports " +
+ "input size up to " + MAX_BUF_SIZE + " bytes");
+ }
+ }
+
GaloisCounterMode(SymmetricCipher embeddedCipher) {
super(embeddedCipher);
aadBuffer = new ByteArrayOutputStream();
@@ -319,20 +349,22 @@
// Feed the AAD data to GHASH, pad if necessary
void processAAD() {
- if (aadBuffer != null && aadBuffer.size() > 0) {
- byte[] aad = aadBuffer.toByteArray();
- sizeOfAAD = aad.length;
- aadBuffer = null;
+ if (aadBuffer != null) {
+ if (aadBuffer.size() > 0) {
+ byte[] aad = aadBuffer.toByteArray();
+ sizeOfAAD = aad.length;
- int lastLen = aad.length % AES_BLOCK_SIZE;
- if (lastLen != 0) {
- ghashAllToS.update(aad, 0, aad.length - lastLen);
- byte[] padded = expandToOneBlock(aad, aad.length - lastLen,
- lastLen);
- ghashAllToS.update(padded);
- } else {
- ghashAllToS.update(aad);
+ int lastLen = aad.length % AES_BLOCK_SIZE;
+ if (lastLen != 0) {
+ ghashAllToS.update(aad, 0, aad.length - lastLen);
+ byte[] padded = expandToOneBlock(aad, aad.length - lastLen,
+ lastLen);
+ ghashAllToS.update(padded);
+ } else {
+ ghashAllToS.update(aad);
+ }
}
+ aadBuffer = null;
}
}
@@ -384,6 +416,9 @@
if ((len % blockSize) != 0) {
throw new ProviderException("Internal error in input buffering");
}
+
+ checkDataLength(processed, len);
+
processAAD();
if (len > 0) {
gctrPAndC.update(in, inOfs, len, out, outOfs);
@@ -405,17 +440,23 @@
*/
int encryptFinal(byte[] in, int inOfs, int len, byte[] out, int outOfs)
throws IllegalBlockSizeException, ShortBufferException {
+ if (len > MAX_BUF_SIZE - tagLenBytes) {
+ throw new ShortBufferException
+ ("Can't fit both data and tag into one buffer");
+ }
if (out.length - outOfs < (len + tagLenBytes)) {
throw new ShortBufferException("Output buffer too small");
}
+ checkDataLength(processed, len);
+
processAAD();
if (len > 0) {
doLastBlock(in, inOfs, len, out, outOfs, true);
}
byte[] lengthBlock =
- getLengthBlock(sizeOfAAD*8, processed*8);
+ getLengthBlock(sizeOfAAD, processed);
ghashAllToS.update(lengthBlock);
byte[] s = ghashAllToS.digest();
byte[] sOut = new byte[s.length];
@@ -447,6 +488,9 @@
if ((len % blockSize) != 0) {
throw new ProviderException("Internal error in input buffering");
}
+
+ checkDataLength(ibuffer.size(), len);
+
processAAD();
if (len > 0) {
@@ -481,10 +525,21 @@
if (len < tagLenBytes) {
throw new AEADBadTagException("Input too short - need tag");
}
+ // do this check here can also catch the potential integer overflow
+ // scenario for the subsequent output buffer capacity check.
+ checkDataLength(ibuffer.size(), (len - tagLenBytes));
+
if (out.length - outOfs < ((ibuffer.size() + len) - tagLenBytes)) {
throw new ShortBufferException("Output buffer too small");
}
+
processAAD();
+
+ // get the trailing tag bytes from 'in'
+ byte[] tag = new byte[tagLenBytes];
+ System.arraycopy(in, inOfs + len - tagLenBytes, tag, 0, tagLenBytes);
+ len -= tagLenBytes;
+
if (len != 0) {
ibuffer.write(in, inOfs, len);
}
@@ -495,17 +550,12 @@
len = in.length;
ibuffer.reset();
- byte[] tag = new byte[tagLenBytes];
- // get the trailing tag bytes from 'in'
- System.arraycopy(in, len - tagLenBytes, tag, 0, tagLenBytes);
- len -= tagLenBytes;
-
if (len > 0) {
doLastBlock(in, inOfs, len, out, outOfs, false);
}
byte[] lengthBlock =
- getLengthBlock(sizeOfAAD*8, processed*8);
+ getLengthBlock(sizeOfAAD, processed);
ghashAllToS.update(lengthBlock);
byte[] s = ghashAllToS.digest();
--- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/classes/java/lang/Class.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/Class.java Thu Jul 21 17:13:23 2016 +0000
@@ -238,15 +238,11 @@
TypeVariable<?>[] typeparms = component.getTypeParameters();
if (typeparms.length > 0) {
- boolean first = true;
- sb.append('<');
+ StringJoiner sj = new StringJoiner(",", "<", ">");
for(TypeVariable<?> typeparm: typeparms) {
- if (!first)
- sb.append(',');
- sb.append(typeparm.getTypeName());
- first = false;
+ sj.add(typeparm.getTypeName());
}
- sb.append('>');
+ sb.append(sj.toString());
}
for (int i = 0; i < arrayDepth; i++)
--- a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java Thu Jul 21 17:13:23 2016 +0000
@@ -155,7 +155,7 @@
private static LambdaForm preparedLambdaForm(MemberName m) {
assert(m.isInvocable()) : m; // call preparedFieldLambdaForm instead
MethodType mtype = m.getInvocationType().basicType();
- assert(!m.isMethodHandleInvoke() || "invokeBasic".equals(m.getName())) : m;
+ assert(!m.isMethodHandleInvoke()) : m;
int which;
switch (m.getReferenceKind()) {
case REF_invokeVirtual: which = LF_INVVIRTUAL; break;
--- a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java Thu Jul 21 17:13:23 2016 +0000
@@ -1049,7 +1049,7 @@
this.member = member;
this.resolvedHandle = resolvedHandle;
// The following assert is almost always correct, but will fail for corner cases, such as PrivateInvokeTest.
- //assert(!isInvokeBasic());
+ //assert(!isInvokeBasic(member));
}
NamedFunction(MethodType basicInvokerType) {
assert(basicInvokerType == basicInvokerType.basicType()) : basicInvokerType;
@@ -1060,13 +1060,13 @@
// necessary to pass BigArityTest
this.member = Invokers.invokeBasicMethod(basicInvokerType);
}
- assert(isInvokeBasic());
+ assert(isInvokeBasic(member));
}
- private boolean isInvokeBasic() {
+ private static boolean isInvokeBasic(MemberName member) {
return member != null &&
- member.isMethodHandleInvoke() &&
- "invokeBasic".equals(member.getName());
+ member.getDeclaringClass() == MethodHandle.class &&
+ "invokeBasic".equals(member.getName());
}
// The next 2 constructors are used to break circular dependencies on MH.invokeStatic, etc.
@@ -1204,7 +1204,7 @@
assert(mh.type().basicType() == MethodType.genericMethodType(arity).changeReturnType(rtype))
: Arrays.asList(mh, rtype, arity);
MemberName member = mh.internalMemberName();
- if (member != null && member.getName().equals("invokeBasic") && member.isMethodHandleInvoke()) {
+ if (isInvokeBasic(member)) {
assert(arity > 0);
assert(a[0] instanceof MethodHandle);
MethodHandle mh2 = (MethodHandle) a[0];
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java Thu Jul 21 17:13:23 2016 +0000
@@ -346,7 +346,6 @@
}
/** Utility method to query if this member is a method handle invocation (invoke or invokeExact).
- * Also returns true for the non-public MH.invokeBasic.
*/
public boolean isMethodHandleInvoke() {
final int bits = MH_INVOKE_MODS &~ Modifier.PUBLIC;
@@ -361,7 +360,6 @@
switch (name) {
case "invoke":
case "invokeExact":
- case "invokeBasic": // internal sig-poly method
return true;
default:
return false;
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Thu Jul 21 17:13:23 2016 +0000
@@ -951,8 +951,6 @@
return invoker(type);
if ("invokeExact".equals(name))
return exactInvoker(type);
- if ("invokeBasic".equals(name))
- return basicInvoker(type);
assert(!MemberName.isMethodHandleInvokeName(name));
return null;
}
@@ -3268,6 +3266,16 @@
*/
public static
MethodHandle dropArguments(MethodHandle target, int pos, List<Class<?>> valueTypes) {
+ return dropArguments0(target, pos, copyTypes(valueTypes));
+ }
+
+ private static List<Class<?>> copyTypes(List<Class<?>> types) {
+ Object[] a = types.toArray();
+ return Arrays.asList(Arrays.copyOf(a, a.length, Class[].class));
+ }
+
+ private static
+ MethodHandle dropArguments0(MethodHandle target, int pos, List<Class<?>> valueTypes) {
MethodType oldType = target.type(); // get NPE
int dropped = dropArgumentChecks(oldType, pos, valueTypes);
MethodType newType = oldType.insertParameterTypes(pos, valueTypes);
@@ -3348,6 +3356,7 @@
// private version which allows caller some freedom with error handling
private static MethodHandle dropArgumentsToMatch(MethodHandle target, int skip, List<Class<?>> newTypes, int pos,
boolean nullOnFailure) {
+ newTypes = copyTypes(newTypes);
List<Class<?>> oldTypes = target.type().parameterList();
int match = oldTypes.size();
if (skip != 0) {
@@ -3379,11 +3388,11 @@
// target: ( S*[skip], M*[match] )
MethodHandle adapter = target;
if (add > 0) {
- adapter = dropArguments(adapter, skip+ match, addTypes);
+ adapter = dropArguments0(adapter, skip+ match, addTypes);
}
// adapter: (S*[skip], M*[match], A*[add] )
if (pos > 0) {
- adapter = dropArguments(adapter, skip, newTypes.subList(0, pos));
+ adapter = dropArguments0(adapter, skip, newTypes.subList(0, pos));
}
// adapter: (S*[skip], P*[pos], M*[match], A*[add] )
return adapter;
@@ -3787,7 +3796,7 @@
int filterValues = filterType.parameterCount();
if (filterValues == 0
? (rtype != void.class)
- : (rtype != filterType.parameterType(0)))
+ : (rtype != filterType.parameterType(0) || filterValues != 1))
throw newIllegalArgumentException("target and filter types do not match", targetType, filterType);
}
@@ -4290,7 +4299,7 @@
step.set(i, dropArgumentsToMatch(identityOrVoid(t), 0, commonParameterSequence, i));
}
if (pred.get(i) == null) {
- pred.set(i, dropArguments(constant(boolean.class, true), 0, commonParameterSequence));
+ pred.set(i, dropArguments0(constant(boolean.class, true), 0, commonParameterSequence));
}
if (fini.get(i) == null) {
fini.set(i, empty(methodType(t, commonParameterSequence)));
@@ -4315,7 +4324,7 @@
return hs.stream().map(h -> {
int pc = h.type().parameterCount();
int tpsize = targetParams.size();
- return pc < tpsize ? dropArguments(h, pc, targetParams.subList(pc, tpsize)) : h;
+ return pc < tpsize ? dropArguments0(h, pc, targetParams.subList(pc, tpsize)) : h;
}).collect(Collectors.toList());
}
--- a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java Thu Jul 21 17:13:23 2016 +0000
@@ -52,6 +52,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -420,7 +421,7 @@
// scan the entries in the JAR file to locate the .class and service
// configuration file
Map<Boolean, Set<String>> map =
- jf.stream()
+ versionedStream(jf)
.map(JarEntry::getName)
.filter(s -> (s.endsWith(".class") ^ s.startsWith(SERVICES_PREFIX)))
.collect(Collectors.partitioningBy(s -> s.endsWith(".class"),
@@ -503,8 +504,21 @@
return mn;
}
+ private Stream<JarEntry> versionedStream(JarFile jf) {
+ if (jf.isMultiRelease()) {
+ // a stream of JarEntries whose names are base names and whose
+ // contents are from the corresponding versioned entries in
+ // a multi-release jar file
+ return jf.stream().map(JarEntry::getName)
+ .filter(name -> !name.startsWith("META-INF/versions/"))
+ .map(jf::getJarEntry);
+ } else {
+ return jf.stream();
+ }
+ }
+
private Set<String> jarPackages(JarFile jf) {
- return jf.stream()
+ return versionedStream(jf)
.filter(e -> e.getName().endsWith(".class"))
.map(e -> toPackageName(e.getName()))
.filter(pkg -> pkg.length() > 0) // module-info
--- a/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -28,6 +28,7 @@
import java.lang.annotation.*;
import java.util.Map;
import java.util.Objects;
+import java.util.StringJoiner;
import jdk.internal.misc.SharedSecrets;
import sun.reflect.annotation.AnnotationParser;
@@ -86,15 +87,6 @@
getDeclaringClass());
}
- void separateWithCommas(Class<?>[] types, StringBuilder sb) {
- for (int j = 0; j < types.length; j++) {
- sb.append(types[j].getTypeName());
- if (j < (types.length - 1))
- sb.append(",");
- }
-
- }
-
void printModifiersIfNonzero(StringBuilder sb, int mask, boolean isDefault) {
int mod = getModifiers() & mask;
@@ -121,13 +113,20 @@
printModifiersIfNonzero(sb, modifierMask, isDefault);
specificToStringHeader(sb);
-
sb.append('(');
- separateWithCommas(parameterTypes, sb);
+ StringJoiner sj = new StringJoiner(",");
+ for (Class<?> parameterType : parameterTypes) {
+ sj.add(parameterType.getTypeName());
+ }
+ sb.append(sj.toString());
sb.append(')');
+
if (exceptionTypes.length > 0) {
- sb.append(" throws ");
- separateWithCommas(exceptionTypes, sb);
+ StringJoiner joiner = new StringJoiner(",", "throws ", "");
+ for (Class<?> exceptionType : exceptionTypes) {
+ joiner.add(exceptionType.getTypeName());
+ }
+ sb.append(joiner.toString());
}
return sb.toString();
} catch (Exception e) {
@@ -149,42 +148,34 @@
TypeVariable<?>[] typeparms = getTypeParameters();
if (typeparms.length > 0) {
- boolean first = true;
- sb.append('<');
+ StringJoiner sj = new StringJoiner(",", "<", "> ");
for(TypeVariable<?> typeparm: typeparms) {
- if (!first)
- sb.append(',');
- // Class objects can't occur here; no need to test
- // and call Class.getName().
- sb.append(typeparm.toString());
- first = false;
+ sj.add(typeparm.getTypeName());
}
- sb.append("> ");
+ sb.append(sj.toString());
}
specificToGenericStringHeader(sb);
sb.append('(');
+ StringJoiner sj = new StringJoiner(",");
Type[] params = getGenericParameterTypes();
for (int j = 0; j < params.length; j++) {
String param = params[j].getTypeName();
if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
param = param.replaceFirst("\\[\\]$", "...");
- sb.append(param);
- if (j < (params.length - 1))
- sb.append(',');
+ sj.add(param);
}
+ sb.append(sj.toString());
sb.append(')');
- Type[] exceptions = getGenericExceptionTypes();
- if (exceptions.length > 0) {
- sb.append(" throws ");
- for (int k = 0; k < exceptions.length; k++) {
- sb.append((exceptions[k] instanceof Class)?
- ((Class)exceptions[k]).getName():
- exceptions[k].toString());
- if (k < (exceptions.length - 1))
- sb.append(',');
+
+ Type[] exceptionTypes = getGenericExceptionTypes();
+ if (exceptionTypes.length > 0) {
+ StringJoiner joiner = new StringJoiner(",", " throws ", "");
+ for (Type exceptionType : exceptionTypes) {
+ joiner.add(exceptionType.getTypeName());
}
+ sb.append(joiner.toString());
}
return sb.toString();
} catch (Exception e) {
--- a/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java Thu Jul 21 17:13:23 2016 +0000
@@ -132,7 +132,7 @@
/* the PermissionCollection is static (pre 1.4 constructor)
or dynamic (via a policy refresh) */
- private boolean staticPermissions;
+ private final boolean staticPermissions;
/*
* An object used as a key when the ProtectionDomain is stored in a Map.
@@ -143,8 +143,12 @@
* Creates a new ProtectionDomain with the given CodeSource and
* Permissions. If the permissions object is not null, then
* {@code setReadOnly()} will be called on the passed in
- * Permissions object. The only permissions granted to this domain
- * are the ones specified; the current Policy will not be consulted.
+ * Permissions object.
+ * <p>
+ * The permissions granted to this domain are static, i.e.
+ * invoking the {@link #staticPermissionsOnly()} method returns true.
+ * They contain only the ones passed to this constructor and
+ * the current Policy will not be consulted.
*
* @param codesource the codesource associated with this domain
* @param permissions the permissions granted to this domain
@@ -170,9 +174,11 @@
* Permissions, ClassLoader and array of Principals. If the
* permissions object is not null, then {@code setReadOnly()}
* will be called on the passed in Permissions object.
- * The permissions granted to this domain are dynamic; they include
- * both the static permissions passed to this constructor, and any
- * permissions granted to this domain by the current Policy at the
+ * <p>
+ * The permissions granted to this domain are dynamic, i.e.
+ * invoking the {@link #staticPermissionsOnly()} method returns false.
+ * They include both the static permissions passed to this constructor,
+ * and any permissions granted to this domain by the current Policy at the
* time a permission is checked.
* <p>
* This constructor is typically used by
@@ -256,6 +262,19 @@
}
/**
+ * Returns true if this domain contains only static permissions
+ * and does not check the current {@code Policy} at the time of
+ * permission checking.
+ *
+ * @return true if this domain contains only static permissions.
+ *
+ * @since 9
+ */
+ public final boolean staticPermissionsOnly() {
+ return this.staticPermissions;
+ }
+
+ /**
* Check and see if this ProtectionDomain implies the permissions
* expressed in the Permission object.
* <p>
@@ -263,25 +282,19 @@
* ProtectionDomain was constructed with a static set of permissions
* or it was bound to a dynamically mapped set of permissions.
* <p>
- * If the ProtectionDomain was constructed to a
- * {@link #ProtectionDomain(CodeSource, PermissionCollection)
- * statically bound} PermissionCollection then the permission will
- * only be checked against the PermissionCollection supplied at
- * construction.
+ * If the {@link #staticPermissionsOnly()} method returns
+ * true, then the permission will only be checked against the
+ * PermissionCollection supplied at construction.
* <p>
- * However, if the ProtectionDomain was constructed with
- * the constructor variant which supports
- * {@link #ProtectionDomain(CodeSource, PermissionCollection,
- * ClassLoader, java.security.Principal[]) dynamically binding}
- * permissions, then the permission will be checked against the
- * combination of the PermissionCollection supplied at construction and
+ * Otherwise, the permission will be checked against the combination
+ * of the PermissionCollection supplied at construction and
* the current Policy binding.
*
- * @param permission the Permission object to check.
+ * @param perm the Permission object to check.
*
- * @return true if "permission" is implicit to this ProtectionDomain.
+ * @return true if {@code perm} is implied by this ProtectionDomain.
*/
- public boolean implies(Permission permission) {
+ public boolean implies(Permission perm) {
if (hasAllPerm) {
// internal permission collection already has AllPermission -
@@ -290,10 +303,10 @@
}
if (!staticPermissions &&
- Policy.getPolicyNoCheck().implies(this, permission))
+ Policy.getPolicyNoCheck().implies(this, perm))
return true;
if (permissions != null)
- return permissions.implies(permission);
+ return permissions.implies(perm);
return false;
}
--- a/jdk/src/java.base/share/classes/java/security/Provider.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/security/Provider.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved
+ * Copyright (c) 1996, 2016, 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
--- a/jdk/src/java.base/share/classes/java/util/Queue.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/Queue.java Thu Jul 21 17:13:23 2016 +0000
@@ -124,7 +124,6 @@
* always well-defined for queues with the same elements but different
* ordering properties.
*
- *
* <p>This interface is a member of the
* <a href="{@docRoot}/../technotes/guides/collections/index.html">
* Java Collections Framework</a>.
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.concurrent.locks.LockSupport;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
@@ -149,26 +151,29 @@
* applies across normal vs exceptional outcomes, sync vs async
* actions, binary triggers, and various forms of completions.
*
- * Non-nullness of field result (set via CAS) indicates done. An
- * AltResult is used to box null as a result, as well as to hold
- * exceptions. Using a single field makes completion simple to
- * detect and trigger. Encoding and decoding is straightforward
- * but adds to the sprawl of trapping and associating exceptions
- * with targets. Minor simplifications rely on (static) NIL (to
- * box null results) being the only AltResult with a null
- * exception field, so we don't usually need explicit comparisons.
- * Even though some of the generics casts are unchecked (see
- * SuppressWarnings annotations), they are placed to be
- * appropriate even if checked.
+ * Non-nullness of volatile field "result" indicates done. It may
+ * be set directly if known to be thread-confined, else via CAS.
+ * An AltResult is used to box null as a result, as well as to
+ * hold exceptions. Using a single field makes completion simple
+ * to detect and trigger. Result encoding and decoding is
+ * straightforward but tedious and adds to the sprawl of trapping
+ * and associating exceptions with targets. Minor simplifications
+ * rely on (static) NIL (to box null results) being the only
+ * AltResult with a null exception field, so we don't usually need
+ * explicit comparisons. Even though some of the generics casts
+ * are unchecked (see SuppressWarnings annotations), they are
+ * placed to be appropriate even if checked.
*
* Dependent actions are represented by Completion objects linked
* as Treiber stacks headed by field "stack". There are Completion
- * classes for each kind of action, grouped into single-input
- * (UniCompletion), two-input (BiCompletion), projected
- * (BiCompletions using either (not both) of two inputs), shared
- * (CoCompletion, used by the second of two sources), zero-input
- * source actions, and Signallers that unblock waiters. Class
- * Completion extends ForkJoinTask to enable async execution
+ * classes for each kind of action, grouped into:
+ * - single-input (UniCompletion),
+ * - two-input (BiCompletion),
+ * - projected (BiCompletions using exactly one of two inputs),
+ * - shared (CoCompletion, used by the second of two sources),
+ * - zero-input source actions,
+ * - Signallers that unblock waiters.
+ * Class Completion extends ForkJoinTask to enable async execution
* (adding no space overhead because we exploit its "tag" methods
* to maintain claims). It is also declared as Runnable to allow
* usage with arbitrary executors.
@@ -184,7 +189,7 @@
* encounter layers of adapters in common usages.
*
* * Boolean CompletableFuture method x(...) (for example
- * uniApply) takes all of the arguments needed to check that an
+ * biApply) takes all of the arguments needed to check that an
* action is triggerable, and then either runs the action or
* arranges its async execution by executing its Completion
* argument, if present. The method returns true if known to be
@@ -194,24 +199,29 @@
* method with its held arguments, and on success cleans up.
* The mode argument allows tryFire to be called twice (SYNC,
* then ASYNC); the first to screen and trap exceptions while
- * arranging to execute, and the second when called from a
- * task. (A few classes are not used async so take slightly
- * different forms.) The claim() callback suppresses function
- * invocation if already claimed by another thread.
+ * arranging to execute, and the second when called from a task.
+ * (A few classes are not used async so take slightly different
+ * forms.) The claim() callback suppresses function invocation
+ * if already claimed by another thread.
+ *
+ * * Some classes (for example UniApply) have separate handling
+ * code for when known to be thread-confined ("now" methods) and
+ * for when shared (in tryFire), for efficiency.
*
* * CompletableFuture method xStage(...) is called from a public
- * stage method of CompletableFuture x. It screens user
+ * stage method of CompletableFuture f. It screens user
* arguments and invokes and/or creates the stage object. If
- * not async and x is already complete, the action is run
- * immediately. Otherwise a Completion c is created, pushed to
- * x's stack (unless done), and started or triggered via
- * c.tryFire. This also covers races possible if x completes
- * while pushing. Classes with two inputs (for example BiApply)
- * deal with races across both while pushing actions. The
- * second completion is a CoCompletion pointing to the first,
- * shared so that at most one performs the action. The
- * multiple-arity methods allOf and anyOf do this pairwise to
- * form trees of completions.
+ * not async and already triggerable, the action is run
+ * immediately. Otherwise a Completion c is created, and
+ * submitted to the executor if triggerable, or pushed onto f's
+ * stack if not. Completion actions are started via c.tryFire.
+ * We recheck after pushing to a source future's stack to cover
+ * possible races if the source completes while pushing.
+ * Classes with two inputs (for example BiApply) deal with races
+ * across both while pushing actions. The second completion is
+ * a CoCompletion pointing to the first, shared so that at most
+ * one performs the action. The multiple-arity methods allOf
+ * and anyOf do this pairwise to form trees of completions.
*
* Note that the generic type parameters of methods vary according
* to whether "this" is a source, dependent, or completion.
@@ -236,29 +246,30 @@
* pointing back to its sources. So we null out fields as soon as
* possible. The screening checks needed anyway harmlessly ignore
* null arguments that may have been obtained during races with
- * threads nulling out fields. We also try to unlink fired
- * Completions from stacks that might never be popped (see method
- * postFire). Completion fields need not be declared as final or
- * volatile because they are only visible to other threads upon
- * safe publication.
+ * threads nulling out fields. We also try to unlink non-isLive
+ * (fired or cancelled) Completions from stacks that might
+ * otherwise never be popped: Method cleanStack always unlinks non
+ * isLive completions from the head of stack; others may
+ * occasionally remain if racing with other cancellations or
+ * removals.
+ *
+ * Completion fields need not be declared as final or volatile
+ * because they are only visible to other threads upon safe
+ * publication.
*/
volatile Object result; // Either the result or boxed AltResult
volatile Completion stack; // Top of Treiber stack of dependent actions
final boolean internalComplete(Object r) { // CAS from null to r
- return U.compareAndSwapObject(this, RESULT, null, r);
- }
-
- final boolean casStack(Completion cmp, Completion val) {
- return U.compareAndSwapObject(this, STACK, cmp, val);
+ return RESULT.compareAndSet(this, null, r);
}
/** Returns true if successfully pushed c onto stack. */
final boolean tryPushStack(Completion c) {
Completion h = stack;
- lazySetNext(c, h);
- return U.compareAndSwapObject(this, STACK, h, c);
+ NEXT.set(c, h); // CAS piggyback
+ return STACK.compareAndSet(this, h, c);
}
/** Unconditionally pushes c onto stack, retrying if necessary. */
@@ -278,8 +289,7 @@
/** Completes with the null value, unless already completed. */
final boolean completeNull() {
- return U.compareAndSwapObject(this, RESULT, null,
- NIL);
+ return RESULT.compareAndSet(this, null, NIL);
}
/** Returns the encoding of the given non-exceptional value. */
@@ -289,8 +299,7 @@
/** Completes with a non-exceptional result, unless already completed. */
final boolean completeValue(T t) {
- return U.compareAndSwapObject(this, RESULT, null,
- (t == null) ? NIL : t);
+ return RESULT.compareAndSet(this, null, (t == null) ? NIL : t);
}
/**
@@ -304,8 +313,7 @@
/** Completes with an exceptional result, unless already completed. */
final boolean completeThrowable(Throwable x) {
- return U.compareAndSwapObject(this, RESULT, null,
- encodeThrowable(x));
+ return RESULT.compareAndSet(this, null, encodeThrowable(x));
}
/**
@@ -332,8 +340,7 @@
* existing CompletionException.
*/
final boolean completeThrowable(Throwable x, Object r) {
- return U.compareAndSwapObject(this, RESULT, null,
- encodeThrowable(x, r));
+ return RESULT.compareAndSet(this, null, encodeThrowable(x, r));
}
/**
@@ -351,10 +358,11 @@
*/
static Object encodeRelay(Object r) {
Throwable x;
- return (((r instanceof AltResult) &&
- (x = ((AltResult)r).ex) != null &&
- !(x instanceof CompletionException)) ?
- new AltResult(new CompletionException(x)) : r);
+ if (r instanceof AltResult
+ && (x = ((AltResult)r).ex) != null
+ && !(x instanceof CompletionException))
+ r = new AltResult(new CompletionException(x));
+ return r;
}
/**
@@ -362,14 +370,13 @@
* If exceptional, r is first coerced to a CompletionException.
*/
final boolean completeRelay(Object r) {
- return U.compareAndSwapObject(this, RESULT, null,
- encodeRelay(r));
+ return RESULT.compareAndSet(this, null, encodeRelay(r));
}
/**
* Reports result using Future.get conventions.
*/
- private static <T> T reportGet(Object r)
+ private static Object reportGet(Object r)
throws InterruptedException, ExecutionException {
if (r == null) // by convention below, null means interrupted
throw new InterruptedException();
@@ -384,14 +391,13 @@
x = cause;
throw new ExecutionException(x);
}
- @SuppressWarnings("unchecked") T t = (T) r;
- return t;
+ return r;
}
/**
* Decodes outcome to return result or throw unchecked exception.
*/
- private static <T> T reportJoin(Object r) {
+ private static Object reportJoin(Object r) {
if (r instanceof AltResult) {
Throwable x;
if ((x = ((AltResult)r).ex) == null)
@@ -402,8 +408,7 @@
throw (CompletionException)x;
throw new CompletionException(x);
}
- @SuppressWarnings("unchecked") T t = (T) r;
- return t;
+ return r;
}
/* ------------- Async task preliminaries -------------- */
@@ -449,12 +454,6 @@
static final int ASYNC = 1;
static final int NESTED = -1;
- /**
- * Spins before blocking in waitingGet
- */
- static final int SPINS = (Runtime.getRuntime().availableProcessors() > 1 ?
- 1 << 8 : 0);
-
/* ------------- Base Completion classes and operations -------------- */
@SuppressWarnings("serial")
@@ -479,10 +478,6 @@
public final void setRawResult(Void v) {}
}
- static void lazySetNext(Completion c, Completion next) {
- U.putObjectRelease(c, NEXT, next);
- }
-
/**
* Pops and tries to trigger all reachable dependents. Call only
* when known to be done.
@@ -497,40 +492,47 @@
while ((h = f.stack) != null ||
(f != this && (h = (f = this).stack) != null)) {
CompletableFuture<?> d; Completion t;
- if (f.casStack(h, t = h.next)) {
+ if (STACK.compareAndSet(f, h, t = h.next)) {
if (t != null) {
if (f != this) {
pushStack(h);
continue;
}
- h.next = null; // detach
+ NEXT.compareAndSet(h, t, null); // try to detach
}
f = (d = h.tryFire(NESTED)) == null ? this : d;
}
}
}
- /** Traverses stack and unlinks dead Completions. */
+ /** Traverses stack and unlinks one or more dead Completions, if found. */
final void cleanStack() {
- for (Completion p = null, q = stack; q != null;) {
+ Completion p = stack;
+ // ensure head of stack live
+ for (boolean unlinked = false;;) {
+ if (p == null)
+ return;
+ else if (p.isLive()) {
+ if (unlinked)
+ return;
+ else
+ break;
+ }
+ else if (STACK.weakCompareAndSetVolatile(this, p, (p = p.next)))
+ unlinked = true;
+ else
+ p = stack;
+ }
+ // try to unlink first non-live
+ for (Completion q = p.next; q != null;) {
Completion s = q.next;
if (q.isLive()) {
p = q;
q = s;
- }
- else if (p == null) {
- casStack(q, s);
- q = stack;
- }
- else {
- p.next = s;
- if (p.isLive())
- q = s;
- else {
- p = null; // restart
- q = stack;
- }
- }
+ } else if (NEXT.weakCompareAndSetVolatile(p, q, s))
+ break;
+ else
+ q = p.next;
}
}
@@ -568,11 +570,20 @@
final boolean isLive() { return dep != null; }
}
- /** Pushes the given completion (if it exists) unless done. */
- final void push(UniCompletion<?,?> c) {
+ /**
+ * Pushes the given completion unless it completes while trying.
+ * Caller should first check that result is null.
+ */
+ final void unipush(Completion c) {
if (c != null) {
- while (result == null && !tryPushStack(c))
- lazySetNext(c, null); // clear on failure
+ while (!tryPushStack(c)) {
+ if (result != null) {
+ NEXT.set(c, null);
+ break;
+ }
+ }
+ if (result != null)
+ c.tryFire(SYNC);
}
}
@@ -583,9 +594,10 @@
*/
final CompletableFuture<T> postFire(CompletableFuture<?> a, int mode) {
if (a != null && a.stack != null) {
- if (a.result == null)
+ Object r;
+ if ((r = a.result) == null)
a.cleanStack();
- else if (mode >= 0)
+ if (mode >= 0 && (r != null || a.result != null))
a.postComplete();
}
if (result != null && stack != null) {
@@ -607,48 +619,65 @@
}
final CompletableFuture<V> tryFire(int mode) {
CompletableFuture<V> d; CompletableFuture<T> a;
- if ((d = dep) == null ||
- !d.uniApply(a = src, fn, mode > 0 ? null : this))
+ Object r; Throwable x; Function<? super T,? extends V> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null)
return null;
+ tryComplete: if (d.result == null) {
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.completeThrowable(x, r);
+ break tryComplete;
+ }
+ r = null;
+ }
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ else {
+ @SuppressWarnings("unchecked") T t = (T) r;
+ d.completeValue(f.apply(t));
+ }
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final <S> boolean uniApply(CompletableFuture<S> a,
- Function<? super S,? extends T> f,
- UniApply<S,T> c) {
- Object r; Throwable x;
- if (a == null || (r = a.result) == null || f == null)
- return false;
- tryComplete: if (result == null) {
- if (r instanceof AltResult) {
- if ((x = ((AltResult)r).ex) != null) {
- completeThrowable(x, r);
- break tryComplete;
- }
- r = null;
- }
- try {
- if (c != null && !c.claim())
- return false;
- @SuppressWarnings("unchecked") S s = (S) r;
- completeValue(f.apply(s));
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
- }
-
private <V> CompletableFuture<V> uniApplyStage(
Executor e, Function<? super T,? extends V> f) {
if (f == null) throw new NullPointerException();
+ Object r;
+ if ((r = result) != null)
+ return uniApplyNow(r, e, f);
CompletableFuture<V> d = newIncompleteFuture();
- if (e != null || !d.uniApply(this, f, null)) {
- UniApply<T,V> c = new UniApply<T,V>(e, d, this, f);
- push(c);
- c.tryFire(SYNC);
+ unipush(new UniApply<T,V>(e, d, this, f));
+ return d;
+ }
+
+ private <V> CompletableFuture<V> uniApplyNow(
+ Object r, Executor e, Function<? super T,? extends V> f) {
+ Throwable x;
+ CompletableFuture<V> d = newIncompleteFuture();
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.result = encodeThrowable(x, r);
+ return d;
+ }
+ r = null;
+ }
+ try {
+ if (e != null) {
+ e.execute(new UniApply<T,V>(null, d, this, f));
+ } else {
+ @SuppressWarnings("unchecked") T t = (T) r;
+ d.result = d.encodeValue(f.apply(t));
+ }
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
}
return d;
}
@@ -662,48 +691,67 @@
}
final CompletableFuture<Void> tryFire(int mode) {
CompletableFuture<Void> d; CompletableFuture<T> a;
- if ((d = dep) == null ||
- !d.uniAccept(a = src, fn, mode > 0 ? null : this))
+ Object r; Throwable x; Consumer<? super T> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null)
return null;
+ tryComplete: if (d.result == null) {
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.completeThrowable(x, r);
+ break tryComplete;
+ }
+ r = null;
+ }
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ else {
+ @SuppressWarnings("unchecked") T t = (T) r;
+ f.accept(t);
+ d.completeNull();
+ }
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final <S> boolean uniAccept(CompletableFuture<S> a,
- Consumer<? super S> f, UniAccept<S> c) {
- Object r; Throwable x;
- if (a == null || (r = a.result) == null || f == null)
- return false;
- tryComplete: if (result == null) {
- if (r instanceof AltResult) {
- if ((x = ((AltResult)r).ex) != null) {
- completeThrowable(x, r);
- break tryComplete;
- }
- r = null;
- }
- try {
- if (c != null && !c.claim())
- return false;
- @SuppressWarnings("unchecked") S s = (S) r;
- f.accept(s);
- completeNull();
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
- }
-
private CompletableFuture<Void> uniAcceptStage(Executor e,
Consumer<? super T> f) {
if (f == null) throw new NullPointerException();
+ Object r;
+ if ((r = result) != null)
+ return uniAcceptNow(r, e, f);
CompletableFuture<Void> d = newIncompleteFuture();
- if (e != null || !d.uniAccept(this, f, null)) {
- UniAccept<T> c = new UniAccept<T>(e, d, this, f);
- push(c);
- c.tryFire(SYNC);
+ unipush(new UniAccept<T>(e, d, this, f));
+ return d;
+ }
+
+ private CompletableFuture<Void> uniAcceptNow(
+ Object r, Executor e, Consumer<? super T> f) {
+ Throwable x;
+ CompletableFuture<Void> d = newIncompleteFuture();
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.result = encodeThrowable(x, r);
+ return d;
+ }
+ r = null;
+ }
+ try {
+ if (e != null) {
+ e.execute(new UniAccept<T>(null, d, this, f));
+ } else {
+ @SuppressWarnings("unchecked") T t = (T) r;
+ f.accept(t);
+ d.result = NIL;
+ }
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
}
return d;
}
@@ -717,42 +765,56 @@
}
final CompletableFuture<Void> tryFire(int mode) {
CompletableFuture<Void> d; CompletableFuture<T> a;
- if ((d = dep) == null ||
- !d.uniRun(a = src, fn, mode > 0 ? null : this))
+ Object r; Throwable x; Runnable f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null)
return null;
+ if (d.result == null) {
+ if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
+ d.completeThrowable(x, r);
+ else
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ else {
+ f.run();
+ d.completeNull();
+ }
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final boolean uniRun(CompletableFuture<?> a, Runnable f, UniRun<?> c) {
- Object r; Throwable x;
- if (a == null || (r = a.result) == null || f == null)
- return false;
- if (result == null) {
- if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
- completeThrowable(x, r);
- else
- try {
- if (c != null && !c.claim())
- return false;
- f.run();
- completeNull();
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
+ private CompletableFuture<Void> uniRunStage(Executor e, Runnable f) {
+ if (f == null) throw new NullPointerException();
+ Object r;
+ if ((r = result) != null)
+ return uniRunNow(r, e, f);
+ CompletableFuture<Void> d = newIncompleteFuture();
+ unipush(new UniRun<T>(e, d, this, f));
+ return d;
}
- private CompletableFuture<Void> uniRunStage(Executor e, Runnable f) {
- if (f == null) throw new NullPointerException();
+ private CompletableFuture<Void> uniRunNow(Object r, Executor e, Runnable f) {
+ Throwable x;
CompletableFuture<Void> d = newIncompleteFuture();
- if (e != null || !d.uniRun(this, f, null)) {
- UniRun<T> c = new UniRun<T>(e, d, this, f);
- push(c);
- c.tryFire(SYNC);
- }
+ if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
+ d.result = encodeThrowable(x, r);
+ else
+ try {
+ if (e != null) {
+ e.execute(new UniRun<T>(null, d, this, f));
+ } else {
+ f.run();
+ d.result = NIL;
+ }
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
return d;
}
@@ -766,20 +828,20 @@
}
final CompletableFuture<T> tryFire(int mode) {
CompletableFuture<T> d; CompletableFuture<T> a;
- if ((d = dep) == null ||
- !d.uniWhenComplete(a = src, fn, mode > 0 ? null : this))
+ Object r; BiConsumer<? super T, ? super Throwable> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null
+ || !d.uniWhenComplete(r, f, mode > 0 ? null : this))
return null;
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final boolean uniWhenComplete(CompletableFuture<T> a,
+ final boolean uniWhenComplete(Object r,
BiConsumer<? super T,? super Throwable> f,
UniWhenComplete<T> c) {
- Object r; T t; Throwable x = null;
- if (a == null || (r = a.result) == null || f == null)
- return false;
+ T t; Throwable x = null;
if (result == null) {
try {
if (c != null && !c.claim())
@@ -811,10 +873,17 @@
Executor e, BiConsumer<? super T, ? super Throwable> f) {
if (f == null) throw new NullPointerException();
CompletableFuture<T> d = newIncompleteFuture();
- if (e != null || !d.uniWhenComplete(this, f, null)) {
- UniWhenComplete<T> c = new UniWhenComplete<T>(e, d, this, f);
- push(c);
- c.tryFire(SYNC);
+ Object r;
+ if ((r = result) == null)
+ unipush(new UniWhenComplete<T>(e, d, this, f));
+ else if (e == null)
+ d.uniWhenComplete(r, f, null);
+ else {
+ try {
+ e.execute(new UniWhenComplete<T>(null, d, this, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
}
return d;
}
@@ -829,20 +898,20 @@
}
final CompletableFuture<V> tryFire(int mode) {
CompletableFuture<V> d; CompletableFuture<T> a;
- if ((d = dep) == null ||
- !d.uniHandle(a = src, fn, mode > 0 ? null : this))
+ Object r; BiFunction<? super T, Throwable, ? extends V> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null
+ || !d.uniHandle(r, f, mode > 0 ? null : this))
return null;
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final <S> boolean uniHandle(CompletableFuture<S> a,
+ final <S> boolean uniHandle(Object r,
BiFunction<? super S, Throwable, ? extends T> f,
UniHandle<S,T> c) {
- Object r; S s; Throwable x;
- if (a == null || (r = a.result) == null || f == null)
- return false;
+ S s; Throwable x;
if (result == null) {
try {
if (c != null && !c.claim())
@@ -867,10 +936,17 @@
Executor e, BiFunction<? super T, Throwable, ? extends V> f) {
if (f == null) throw new NullPointerException();
CompletableFuture<V> d = newIncompleteFuture();
- if (e != null || !d.uniHandle(this, f, null)) {
- UniHandle<T,V> c = new UniHandle<T,V>(e, d, this, f);
- push(c);
- c.tryFire(SYNC);
+ Object r;
+ if ((r = result) == null)
+ unipush(new UniHandle<T,V>(e, d, this, f));
+ else if (e == null)
+ d.uniHandle(r, f, null);
+ else {
+ try {
+ e.execute(new UniHandle<T,V>(null, d, this, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
}
return d;
}
@@ -885,19 +961,20 @@
final CompletableFuture<T> tryFire(int mode) { // never ASYNC
// assert mode != ASYNC;
CompletableFuture<T> d; CompletableFuture<T> a;
- if ((d = dep) == null || !d.uniExceptionally(a = src, fn, this))
+ Object r; Function<? super Throwable, ? extends T> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null
+ || !d.uniExceptionally(r, f, this))
return null;
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final boolean uniExceptionally(CompletableFuture<T> a,
+ final boolean uniExceptionally(Object r,
Function<? super Throwable, ? extends T> f,
UniExceptionally<T> c) {
- Object r; Throwable x;
- if (a == null || (r = a.result) == null || f == null)
- return false;
+ Throwable x;
if (result == null) {
try {
if (r instanceof AltResult && (x = ((AltResult)r).ex) != null) {
@@ -917,47 +994,38 @@
Function<Throwable, ? extends T> f) {
if (f == null) throw new NullPointerException();
CompletableFuture<T> d = newIncompleteFuture();
- if (!d.uniExceptionally(this, f, null)) {
- UniExceptionally<T> c = new UniExceptionally<T>(d, this, f);
- push(c);
- c.tryFire(SYNC);
- }
+ Object r;
+ if ((r = result) == null)
+ unipush(new UniExceptionally<T>(d, this, f));
+ else
+ d.uniExceptionally(r, f, null);
return d;
}
@SuppressWarnings("serial")
- static final class UniRelay<T> extends UniCompletion<T,T> { // for Compose
+ static final class UniRelay<T> extends UniCompletion<T,T> {
UniRelay(CompletableFuture<T> dep, CompletableFuture<T> src) {
super(null, dep, src);
}
final CompletableFuture<T> tryFire(int mode) {
- CompletableFuture<T> d; CompletableFuture<T> a;
- if ((d = dep) == null || !d.uniRelay(a = src))
+ CompletableFuture<T> d; CompletableFuture<T> a; Object r;
+ if ((d = dep) == null
+ || (a = src) == null || (r = a.result) == null)
return null;
+ if (d.result == null)
+ d.completeRelay(r);
src = null; dep = null;
return d.postFire(a, mode);
}
}
- final boolean uniRelay(CompletableFuture<T> a) {
- Object r;
- if (a == null || (r = a.result) == null)
- return false;
- if (result == null) // no need to claim
- completeRelay(r);
- return true;
- }
-
private CompletableFuture<T> uniCopyStage() {
Object r;
CompletableFuture<T> d = newIncompleteFuture();
if ((r = result) != null)
- d.completeRelay(r);
- else {
- UniRelay<T> c = new UniRelay<T>(d, this);
- push(c);
- c.tryFire(SYNC);
- }
+ d.result = encodeRelay(r);
+ else
+ unipush(new UniRelay<T>(d, this));
return d;
}
@@ -966,9 +1034,7 @@
if ((r = result) != null)
return new MinimalStage<T>(encodeRelay(r));
MinimalStage<T> d = new MinimalStage<T>();
- UniRelay<T> c = new UniRelay<T>(d, this);
- push(c);
- c.tryFire(SYNC);
+ unipush(new UniRelay<T>(d, this));
return d;
}
@@ -982,54 +1048,48 @@
}
final CompletableFuture<V> tryFire(int mode) {
CompletableFuture<V> d; CompletableFuture<T> a;
- if ((d = dep) == null ||
- !d.uniCompose(a = src, fn, mode > 0 ? null : this))
+ Function<? super T, ? extends CompletionStage<V>> f;
+ Object r; Throwable x;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null)
return null;
+ tryComplete: if (d.result == null) {
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.completeThrowable(x, r);
+ break tryComplete;
+ }
+ r = null;
+ }
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ @SuppressWarnings("unchecked") T t = (T) r;
+ CompletableFuture<V> g = f.apply(t).toCompletableFuture();
+ if ((r = g.result) != null)
+ d.completeRelay(r);
+ else {
+ g.unipush(new UniRelay<V>(d, g));
+ if (d.result == null)
+ return null;
+ }
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; fn = null;
return d.postFire(a, mode);
}
}
- final <S> boolean uniCompose(
- CompletableFuture<S> a,
- Function<? super S, ? extends CompletionStage<T>> f,
- UniCompose<S,T> c) {
- Object r; Throwable x;
- if (a == null || (r = a.result) == null || f == null)
- return false;
- tryComplete: if (result == null) {
- if (r instanceof AltResult) {
- if ((x = ((AltResult)r).ex) != null) {
- completeThrowable(x, r);
- break tryComplete;
- }
- r = null;
- }
- try {
- if (c != null && !c.claim())
- return false;
- @SuppressWarnings("unchecked") S s = (S) r;
- CompletableFuture<T> g = f.apply(s).toCompletableFuture();
- if (g.result == null || !uniRelay(g)) {
- UniRelay<T> copy = new UniRelay<T>(this, g);
- g.push(copy);
- copy.tryFire(SYNC);
- if (result == null)
- return false;
- }
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
- }
-
private <V> CompletableFuture<V> uniComposeStage(
Executor e, Function<? super T, ? extends CompletionStage<V>> f) {
if (f == null) throw new NullPointerException();
+ CompletableFuture<V> d = newIncompleteFuture();
Object r, s; Throwable x;
- CompletableFuture<V> d = newIncompleteFuture();
- if (e == null && (r = result) != null) {
+ if ((r = result) == null)
+ unipush(new UniCompose<T,V>(e, d, this, f));
+ else if (e == null) {
if (r instanceof AltResult) {
if ((x = ((AltResult)r).ex) != null) {
d.result = encodeThrowable(x, r);
@@ -1041,21 +1101,20 @@
@SuppressWarnings("unchecked") T t = (T) r;
CompletableFuture<V> g = f.apply(t).toCompletableFuture();
if ((s = g.result) != null)
- d.completeRelay(s);
+ d.result = encodeRelay(s);
else {
- UniRelay<V> c = new UniRelay<V>(d, g);
- g.push(c);
- c.tryFire(SYNC);
+ g.unipush(new UniRelay<V>(d, g));
}
- return d;
} catch (Throwable ex) {
d.result = encodeThrowable(ex);
- return d;
}
}
- UniCompose<T,V> c = new UniCompose<T,V>(e, d, this, f);
- push(c);
- c.tryFire(SYNC);
+ else
+ try {
+ e.execute(new UniCompose<T,V>(null, d, this, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
return d;
}
@@ -1085,21 +1144,28 @@
}
final boolean isLive() {
BiCompletion<?,?,?> c;
- return (c = base) != null && c.dep != null;
+ return (c = base) != null
+ // && c.isLive()
+ && c.dep != null;
}
}
- /** Pushes completion to this and b unless both done. */
+ /**
+ * Pushes completion to this and b unless both done.
+ * Caller should first check that either result or b.result is null.
+ */
final void bipush(CompletableFuture<?> b, BiCompletion<?,?,?> c) {
if (c != null) {
- Object r;
- while ((r = result) == null && !tryPushStack(c))
- lazySetNext(c, null); // clear on failure
- if (b != null && b != this && b.result == null) {
- Completion q = (r != null) ? c : new CoCompletion(c);
- while (b.result == null && !b.tryPushStack(q))
- lazySetNext(q, null); // clear on failure
+ while (result == null) {
+ if (tryPushStack(c)) {
+ if (b.result == null)
+ b.unipush(new CoCompletion(c));
+ else if (result != null)
+ c.tryFire(SYNC);
+ return;
+ }
}
+ b.unipush(c);
}
}
@@ -1107,9 +1173,10 @@
final CompletableFuture<T> postFire(CompletableFuture<?> a,
CompletableFuture<?> b, int mode) {
if (b != null && b.stack != null) { // clean second source
- if (b.result == null)
+ Object r;
+ if ((r = b.result) == null)
b.cleanStack();
- else if (mode >= 0)
+ if (mode >= 0 && (r != null || b.result != null))
b.postComplete();
}
return postFire(a, mode);
@@ -1127,22 +1194,21 @@
CompletableFuture<V> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null ||
- !d.biApply(a = src, b = snd, fn, mode > 0 ? null : this))
+ Object r, s; BiFunction<? super T,? super U,? extends V> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null
+ || (b = snd) == null || (s = b.result) == null
+ || !d.biApply(r, s, f, mode > 0 ? null : this))
return null;
dep = null; src = null; snd = null; fn = null;
return d.postFire(a, b, mode);
}
}
- final <R,S> boolean biApply(CompletableFuture<R> a,
- CompletableFuture<S> b,
+ final <R,S> boolean biApply(Object r, Object s,
BiFunction<? super R,? super S,? extends T> f,
BiApply<R,S,T> c) {
- Object r, s; Throwable x;
- if (a == null || (r = a.result) == null ||
- b == null || (s = b.result) == null || f == null)
- return false;
+ Throwable x;
tryComplete: if (result == null) {
if (r instanceof AltResult) {
if ((x = ((AltResult)r).ex) != null) {
@@ -1174,15 +1240,20 @@
private <U,V> CompletableFuture<V> biApplyStage(
Executor e, CompletionStage<U> o,
BiFunction<? super T,? super U,? extends V> f) {
- CompletableFuture<U> b;
+ CompletableFuture<U> b; Object r, s;
if (f == null || (b = o.toCompletableFuture()) == null)
throw new NullPointerException();
CompletableFuture<V> d = newIncompleteFuture();
- if (e != null || !d.biApply(this, b, f, null)) {
- BiApply<T,U,V> c = new BiApply<T,U,V>(e, d, this, b, f);
- bipush(b, c);
- c.tryFire(SYNC);
- }
+ if ((r = result) == null || (s = b.result) == null)
+ bipush(b, new BiApply<T,U,V>(e, d, this, b, f));
+ else if (e == null)
+ d.biApply(r, s, f, null);
+ else
+ try {
+ e.execute(new BiApply<T,U,V>(null, d, this, b, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
return d;
}
@@ -1198,22 +1269,21 @@
CompletableFuture<Void> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null ||
- !d.biAccept(a = src, b = snd, fn, mode > 0 ? null : this))
+ Object r, s; BiConsumer<? super T,? super U> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null
+ || (b = snd) == null || (s = b.result) == null
+ || !d.biAccept(r, s, f, mode > 0 ? null : this))
return null;
dep = null; src = null; snd = null; fn = null;
return d.postFire(a, b, mode);
}
}
- final <R,S> boolean biAccept(CompletableFuture<R> a,
- CompletableFuture<S> b,
+ final <R,S> boolean biAccept(Object r, Object s,
BiConsumer<? super R,? super S> f,
BiAccept<R,S> c) {
- Object r, s; Throwable x;
- if (a == null || (r = a.result) == null ||
- b == null || (s = b.result) == null || f == null)
- return false;
+ Throwable x;
tryComplete: if (result == null) {
if (r instanceof AltResult) {
if ((x = ((AltResult)r).ex) != null) {
@@ -1246,15 +1316,20 @@
private <U> CompletableFuture<Void> biAcceptStage(
Executor e, CompletionStage<U> o,
BiConsumer<? super T,? super U> f) {
- CompletableFuture<U> b;
+ CompletableFuture<U> b; Object r, s;
if (f == null || (b = o.toCompletableFuture()) == null)
throw new NullPointerException();
CompletableFuture<Void> d = newIncompleteFuture();
- if (e != null || !d.biAccept(this, b, f, null)) {
- BiAccept<T,U> c = new BiAccept<T,U>(e, d, this, b, f);
- bipush(b, c);
- c.tryFire(SYNC);
- }
+ if ((r = result) == null || (s = b.result) == null)
+ bipush(b, new BiAccept<T,U>(e, d, this, b, f));
+ else if (e == null)
+ d.biAccept(r, s, f, null);
+ else
+ try {
+ e.execute(new BiAccept<T,U>(null, d, this, b, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
return d;
}
@@ -1262,8 +1337,7 @@
static final class BiRun<T,U> extends BiCompletion<T,U,Void> {
Runnable fn;
BiRun(Executor executor, CompletableFuture<Void> dep,
- CompletableFuture<T> src,
- CompletableFuture<U> snd,
+ CompletableFuture<T> src, CompletableFuture<U> snd,
Runnable fn) {
super(executor, dep, src, snd); this.fn = fn;
}
@@ -1271,25 +1345,25 @@
CompletableFuture<Void> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null ||
- !d.biRun(a = src, b = snd, fn, mode > 0 ? null : this))
+ Object r, s; Runnable f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null
+ || (b = snd) == null || (s = b.result) == null
+ || !d.biRun(r, s, f, mode > 0 ? null : this))
return null;
dep = null; src = null; snd = null; fn = null;
return d.postFire(a, b, mode);
}
}
- final boolean biRun(CompletableFuture<?> a, CompletableFuture<?> b,
- Runnable f, BiRun<?,?> c) {
- Object r, s; Throwable x;
- if (a == null || (r = a.result) == null ||
- b == null || (s = b.result) == null || f == null)
- return false;
+ final boolean biRun(Object r, Object s, Runnable f, BiRun<?,?> c) {
+ Throwable x; Object z;
if (result == null) {
- if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
- completeThrowable(x, r);
- else if (s instanceof AltResult && (x = ((AltResult)s).ex) != null)
- completeThrowable(x, s);
+ if ((r instanceof AltResult
+ && (x = ((AltResult)(z = r)).ex) != null) ||
+ (s instanceof AltResult
+ && (x = ((AltResult)(z = s)).ex) != null))
+ completeThrowable(x, z);
else
try {
if (c != null && !c.claim())
@@ -1305,52 +1379,52 @@
private CompletableFuture<Void> biRunStage(Executor e, CompletionStage<?> o,
Runnable f) {
- CompletableFuture<?> b;
+ CompletableFuture<?> b; Object r, s;
if (f == null || (b = o.toCompletableFuture()) == null)
throw new NullPointerException();
CompletableFuture<Void> d = newIncompleteFuture();
- if (e != null || !d.biRun(this, b, f, null)) {
- BiRun<T,?> c = new BiRun<>(e, d, this, b, f);
- bipush(b, c);
- c.tryFire(SYNC);
- }
+ if ((r = result) == null || (s = b.result) == null)
+ bipush(b, new BiRun<>(e, d, this, b, f));
+ else if (e == null)
+ d.biRun(r, s, f, null);
+ else
+ try {
+ e.execute(new BiRun<>(null, d, this, b, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
return d;
}
@SuppressWarnings("serial")
static final class BiRelay<T,U> extends BiCompletion<T,U,Void> { // for And
BiRelay(CompletableFuture<Void> dep,
- CompletableFuture<T> src,
- CompletableFuture<U> snd) {
+ CompletableFuture<T> src, CompletableFuture<U> snd) {
super(null, dep, src, snd);
}
final CompletableFuture<Void> tryFire(int mode) {
CompletableFuture<Void> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null || !d.biRelay(a = src, b = snd))
+ Object r, s, z; Throwable x;
+ if ((d = dep) == null
+ || (a = src) == null || (r = a.result) == null
+ || (b = snd) == null || (s = b.result) == null)
return null;
+ if (d.result == null) {
+ if ((r instanceof AltResult
+ && (x = ((AltResult)(z = r)).ex) != null) ||
+ (s instanceof AltResult
+ && (x = ((AltResult)(z = s)).ex) != null))
+ d.completeThrowable(x, z);
+ else
+ d.completeNull();
+ }
src = null; snd = null; dep = null;
return d.postFire(a, b, mode);
}
}
- boolean biRelay(CompletableFuture<?> a, CompletableFuture<?> b) {
- Object r, s; Throwable x;
- if (a == null || (r = a.result) == null ||
- b == null || (s = b.result) == null)
- return false;
- if (result == null) {
- if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
- completeThrowable(x, r);
- else if (s instanceof AltResult && (x = ((AltResult)s).ex) != null)
- completeThrowable(x, s);
- else
- completeNull();
- }
- return true;
- }
-
/** Recursively constructs a tree of completions. */
static CompletableFuture<Void> andTree(CompletableFuture<?>[] cfs,
int lo, int hi) {
@@ -1358,39 +1432,44 @@
if (lo > hi) // empty
d.result = NIL;
else {
- CompletableFuture<?> a, b;
+ CompletableFuture<?> a, b; Object r, s, z; Throwable x;
int mid = (lo + hi) >>> 1;
if ((a = (lo == mid ? cfs[lo] :
andTree(cfs, lo, mid))) == null ||
(b = (lo == hi ? a : (hi == mid+1) ? cfs[hi] :
andTree(cfs, mid+1, hi))) == null)
throw new NullPointerException();
- if (!d.biRelay(a, b)) {
- BiRelay<?,?> c = new BiRelay<>(d, a, b);
- a.bipush(b, c);
- c.tryFire(SYNC);
- }
+ if ((r = a.result) == null || (s = b.result) == null)
+ a.bipush(b, new BiRelay<>(d, a, b));
+ else if ((r instanceof AltResult
+ && (x = ((AltResult)(z = r)).ex) != null) ||
+ (s instanceof AltResult
+ && (x = ((AltResult)(z = s)).ex) != null))
+ d.result = encodeThrowable(x, z);
+ else
+ d.result = NIL;
}
return d;
}
/* ------------- Projected (Ored) BiCompletions -------------- */
- /** Pushes completion to this and b unless either done. */
+ /**
+ * Pushes completion to this and b unless either done.
+ * Caller should first check that result and b.result are both null.
+ */
final void orpush(CompletableFuture<?> b, BiCompletion<?,?,?> c) {
if (c != null) {
- while ((b == null || b.result == null) && result == null) {
- if (tryPushStack(c)) {
- if (b != null && b != this && b.result == null) {
- Completion q = new CoCompletion(c);
- while (result == null && b.result == null &&
- !b.tryPushStack(q))
- lazySetNext(q, null); // clear on failure
- }
+ while (!tryPushStack(c)) {
+ if (result != null) {
+ NEXT.set(c, null);
break;
}
- lazySetNext(c, null); // clear on failure
}
+ if (result != null)
+ c.tryFire(SYNC);
+ else
+ b.unipush(new CoCompletion(c));
}
}
@@ -1398,8 +1477,7 @@
static final class OrApply<T,U extends T,V> extends BiCompletion<T,U,V> {
Function<? super T,? extends V> fn;
OrApply(Executor executor, CompletableFuture<V> dep,
- CompletableFuture<T> src,
- CompletableFuture<U> snd,
+ CompletableFuture<T> src, CompletableFuture<U> snd,
Function<? super T,? extends V> fn) {
super(executor, dep, src, snd); this.fn = fn;
}
@@ -1407,54 +1485,46 @@
CompletableFuture<V> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null ||
- !d.orApply(a = src, b = snd, fn, mode > 0 ? null : this))
+ Object r; Throwable x; Function<? super T,? extends V> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (b = snd) == null
+ || ((r = a.result) == null && (r = b.result) == null))
return null;
+ tryComplete: if (d.result == null) {
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.completeThrowable(x, r);
+ break tryComplete;
+ }
+ r = null;
+ }
+ @SuppressWarnings("unchecked") T t = (T) r;
+ d.completeValue(f.apply(t));
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; snd = null; fn = null;
return d.postFire(a, b, mode);
}
}
- final <R,S extends R> boolean orApply(CompletableFuture<R> a,
- CompletableFuture<S> b,
- Function<? super R, ? extends T> f,
- OrApply<R,S,T> c) {
- Object r; Throwable x;
- if (a == null || b == null ||
- ((r = a.result) == null && (r = b.result) == null) || f == null)
- return false;
- tryComplete: if (result == null) {
- try {
- if (c != null && !c.claim())
- return false;
- if (r instanceof AltResult) {
- if ((x = ((AltResult)r).ex) != null) {
- completeThrowable(x, r);
- break tryComplete;
- }
- r = null;
- }
- @SuppressWarnings("unchecked") R rr = (R) r;
- completeValue(f.apply(rr));
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
- }
-
private <U extends T,V> CompletableFuture<V> orApplyStage(
- Executor e, CompletionStage<U> o,
- Function<? super T, ? extends V> f) {
+ Executor e, CompletionStage<U> o, Function<? super T, ? extends V> f) {
CompletableFuture<U> b;
if (f == null || (b = o.toCompletableFuture()) == null)
throw new NullPointerException();
+
+ Object r; CompletableFuture<? extends T> z;
+ if ((r = (z = this).result) != null ||
+ (r = (z = b).result) != null)
+ return z.uniApplyNow(r, e, f);
+
CompletableFuture<V> d = newIncompleteFuture();
- if (e != null || !d.orApply(this, b, f, null)) {
- OrApply<T,U,V> c = new OrApply<T,U,V>(e, d, this, b, f);
- orpush(b, c);
- c.tryFire(SYNC);
- }
+ orpush(b, new OrApply<T,U,V>(e, d, this, b, f));
return d;
}
@@ -1462,8 +1532,7 @@
static final class OrAccept<T,U extends T> extends BiCompletion<T,U,Void> {
Consumer<? super T> fn;
OrAccept(Executor executor, CompletableFuture<Void> dep,
- CompletableFuture<T> src,
- CompletableFuture<U> snd,
+ CompletableFuture<T> src, CompletableFuture<U> snd,
Consumer<? super T> fn) {
super(executor, dep, src, snd); this.fn = fn;
}
@@ -1471,54 +1540,47 @@
CompletableFuture<Void> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null ||
- !d.orAccept(a = src, b = snd, fn, mode > 0 ? null : this))
+ Object r; Throwable x; Consumer<? super T> f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (b = snd) == null
+ || ((r = a.result) == null && (r = b.result) == null))
return null;
+ tryComplete: if (d.result == null) {
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ if (r instanceof AltResult) {
+ if ((x = ((AltResult)r).ex) != null) {
+ d.completeThrowable(x, r);
+ break tryComplete;
+ }
+ r = null;
+ }
+ @SuppressWarnings("unchecked") T t = (T) r;
+ f.accept(t);
+ d.completeNull();
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; snd = null; fn = null;
return d.postFire(a, b, mode);
}
}
- final <R,S extends R> boolean orAccept(CompletableFuture<R> a,
- CompletableFuture<S> b,
- Consumer<? super R> f,
- OrAccept<R,S> c) {
- Object r; Throwable x;
- if (a == null || b == null ||
- ((r = a.result) == null && (r = b.result) == null) || f == null)
- return false;
- tryComplete: if (result == null) {
- try {
- if (c != null && !c.claim())
- return false;
- if (r instanceof AltResult) {
- if ((x = ((AltResult)r).ex) != null) {
- completeThrowable(x, r);
- break tryComplete;
- }
- r = null;
- }
- @SuppressWarnings("unchecked") R rr = (R) r;
- f.accept(rr);
- completeNull();
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
- }
-
private <U extends T> CompletableFuture<Void> orAcceptStage(
Executor e, CompletionStage<U> o, Consumer<? super T> f) {
CompletableFuture<U> b;
if (f == null || (b = o.toCompletableFuture()) == null)
throw new NullPointerException();
+
+ Object r; CompletableFuture<? extends T> z;
+ if ((r = (z = this).result) != null ||
+ (r = (z = b).result) != null)
+ return z.uniAcceptNow(r, e, f);
+
CompletableFuture<Void> d = newIncompleteFuture();
- if (e != null || !d.orAccept(this, b, f, null)) {
- OrAccept<T,U> c = new OrAccept<T,U>(e, d, this, b, f);
- orpush(b, c);
- c.tryFire(SYNC);
- }
+ orpush(b, new OrAccept<T,U>(e, d, this, b, f));
return d;
}
@@ -1526,8 +1588,7 @@
static final class OrRun<T,U> extends BiCompletion<T,U,Void> {
Runnable fn;
OrRun(Executor executor, CompletableFuture<Void> dep,
- CompletableFuture<T> src,
- CompletableFuture<U> snd,
+ CompletableFuture<T> src, CompletableFuture<U> snd,
Runnable fn) {
super(executor, dep, src, snd); this.fn = fn;
}
@@ -1535,95 +1596,84 @@
CompletableFuture<Void> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null ||
- !d.orRun(a = src, b = snd, fn, mode > 0 ? null : this))
+ Object r; Throwable x; Runnable f;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (b = snd) == null
+ || ((r = a.result) == null && (r = b.result) == null))
return null;
+ if (d.result == null) {
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ else if (r instanceof AltResult
+ && (x = ((AltResult)r).ex) != null)
+ d.completeThrowable(x, r);
+ else {
+ f.run();
+ d.completeNull();
+ }
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
dep = null; src = null; snd = null; fn = null;
return d.postFire(a, b, mode);
}
}
- final boolean orRun(CompletableFuture<?> a, CompletableFuture<?> b,
- Runnable f, OrRun<?,?> c) {
- Object r; Throwable x;
- if (a == null || b == null ||
- ((r = a.result) == null && (r = b.result) == null) || f == null)
- return false;
- if (result == null) {
- try {
- if (c != null && !c.claim())
- return false;
- if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
- completeThrowable(x, r);
- else {
- f.run();
- completeNull();
- }
- } catch (Throwable ex) {
- completeThrowable(ex);
- }
- }
- return true;
- }
-
private CompletableFuture<Void> orRunStage(Executor e, CompletionStage<?> o,
Runnable f) {
CompletableFuture<?> b;
if (f == null || (b = o.toCompletableFuture()) == null)
throw new NullPointerException();
+
+ Object r; CompletableFuture<?> z;
+ if ((r = (z = this).result) != null ||
+ (r = (z = b).result) != null)
+ return z.uniRunNow(r, e, f);
+
CompletableFuture<Void> d = newIncompleteFuture();
- if (e != null || !d.orRun(this, b, f, null)) {
- OrRun<T,?> c = new OrRun<>(e, d, this, b, f);
- orpush(b, c);
- c.tryFire(SYNC);
- }
+ orpush(b, new OrRun<>(e, d, this, b, f));
return d;
}
@SuppressWarnings("serial")
static final class OrRelay<T,U> extends BiCompletion<T,U,Object> { // for Or
- OrRelay(CompletableFuture<Object> dep, CompletableFuture<T> src,
- CompletableFuture<U> snd) {
+ OrRelay(CompletableFuture<Object> dep,
+ CompletableFuture<T> src, CompletableFuture<U> snd) {
super(null, dep, src, snd);
}
final CompletableFuture<Object> tryFire(int mode) {
CompletableFuture<Object> d;
CompletableFuture<T> a;
CompletableFuture<U> b;
- if ((d = dep) == null || !d.orRelay(a = src, b = snd))
+ Object r;
+ if ((d = dep) == null
+ || (a = src) == null || (b = snd) == null
+ || ((r = a.result) == null && (r = b.result) == null))
return null;
+ d.completeRelay(r);
src = null; snd = null; dep = null;
return d.postFire(a, b, mode);
}
}
- final boolean orRelay(CompletableFuture<?> a, CompletableFuture<?> b) {
- Object r;
- if (a == null || b == null ||
- ((r = a.result) == null && (r = b.result) == null))
- return false;
- if (result == null)
- completeRelay(r);
- return true;
- }
-
/** Recursively constructs a tree of completions. */
static CompletableFuture<Object> orTree(CompletableFuture<?>[] cfs,
int lo, int hi) {
CompletableFuture<Object> d = new CompletableFuture<Object>();
if (lo <= hi) {
- CompletableFuture<?> a, b;
+ CompletableFuture<?> a, b; Object r;
int mid = (lo + hi) >>> 1;
if ((a = (lo == mid ? cfs[lo] :
orTree(cfs, lo, mid))) == null ||
(b = (lo == hi ? a : (hi == mid+1) ? cfs[hi] :
orTree(cfs, mid+1, hi))) == null)
throw new NullPointerException();
- if (!d.orRelay(a, b)) {
- OrRelay<?,?> c = new OrRelay<>(d, a, b);
- a.orpush(b, c);
- c.tryFire(SYNC);
- }
+ if ((r = a.result) != null && (r = b.result) != null)
+ d.result = encodeRelay(r);
+ else
+ a.orpush(b, new OrRelay<>(d, a, b));
}
return d;
}
@@ -1640,7 +1690,7 @@
public final Void getRawResult() { return null; }
public final void setRawResult(Void v) {}
- public final boolean exec() { run(); return true; }
+ public final boolean exec() { run(); return false; }
public void run() {
CompletableFuture<T> d; Supplier<? extends T> f;
@@ -1676,7 +1726,7 @@
public final Void getRawResult() { return null; }
public final void setRawResult(Void v) {}
- public final boolean exec() { run(); return true; }
+ public final boolean exec() { run(); return false; }
public void run() {
CompletableFuture<Void> d; Runnable f;
@@ -1760,15 +1810,13 @@
private Object waitingGet(boolean interruptible) {
Signaller q = null;
boolean queued = false;
- int spins = SPINS;
Object r;
while ((r = result) == null) {
- if (spins > 0) {
- if (ThreadLocalRandom.nextSecondarySeed() >= 0)
- --spins;
+ if (q == null) {
+ q = new Signaller(interruptible, 0L, 0L);
+ if (Thread.currentThread() instanceof ForkJoinWorkerThread)
+ ForkJoinPool.helpAsyncBlocker(defaultExecutor(), q);
}
- else if (q == null)
- q = new Signaller(interruptible, 0L, 0L);
else if (!queued)
queued = tryPushStack(q);
else {
@@ -1781,16 +1829,14 @@
break;
}
}
- if (q != null) {
+ if (q != null && queued) {
q.thread = null;
- if (q.interrupted) {
- if (interruptible)
- cleanStack();
- else
- Thread.currentThread().interrupt();
- }
+ if (!interruptible && q.interrupted)
+ Thread.currentThread().interrupt();
+ if (r == null)
+ cleanStack();
}
- if (r != null)
+ if (r != null || (r = result) != null)
postComplete();
return r;
}
@@ -1808,9 +1854,12 @@
Signaller q = null;
boolean queued = false;
Object r;
- while ((r = result) == null) { // similar to untimed, without spins
- if (q == null)
+ while ((r = result) == null) { // similar to untimed
+ if (q == null) {
q = new Signaller(true, nanos, deadline);
+ if (Thread.currentThread() instanceof ForkJoinWorkerThread)
+ ForkJoinPool.helpAsyncBlocker(defaultExecutor(), q);
+ }
else if (!queued)
queued = tryPushStack(q);
else if (q.nanos <= 0L)
@@ -1825,12 +1874,13 @@
break;
}
}
- if (q != null)
+ if (q != null && queued) {
q.thread = null;
- if (r != null)
+ if (r == null)
+ cleanStack();
+ }
+ if (r != null || (r = result) != null)
postComplete();
- else
- cleanStack();
if (r != null || (q != null && q.interrupted))
return r;
}
@@ -1942,9 +1992,12 @@
* @throws InterruptedException if the current thread was interrupted
* while waiting
*/
+ @SuppressWarnings("unchecked")
public T get() throws InterruptedException, ExecutionException {
Object r;
- return reportGet((r = result) == null ? waitingGet(true) : r);
+ if ((r = result) == null)
+ r = waitingGet(true);
+ return (T) reportGet(r);
}
/**
@@ -1960,11 +2013,14 @@
* while waiting
* @throws TimeoutException if the wait timed out
*/
+ @SuppressWarnings("unchecked")
public T get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
+ long nanos = unit.toNanos(timeout);
Object r;
- long nanos = unit.toNanos(timeout);
- return reportGet((r = result) == null ? timedGet(nanos) : r);
+ if ((r = result) == null)
+ r = timedGet(nanos);
+ return (T) reportGet(r);
}
/**
@@ -1981,9 +2037,12 @@
* @throws CompletionException if this future completed
* exceptionally or a completion computation threw an exception
*/
+ @SuppressWarnings("unchecked")
public T join() {
Object r;
- return reportJoin((r = result) == null ? waitingGet(false) : r);
+ if ((r = result) == null)
+ r = waitingGet(false);
+ return (T) reportJoin(r);
}
/**
@@ -1996,9 +2055,10 @@
* @throws CompletionException if this future completed
* exceptionally or a completion computation threw an exception
*/
+ @SuppressWarnings("unchecked")
public T getNow(T valueIfAbsent) {
Object r;
- return ((r = result) == null) ? valueIfAbsent : reportJoin(r);
+ return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r);
}
/**
@@ -2775,19 +2835,16 @@
throw new UnsupportedOperationException(); }
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long RESULT;
- private static final long STACK;
- private static final long NEXT;
+ // VarHandle mechanics
+ private static final VarHandle RESULT;
+ private static final VarHandle STACK;
+ private static final VarHandle NEXT;
static {
try {
- RESULT = U.objectFieldOffset
- (CompletableFuture.class.getDeclaredField("result"));
- STACK = U.objectFieldOffset
- (CompletableFuture.class.getDeclaredField("stack"));
- NEXT = U.objectFieldOffset
- (Completion.class.getDeclaredField("next"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ RESULT = l.findVarHandle(CompletableFuture.class, "result", Object.class);
+ STACK = l.findVarHandle(CompletableFuture.class, "stack", Completion.class);
+ NEXT = l.findVarHandle(Completion.class, "next", Completion.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java Thu Jul 21 17:13:23 2016 +0000
@@ -68,6 +68,7 @@
import java.util.function.ToLongBiFunction;
import java.util.function.ToLongFunction;
import java.util.stream.Stream;
+import jdk.internal.misc.Unsafe;
/**
* A hash table supporting full concurrency of retrievals and
@@ -747,7 +748,7 @@
/* ---------------- Table element access -------------- */
/*
- * Volatile access methods are used for table elements as well as
+ * Atomic access methods are used for table elements as well as
* elements of in-progress next table while resizing. All uses of
* the tab arguments must be null checked by callers. All callers
* also paranoically precheck that tab's length is not zero (or an
@@ -757,14 +758,12 @@
* errors by users, these checks must operate on local variables,
* which accounts for some odd-looking inline assignments below.
* Note that calls to setTabAt always occur within locked regions,
- * and so in principle require only release ordering, not
- * full volatile semantics, but are currently coded as volatile
- * writes to be conservative.
+ * and so require only release ordering.
*/
@SuppressWarnings("unchecked")
static final <K,V> Node<K,V> tabAt(Node<K,V>[] tab, int i) {
- return (Node<K,V>)U.getObjectVolatile(tab, ((long)i << ASHIFT) + ABASE);
+ return (Node<K,V>)U.getObjectAcquire(tab, ((long)i << ASHIFT) + ABASE);
}
static final <K,V> boolean casTabAt(Node<K,V>[] tab, int i,
@@ -773,7 +772,7 @@
}
static final <K,V> void setTabAt(Node<K,V>[] tab, int i, Node<K,V> v) {
- U.putObjectVolatile(tab, ((long)i << ASHIFT) + ABASE, v);
+ U.putObjectRelease(tab, ((long)i << ASHIFT) + ABASE, v);
}
/* ---------------- Fields -------------- */
@@ -3298,7 +3297,7 @@
return true;
}
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private static final long LOCKSTATE;
static {
try {
@@ -6341,7 +6340,7 @@
}
// Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private static final long SIZECTL;
private static final long TRANSFERINDEX;
private static final long BASECOUNT;
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.AbstractCollection;
import java.util.Arrays;
import java.util.Collection;
@@ -292,64 +294,23 @@
volatile Node<E> prev;
volatile E item;
volatile Node<E> next;
-
- Node() { // default constructor for NEXT_TERMINATOR, PREV_TERMINATOR
- }
-
- /**
- * Constructs a new node. Uses relaxed write because item can
- * only be seen after publication via casNext or casPrev.
- */
- Node(E item) {
- U.putObject(this, ITEM, item);
- }
-
- boolean casItem(E cmp, E val) {
- return U.compareAndSwapObject(this, ITEM, cmp, val);
- }
-
- void lazySetNext(Node<E> val) {
- U.putObjectRelease(this, NEXT, val);
- }
-
- boolean casNext(Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(this, NEXT, cmp, val);
- }
+ }
- void lazySetPrev(Node<E> val) {
- U.putObjectRelease(this, PREV, val);
- }
-
- boolean casPrev(Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(this, PREV, cmp, val);
- }
-
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long PREV;
- private static final long ITEM;
- private static final long NEXT;
-
- static {
- try {
- PREV = U.objectFieldOffset
- (Node.class.getDeclaredField("prev"));
- ITEM = U.objectFieldOffset
- (Node.class.getDeclaredField("item"));
- NEXT = U.objectFieldOffset
- (Node.class.getDeclaredField("next"));
- } catch (ReflectiveOperationException e) {
- throw new Error(e);
- }
- }
+ /**
+ * Returns a new node holding item. Uses relaxed write because item
+ * can only be seen after piggy-backing publication via CAS.
+ */
+ static <E> Node<E> newNode(E item) {
+ Node<E> node = new Node<E>();
+ ITEM.set(node, item);
+ return node;
}
/**
* Links e as first element.
*/
private void linkFirst(E e) {
- final Node<E> newNode = new Node<E>(Objects.requireNonNull(e));
+ final Node<E> newNode = newNode(Objects.requireNonNull(e));
restartFromHead:
for (;;)
@@ -363,13 +324,13 @@
continue restartFromHead;
else {
// p is first node
- newNode.lazySetNext(p); // CAS piggyback
- if (p.casPrev(null, newNode)) {
+ NEXT.set(newNode, p); // CAS piggyback
+ if (PREV.compareAndSet(p, null, newNode)) {
// Successful CAS is the linearization point
// for e to become an element of this deque,
// and for newNode to become "live".
- if (p != h) // hop two nodes at a time
- casHead(h, newNode); // Failure is OK.
+ if (p != h) // hop two nodes at a time; failure is OK
+ HEAD.weakCompareAndSetVolatile(this, h, newNode);
return;
}
// Lost CAS race to another thread; re-read prev
@@ -381,7 +342,7 @@
* Links e as last element.
*/
private void linkLast(E e) {
- final Node<E> newNode = new Node<E>(Objects.requireNonNull(e));
+ final Node<E> newNode = newNode(Objects.requireNonNull(e));
restartFromTail:
for (;;)
@@ -395,13 +356,13 @@
continue restartFromTail;
else {
// p is last node
- newNode.lazySetPrev(p); // CAS piggyback
- if (p.casNext(null, newNode)) {
+ PREV.set(newNode, p); // CAS piggyback
+ if (NEXT.compareAndSet(p, null, newNode)) {
// Successful CAS is the linearization point
// for e to become an element of this deque,
// and for newNode to become "live".
- if (p != t) // hop two nodes at a time
- casTail(t, newNode); // Failure is OK.
+ if (p != t) // hop two nodes at a time; failure is OK
+ TAIL.weakCompareAndSetVolatile(this, t, newNode);
return;
}
// Lost CAS race to another thread; re-read next
@@ -516,8 +477,8 @@
updateTail(); // Ensure x is not reachable from tail
// Finally, actually gc-unlink
- x.lazySetPrev(isFirst ? prevTerminator() : x);
- x.lazySetNext(isLast ? nextTerminator() : x);
+ PREV.setRelease(x, isFirst ? prevTerminator() : x);
+ NEXT.setRelease(x, isLast ? nextTerminator() : x);
}
}
}
@@ -531,7 +492,8 @@
// assert first.item == null;
for (Node<E> o = null, p = next, q;;) {
if (p.item != null || (q = p.next) == null) {
- if (o != null && p.prev != p && first.casNext(next, p)) {
+ if (o != null && p.prev != p &&
+ NEXT.compareAndSet(first, next, p)) {
skipDeletedPredecessors(p);
if (first.prev == null &&
(p.next == null || p.item != null) &&
@@ -541,8 +503,8 @@
updateTail(); // Ensure o is not reachable from tail
// Finally, actually gc-unlink
- o.lazySetNext(o);
- o.lazySetPrev(prevTerminator());
+ NEXT.setRelease(o, o);
+ PREV.setRelease(o, prevTerminator());
}
}
return;
@@ -565,7 +527,8 @@
// assert last.item == null;
for (Node<E> o = null, p = prev, q;;) {
if (p.item != null || (q = p.prev) == null) {
- if (o != null && p.next != p && last.casPrev(prev, p)) {
+ if (o != null && p.next != p &&
+ PREV.compareAndSet(last, prev, p)) {
skipDeletedSuccessors(p);
if (last.next == null &&
(p.prev == null || p.item != null) &&
@@ -575,8 +538,8 @@
updateTail(); // Ensure o is not reachable from tail
// Finally, actually gc-unlink
- o.lazySetPrev(o);
- o.lazySetNext(nextTerminator());
+ PREV.setRelease(o, o);
+ NEXT.setRelease(o, nextTerminator());
}
}
return;
@@ -607,7 +570,7 @@
(q = (p = q).prev) == null) {
// It is possible that p is PREV_TERMINATOR,
// but if so, the CAS is guaranteed to fail.
- if (casHead(h, p))
+ if (HEAD.compareAndSet(this, h, p))
return;
else
continue restartFromHead;
@@ -637,7 +600,7 @@
(q = (p = q).next) == null) {
// It is possible that p is NEXT_TERMINATOR,
// but if so, the CAS is guaranteed to fail.
- if (casTail(t, p))
+ if (TAIL.compareAndSet(this, t, p))
return;
else
continue restartFromTail;
@@ -675,7 +638,7 @@
}
// found active CAS target
- if (prev == p || x.casPrev(prev, p))
+ if (prev == p || PREV.compareAndSet(x, prev, p))
return;
} while (x.item != null || x.next == null);
@@ -706,7 +669,7 @@
}
// found active CAS target
- if (next == p || x.casNext(next, p))
+ if (next == p || NEXT.compareAndSet(x, next, p))
return;
} while (x.item != null || x.prev == null);
@@ -751,7 +714,7 @@
else if (p == h
// It is possible that p is PREV_TERMINATOR,
// but if so, the CAS is guaranteed to fail.
- || casHead(h, p))
+ || HEAD.compareAndSet(this, h, p))
return p;
else
continue restartFromHead;
@@ -776,7 +739,7 @@
else if (p == t
// It is possible that p is NEXT_TERMINATOR,
// but if so, the CAS is guaranteed to fail.
- || casTail(t, p))
+ || TAIL.compareAndSet(this, t, p))
return p;
else
continue restartFromTail;
@@ -802,7 +765,7 @@
* Constructs an empty deque.
*/
public ConcurrentLinkedDeque() {
- head = tail = new Node<E>(null);
+ head = tail = new Node<E>();
}
/**
@@ -818,12 +781,12 @@
// Copy c into a private chain of Nodes
Node<E> h = null, t = null;
for (E e : c) {
- Node<E> newNode = new Node<E>(Objects.requireNonNull(e));
+ Node<E> newNode = newNode(Objects.requireNonNull(e));
if (h == null)
h = t = newNode;
else {
- t.lazySetNext(newNode);
- newNode.lazySetPrev(t);
+ NEXT.set(t, newNode);
+ PREV.set(newNode, t);
t = newNode;
}
}
@@ -836,12 +799,12 @@
private void initHeadTail(Node<E> h, Node<E> t) {
if (h == t) {
if (h == null)
- h = t = new Node<E>(null);
+ h = t = new Node<E>();
else {
// Avoid edge case of a single Node with non-null item.
- Node<E> newNode = new Node<E>(null);
- t.lazySetNext(newNode);
- newNode.lazySetPrev(t);
+ Node<E> newNode = new Node<E>();
+ NEXT.set(t, newNode);
+ PREV.set(newNode, t);
t = newNode;
}
}
@@ -934,7 +897,7 @@
public E pollFirst() {
for (Node<E> p = first(); p != null; p = succ(p)) {
E item = p.item;
- if (item != null && p.casItem(item, null)) {
+ if (item != null && ITEM.compareAndSet(p, item, null)) {
unlink(p);
return item;
}
@@ -945,7 +908,7 @@
public E pollLast() {
for (Node<E> p = last(); p != null; p = pred(p)) {
E item = p.item;
- if (item != null && p.casItem(item, null)) {
+ if (item != null && ITEM.compareAndSet(p, item, null)) {
unlink(p);
return item;
}
@@ -1031,7 +994,8 @@
Objects.requireNonNull(o);
for (Node<E> p = first(); p != null; p = succ(p)) {
E item = p.item;
- if (item != null && o.equals(item) && p.casItem(item, null)) {
+ if (item != null && o.equals(item) &&
+ ITEM.compareAndSet(p, item, null)) {
unlink(p);
return true;
}
@@ -1055,7 +1019,8 @@
Objects.requireNonNull(o);
for (Node<E> p = last(); p != null; p = pred(p)) {
E item = p.item;
- if (item != null && o.equals(item) && p.casItem(item, null)) {
+ if (item != null && o.equals(item) &&
+ ITEM.compareAndSet(p, item, null)) {
unlink(p);
return true;
}
@@ -1159,12 +1124,12 @@
// Copy c into a private chain of Nodes
Node<E> beginningOfTheEnd = null, last = null;
for (E e : c) {
- Node<E> newNode = new Node<E>(Objects.requireNonNull(e));
+ Node<E> newNode = newNode(Objects.requireNonNull(e));
if (beginningOfTheEnd == null)
beginningOfTheEnd = last = newNode;
else {
- last.lazySetNext(newNode);
- newNode.lazySetPrev(last);
+ NEXT.set(last, newNode);
+ PREV.set(newNode, last);
last = newNode;
}
}
@@ -1184,16 +1149,16 @@
continue restartFromTail;
else {
// p is last node
- beginningOfTheEnd.lazySetPrev(p); // CAS piggyback
- if (p.casNext(null, beginningOfTheEnd)) {
+ PREV.set(beginningOfTheEnd, p); // CAS piggyback
+ if (NEXT.compareAndSet(p, null, beginningOfTheEnd)) {
// Successful CAS is the linearization point
// for all elements to be added to this deque.
- if (!casTail(t, last)) {
+ if (!TAIL.weakCompareAndSetVolatile(this, t, last)) {
// Try a little harder to update tail,
// since we may be adding many elements.
t = tail;
if (last.next == null)
- casTail(t, last);
+ TAIL.weakCompareAndSetVolatile(this, t, last);
}
return true;
}
@@ -1586,41 +1551,38 @@
Node<E> h = null, t = null;
for (Object item; (item = s.readObject()) != null; ) {
@SuppressWarnings("unchecked")
- Node<E> newNode = new Node<E>((E) item);
+ Node<E> newNode = newNode((E) item);
if (h == null)
h = t = newNode;
else {
- t.lazySetNext(newNode);
- newNode.lazySetPrev(t);
+ NEXT.set(t, newNode);
+ PREV.set(newNode, t);
t = newNode;
}
}
initHeadTail(h, t);
}
- private boolean casHead(Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(this, HEAD, cmp, val);
- }
-
- private boolean casTail(Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(this, TAIL, cmp, val);
- }
-
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long HEAD;
- private static final long TAIL;
+ // VarHandle mechanics
+ private static final VarHandle HEAD;
+ private static final VarHandle TAIL;
+ private static final VarHandle PREV;
+ private static final VarHandle NEXT;
+ private static final VarHandle ITEM;
static {
PREV_TERMINATOR = new Node<Object>();
PREV_TERMINATOR.next = PREV_TERMINATOR;
NEXT_TERMINATOR = new Node<Object>();
NEXT_TERMINATOR.prev = NEXT_TERMINATOR;
try {
- HEAD = U.objectFieldOffset
- (ConcurrentLinkedDeque.class.getDeclaredField("head"));
- TAIL = U.objectFieldOffset
- (ConcurrentLinkedDeque.class.getDeclaredField("tail"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ HEAD = l.findVarHandle(ConcurrentLinkedDeque.class, "head",
+ Node.class);
+ TAIL = l.findVarHandle(ConcurrentLinkedDeque.class, "tail",
+ Node.class);
+ PREV = l.findVarHandle(Node.class, "prev", Node.class);
+ NEXT = l.findVarHandle(Node.class, "next", Node.class);
+ ITEM = l.findVarHandle(Node.class, "item", Object.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.AbstractQueue;
import java.util.Arrays;
import java.util.Collection;
@@ -166,9 +168,8 @@
* this is merely an optimization.
*
* When constructing a Node (before enqueuing it) we avoid paying
- * for a volatile write to item by using Unsafe.putObject instead
- * of a normal write. This allows the cost of enqueue to be
- * "one-and-a-half" CASes.
+ * for a volatile write to item. This allows the cost of enqueue
+ * to be "one-and-a-half" CASes.
*
* Both head and tail may or may not point to a Node with a
* non-null item. If the queue is empty, all items must of course
@@ -178,33 +179,21 @@
* optimization.
*/
- private static class Node<E> {
+ static final class Node<E> {
volatile E item;
volatile Node<E> next;
}
/**
* Returns a new node holding item. Uses relaxed write because item
- * can only be seen after piggy-backing publication via casNext.
+ * can only be seen after piggy-backing publication via CAS.
*/
static <E> Node<E> newNode(E item) {
Node<E> node = new Node<E>();
- U.putObject(node, ITEM, item);
+ ITEM.set(node, item);
return node;
}
- static <E> boolean casItem(Node<E> node, E cmp, E val) {
- return U.compareAndSwapObject(node, ITEM, cmp, val);
- }
-
- static <E> void lazySetNext(Node<E> node, Node<E> val) {
- U.putObjectRelease(node, NEXT, val);
- }
-
- static <E> boolean casNext(Node<E> node, Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(node, NEXT, cmp, val);
- }
-
/**
* A node from which the first live (non-deleted) node (if any)
* can be reached in O(1) time.
@@ -256,7 +245,7 @@
if (h == null)
h = t = newNode;
else {
- lazySetNext(t, newNode);
+ NEXT.set(t, newNode);
t = newNode;
}
}
@@ -286,8 +275,8 @@
*/
final void updateHead(Node<E> h, Node<E> p) {
// assert h != null && p != null && (h == p || h.item == null);
- if (h != p && casHead(h, p))
- lazySetNext(h, h);
+ if (h != p && HEAD.compareAndSet(this, h, p))
+ NEXT.setRelease(h, h);
}
/**
@@ -314,12 +303,12 @@
Node<E> q = p.next;
if (q == null) {
// p is last node
- if (casNext(p, null, newNode)) {
+ if (NEXT.compareAndSet(p, null, newNode)) {
// Successful CAS is the linearization point
// for e to become an element of this queue,
// and for newNode to become "live".
- if (p != t) // hop two nodes at a time
- casTail(t, newNode); // Failure is OK.
+ if (p != t) // hop two nodes at a time; failure is OK
+ TAIL.weakCompareAndSetVolatile(this, t, newNode);
return true;
}
// Lost CAS race to another thread; re-read next
@@ -342,7 +331,7 @@
for (Node<E> h = head, p = h, q;;) {
E item = p.item;
- if (item != null && casItem(p, item, null)) {
+ if (item != null && ITEM.compareAndSet(p, item, null)) {
// Successful CAS is the linearization point
// for item to be removed from this queue.
if (p != h) // hop two nodes at a time
@@ -483,12 +472,12 @@
next = succ(p);
continue;
}
- removed = casItem(p, item, null);
+ removed = ITEM.compareAndSet(p, item, null);
}
next = succ(p);
if (pred != null && next != null) // unlink
- casNext(pred, p, next);
+ NEXT.weakCompareAndSetVolatile(pred, p, next);
if (removed)
return true;
}
@@ -520,7 +509,7 @@
if (beginningOfTheEnd == null)
beginningOfTheEnd = last = newNode;
else {
- lazySetNext(last, newNode);
+ NEXT.set(last, newNode);
last = newNode;
}
}
@@ -532,15 +521,15 @@
Node<E> q = p.next;
if (q == null) {
// p is last node
- if (casNext(p, null, beginningOfTheEnd)) {
+ if (NEXT.compareAndSet(p, null, beginningOfTheEnd)) {
// Successful CAS is the linearization point
// for all elements to be added to this queue.
- if (!casTail(t, last)) {
+ if (!TAIL.weakCompareAndSetVolatile(this, t, last)) {
// Try a little harder to update tail,
// since we may be adding many elements.
t = tail;
if (last.next == null)
- casTail(t, last);
+ TAIL.weakCompareAndSetVolatile(this, t, last);
}
return true;
}
@@ -744,7 +733,7 @@
}
// unlink deleted nodes
if ((q = succ(p)) != null)
- casNext(pred, p, q);
+ NEXT.compareAndSet(pred, p, q);
}
}
@@ -801,7 +790,7 @@
if (h == null)
h = t = newNode;
else {
- lazySetNext(t, newNode);
+ NEXT.set(t, newNode);
t = newNode;
}
}
@@ -919,31 +908,20 @@
return new CLQSpliterator<E>(this);
}
- private boolean casTail(Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(this, TAIL, cmp, val);
- }
-
- private boolean casHead(Node<E> cmp, Node<E> val) {
- return U.compareAndSwapObject(this, HEAD, cmp, val);
- }
-
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long HEAD;
- private static final long TAIL;
- private static final long ITEM;
- private static final long NEXT;
+ // VarHandle mechanics
+ private static final VarHandle HEAD;
+ private static final VarHandle TAIL;
+ private static final VarHandle ITEM;
+ private static final VarHandle NEXT;
static {
try {
- HEAD = U.objectFieldOffset
- (ConcurrentLinkedQueue.class.getDeclaredField("head"));
- TAIL = U.objectFieldOffset
- (ConcurrentLinkedQueue.class.getDeclaredField("tail"));
- ITEM = U.objectFieldOffset
- (Node.class.getDeclaredField("item"));
- NEXT = U.objectFieldOffset
- (Node.class.getDeclaredField("next"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ HEAD = l.findVarHandle(ConcurrentLinkedQueue.class, "head",
+ Node.class);
+ TAIL = l.findVarHandle(ConcurrentLinkedQueue.class, "tail",
+ Node.class);
+ ITEM = l.findVarHandle(Node.class, "item", Object.class);
+ NEXT = l.findVarHandle(Node.class, "next", Node.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.io.Serializable;
import java.util.AbstractCollection;
import java.util.AbstractMap;
@@ -401,7 +403,7 @@
* compareAndSet head node.
*/
private boolean casHead(HeadIndex<K,V> cmp, HeadIndex<K,V> val) {
- return U.compareAndSwapObject(this, HEAD, cmp, val);
+ return HEAD.compareAndSet(this, cmp, val);
}
/* ---------------- Nodes -------------- */
@@ -444,14 +446,14 @@
* compareAndSet value field.
*/
boolean casValue(Object cmp, Object val) {
- return U.compareAndSwapObject(this, VALUE, cmp, val);
+ return VALUE.compareAndSet(this, cmp, val);
}
/**
* compareAndSet next field.
*/
boolean casNext(Node<K,V> cmp, Node<K,V> val) {
- return U.compareAndSwapObject(this, NEXT, cmp, val);
+ return NEXT.compareAndSet(this, cmp, val);
}
/**
@@ -532,20 +534,16 @@
return new AbstractMap.SimpleImmutableEntry<K,V>(key, vv);
}
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long VALUE;
- private static final long NEXT;
-
+ // VarHandle mechanics
+ private static final VarHandle VALUE;
+ private static final VarHandle NEXT;
static {
try {
- VALUE = U.objectFieldOffset
- (Node.class.getDeclaredField("value"));
- NEXT = U.objectFieldOffset
- (Node.class.getDeclaredField("next"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ VALUE = l.findVarHandle(Node.class, "value", Object.class);
+ NEXT = l.findVarHandle(Node.class, "next", Node.class);
} catch (ReflectiveOperationException e) {
- throw new Error(e);
+ throw new Error(e);
}
}
}
@@ -577,7 +575,7 @@
* compareAndSet right field.
*/
final boolean casRight(Index<K,V> cmp, Index<K,V> val) {
- return U.compareAndSwapObject(this, RIGHT, cmp, val);
+ return RIGHT.compareAndSet(this, cmp, val);
}
/**
@@ -613,13 +611,12 @@
return node.value != null && casRight(succ, succ.right);
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long RIGHT;
+ // VarHandle mechanics
+ private static final VarHandle RIGHT;
static {
try {
- RIGHT = U.objectFieldOffset
- (Index.class.getDeclaredField("right"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ RIGHT = l.findVarHandle(Index.class, "right", Index.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -3607,13 +3604,13 @@
}
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long HEAD;
+ // VarHandle mechanics
+ private static final VarHandle HEAD;
static {
try {
- HEAD = U.objectFieldOffset
- (ConcurrentSkipListMap.class.getDeclaredField("head"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ HEAD = l.findVarHandle(ConcurrentSkipListMap.class, "head",
+ HeadIndex.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.AbstractSet;
import java.util.Collection;
import java.util.Collections;
@@ -507,15 +509,16 @@
// Support for resetting map in clone
private void setMap(ConcurrentNavigableMap<E,Object> map) {
- U.putObjectVolatile(this, MAP, map);
+ MAP.setVolatile(this, map);
}
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long MAP;
+ // VarHandle mechanics
+ private static final VarHandle MAP;
static {
try {
- MAP = U.objectFieldOffset
- (ConcurrentSkipListSet.class.getDeclaredField("m"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ MAP = l.findVarHandle(ConcurrentSkipListSet.class, "m",
+ ConcurrentNavigableMap.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Thu Jul 21 17:13:23 2016 +0000
@@ -34,6 +34,7 @@
package java.util.concurrent;
+import java.lang.reflect.Field;
import java.util.AbstractList;
import java.util.Arrays;
import java.util.Collection;
@@ -1541,17 +1542,21 @@
}
}
- // Support for resetting lock while deserializing
+ /** Initializes the lock; for use when deserializing or cloning. */
private void resetLock() {
- U.putObjectVolatile(this, LOCK, new Object());
- }
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long LOCK;
- static {
+ Field lockField = java.security.AccessController.doPrivileged(
+ (java.security.PrivilegedAction<Field>) () -> {
+ try {
+ Field f = CopyOnWriteArrayList.class
+ .getDeclaredField("lock");
+ f.setAccessible(true);
+ return f;
+ } catch (ReflectiveOperationException e) {
+ throw new Error(e);
+ }});
try {
- LOCK = U.objectFieldOffset
- (CopyOnWriteArrayList.class.getDeclaredField("lock"));
- } catch (ReflectiveOperationException e) {
+ lockField.set(this, new Object());
+ } catch (IllegalAccessException e) {
throw new Error(e);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,9 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
/**
* A {@link ForkJoinTask} with a completion action performed when
* triggered and there are no remaining pending actions.
@@ -524,7 +527,7 @@
* @param delta the value to add
*/
public final void addToPendingCount(int delta) {
- U.getAndAddInt(this, PENDING, delta);
+ PENDING.getAndAdd(this, delta);
}
/**
@@ -536,7 +539,7 @@
* @return {@code true} if successful
*/
public final boolean compareAndSetPendingCount(int expected, int count) {
- return U.compareAndSwapInt(this, PENDING, expected, count);
+ return PENDING.compareAndSet(this, expected, count);
}
/**
@@ -548,7 +551,7 @@
public final int decrementPendingCountUnlessZero() {
int c;
do {} while ((c = pending) != 0 &&
- !U.compareAndSwapInt(this, PENDING, c, c - 1));
+ !PENDING.weakCompareAndSetVolatile(this, c, c - 1));
return c;
}
@@ -581,7 +584,7 @@
return;
}
}
- else if (U.compareAndSwapInt(a, PENDING, c, c - 1))
+ else if (PENDING.weakCompareAndSetVolatile(a, c, c - 1))
return;
}
}
@@ -604,7 +607,7 @@
return;
}
}
- else if (U.compareAndSwapInt(a, PENDING, c, c - 1))
+ else if (PENDING.weakCompareAndSetVolatile(a, c, c - 1))
return;
}
}
@@ -649,7 +652,7 @@
for (int c;;) {
if ((c = pending) == 0)
return this;
- else if (U.compareAndSwapInt(this, PENDING, c, c - 1))
+ else if (PENDING.weakCompareAndSetVolatile(this, c, c - 1))
return null;
}
}
@@ -753,13 +756,13 @@
*/
protected void setRawResult(T t) { }
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long PENDING;
+ // VarHandle mechanics
+ private static final VarHandle PENDING;
static {
try {
- PENDING = U.objectFieldOffset
- (CountedCompleter.class.getDeclaredField("pending"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ PENDING = l.findVarHandle(CountedCompleter.class, "pending", int.class);
+
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java Thu Jul 21 17:13:23 2016 +0000
@@ -36,6 +36,10 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.concurrent.locks.LockSupport;
+
/**
* A synchronization point at which threads can pair and swap elements
* within pairs. Each thread presents some object on entry to the
@@ -155,9 +159,7 @@
* a value that is enough for common platforms. Additionally,
* extra care elsewhere is taken to avoid other false/unintended
* sharing and to enhance locality, including adding padding (via
- * @Contended) to Nodes, embedding "bound" as an Exchanger field,
- * and reworking some park/unpark mechanics compared to
- * LockSupport versions.
+ * @Contended) to Nodes, embedding "bound" as an Exchanger field.
*
* The arena starts out with only one used slot. We expand the
* effective arena size by tracking collisions; i.e., failed CASes
@@ -234,12 +236,12 @@
* because most of the logic relies on reads of fields that are
* maintained as local variables so can't be nicely factored --
* mainly, here, bulky spin->yield->block/cancel code), and
- * heavily dependent on intrinsics (Unsafe) to use inlined
+ * heavily dependent on intrinsics (VarHandles) to use inlined
* embedded CAS and related memory access operations (that tend
* not to be as readily inlined by dynamic compilers when they are
* hidden behind other methods that would more nicely name and
* encapsulate the intended effects). This includes the use of
- * putXRelease to clear fields of the per-thread Nodes between
+ * setRelease to clear fields of the per-thread Nodes between
* uses. Note that field Node.item is not declared as volatile
* even though it is read by releasing threads, because they only
* do so after CAS operations that must precede access, and all
@@ -252,10 +254,10 @@
*/
/**
- * The byte distance (as a shift value) between any two used slots
- * in the arena. 1 << ASHIFT should be at least cacheline size.
+ * The index distance (as a shift value) between any two used slots
+ * in the arena, spacing them out to avoid false sharing.
*/
- private static final int ASHIFT = 7;
+ private static final int ASHIFT = 5;
/**
* The maximum supported arena index. The maximum allocatable
@@ -356,27 +358,31 @@
*/
private final Object arenaExchange(Object item, boolean timed, long ns) {
Node[] a = arena;
+ int alen = a.length;
Node p = participant.get();
for (int i = p.index;;) { // access slot at i
- int b, m, c; long j; // j is raw array offset
- Node q = (Node)U.getObjectVolatile(a, j = (i << ASHIFT) + ABASE);
- if (q != null && U.compareAndSwapObject(a, j, q, null)) {
+ int b, m, c;
+ int j = (i << ASHIFT) + ((1 << ASHIFT) - 1);
+ if (j < 0 || j >= alen)
+ j = alen - 1;
+ Node q = (Node)AA.getAcquire(a, j);
+ if (q != null && AA.compareAndSet(a, j, q, null)) {
Object v = q.item; // release
q.match = item;
Thread w = q.parked;
if (w != null)
- U.unpark(w);
+ LockSupport.unpark(w);
return v;
}
else if (i <= (m = (b = bound) & MMASK) && q == null) {
p.item = item; // offer
- if (U.compareAndSwapObject(a, j, null, p)) {
+ if (AA.compareAndSet(a, j, null, p)) {
long end = (timed && m == 0) ? System.nanoTime() + ns : 0L;
Thread t = Thread.currentThread(); // wait
for (int h = p.hash, spins = SPINS;;) {
Object v = p.match;
if (v != null) {
- U.putObjectRelease(p, MATCH, null);
+ MATCH.setRelease(p, null);
p.item = null; // clear for next use
p.hash = h;
return v;
@@ -389,22 +395,24 @@
(--spins & ((SPINS >>> 1) - 1)) == 0)
Thread.yield(); // two yields per wait
}
- else if (U.getObjectVolatile(a, j) != p)
+ else if (AA.getAcquire(a, j) != p)
spins = SPINS; // releaser hasn't set match yet
else if (!t.isInterrupted() && m == 0 &&
(!timed ||
(ns = end - System.nanoTime()) > 0L)) {
- U.putObject(t, BLOCKER, this); // emulate LockSupport
p.parked = t; // minimize window
- if (U.getObjectVolatile(a, j) == p)
- U.park(false, ns);
+ if (AA.getAcquire(a, j) == p) {
+ if (ns == 0L)
+ LockSupport.park(this);
+ else
+ LockSupport.parkNanos(this, ns);
+ }
p.parked = null;
- U.putObject(t, BLOCKER, null);
}
- else if (U.getObjectVolatile(a, j) == p &&
- U.compareAndSwapObject(a, j, p, null)) {
+ else if (AA.getAcquire(a, j) == p &&
+ AA.compareAndSet(a, j, p, null)) {
if (m != 0) // try to shrink
- U.compareAndSwapInt(this, BOUND, b, b + SEQ - 1);
+ BOUND.compareAndSet(this, b, b + SEQ - 1);
p.item = null;
p.hash = h;
i = p.index >>>= 1; // descend
@@ -426,7 +434,7 @@
i = (i != m || m == 0) ? m : m - 1;
}
else if ((c = p.collides) < m || m == FULL ||
- !U.compareAndSwapInt(this, BOUND, b, b + SEQ + 1)) {
+ !BOUND.compareAndSet(this, b, b + SEQ + 1)) {
p.collides = c + 1;
i = (i == 0) ? m : i - 1; // cyclically traverse
}
@@ -455,24 +463,24 @@
for (Node q;;) {
if ((q = slot) != null) {
- if (U.compareAndSwapObject(this, SLOT, q, null)) {
+ if (SLOT.compareAndSet(this, q, null)) {
Object v = q.item;
q.match = item;
Thread w = q.parked;
if (w != null)
- U.unpark(w);
+ LockSupport.unpark(w);
return v;
}
// create arena on contention, but continue until slot null
if (NCPU > 1 && bound == 0 &&
- U.compareAndSwapInt(this, BOUND, 0, SEQ))
+ BOUND.compareAndSet(this, 0, SEQ))
arena = new Node[(FULL + 2) << ASHIFT];
}
else if (arena != null)
return null; // caller must reroute to arenaExchange
else {
p.item = item;
- if (U.compareAndSwapObject(this, SLOT, null, p))
+ if (SLOT.compareAndSet(this, null, p))
break;
p.item = null;
}
@@ -495,19 +503,21 @@
spins = SPINS;
else if (!t.isInterrupted() && arena == null &&
(!timed || (ns = end - System.nanoTime()) > 0L)) {
- U.putObject(t, BLOCKER, this);
p.parked = t;
- if (slot == p)
- U.park(false, ns);
+ if (slot == p) {
+ if (ns == 0L)
+ LockSupport.park(this);
+ else
+ LockSupport.parkNanos(this, ns);
+ }
p.parked = null;
- U.putObject(t, BLOCKER, null);
}
- else if (U.compareAndSwapObject(this, SLOT, p, null)) {
+ else if (SLOT.compareAndSet(this, p, null)) {
v = timed && ns <= 0L && !t.isInterrupted() ? TIMED_OUT : null;
break;
}
}
- U.putObjectRelease(p, MATCH, null);
+ MATCH.setRelease(p, null);
p.item = null;
p.hash = h;
return v;
@@ -556,8 +566,9 @@
@SuppressWarnings("unchecked")
public V exchange(V x) throws InterruptedException {
Object v;
+ Node[] a;
Object item = (x == null) ? NULL_ITEM : x; // translate null args
- if ((arena != null ||
+ if (((a = arena) != null ||
(v = slotExchange(item, false, 0L)) == null) &&
((Thread.interrupted() || // disambiguates null return
(v = arenaExchange(item, false, 0L)) == null)))
@@ -623,31 +634,18 @@
return (v == NULL_ITEM) ? null : (V)v;
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long BOUND;
- private static final long SLOT;
- private static final long MATCH;
- private static final long BLOCKER;
- private static final int ABASE;
+ // VarHandle mechanics
+ private static final VarHandle BOUND;
+ private static final VarHandle SLOT;
+ private static final VarHandle MATCH;
+ private static final VarHandle AA;
static {
try {
- BOUND = U.objectFieldOffset
- (Exchanger.class.getDeclaredField("bound"));
- SLOT = U.objectFieldOffset
- (Exchanger.class.getDeclaredField("slot"));
-
- MATCH = U.objectFieldOffset
- (Node.class.getDeclaredField("match"));
-
- BLOCKER = U.objectFieldOffset
- (Thread.class.getDeclaredField("parkBlocker"));
-
- int scale = U.arrayIndexScale(Node[].class);
- if ((scale & (scale - 1)) != 0 || scale > (1 << ASHIFT))
- throw new Error("Unsupported array scale");
- // ABASE absorbs padding in front of element 0
- ABASE = U.arrayBaseOffset(Node[].class) + (1 << ASHIFT);
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ BOUND = l.findVarHandle(Exchanger.class, "bound", int.class);
+ SLOT = l.findVarHandle(Exchanger.class, "slot", Node.class);
+ MATCH = l.findVarHandle(Node.class, "match", Object.class);
+ AA = MethodHandles.arrayElementVarHandle(Node[].class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java Thu Jul 21 17:13:23 2016 +0000
@@ -36,6 +36,8 @@
package java.util.concurrent;
import java.lang.Thread.UncaughtExceptionHandler;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.security.AccessControlContext;
import java.security.Permissions;
import java.security.ProtectionDomain;
@@ -44,7 +46,11 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CountedCompleter;
+import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.ForkJoinWorkerThread;
import java.util.concurrent.locks.LockSupport;
/**
@@ -81,7 +87,9 @@
* However, no such adjustments are guaranteed in the face of blocked
* I/O or other unmanaged synchronization. The nested {@link
* ManagedBlocker} interface enables extension of the kinds of
- * synchronization accommodated.
+ * synchronization accommodated. The default policies may be
+ * overridden using a constructor with parameters corresponding to
+ * those documented in class {@link ThreadPoolExecutor}.
*
* <p>In addition to execution and lifecycle control methods, this
* class provides status check methods (for example
@@ -162,7 +170,6 @@
* @since 1.7
* @author Doug Lea
*/
-@jdk.internal.vm.annotation.Contended
public class ForkJoinPool extends AbstractExecutorService {
/*
@@ -229,10 +236,9 @@
* (CAS slot to null))
* increment base and return task;
*
- * There are several variants of each of these; for example most
- * versions of poll pre-screen the CAS by rechecking that the base
- * has not changed since reading the slot, and most methods only
- * attempt the CAS if base appears not to be equal to top.
+ * There are several variants of each of these. In particular,
+ * almost all uses of poll occur within scan operations that also
+ * interleave contention tracking (with associated code sprawl.)
*
* Memory ordering. See "Correct and Efficient Work-Stealing for
* Weak Memory Models" by Le, Pop, Cohen, and Nardelli, PPoPP 2013
@@ -264,10 +270,7 @@
* thief chooses a different random victim target to try next. So,
* in order for one thief to progress, it suffices for any
* in-progress poll or new push on any empty queue to
- * complete. (This is why we normally use method pollAt and its
- * variants that try once at the apparent base index, else
- * consider alternative actions, rather than method poll, which
- * retries.)
+ * complete.
*
* This approach also enables support of a user mode in which
* local task processing is in FIFO, not LIFO order, simply by
@@ -282,16 +285,13 @@
* choosing existing queues, and may be randomly repositioned upon
* contention with other submitters. In essence, submitters act
* like workers except that they are restricted to executing local
- * tasks that they submitted (or in the case of CountedCompleters,
- * others with the same root task). Insertion of tasks in shared
- * mode requires a lock but we use only a simple spinlock (using
- * field qlock), because submitters encountering a busy queue move
- * on to try or create other queues -- they block only when
- * creating and registering new queues. Because it is used only as
- * a spinlock, unlocking requires only a "releasing" store (using
- * putIntRelease). The qlock is also used during termination
- * detection, in which case it is forced to a negative
- * non-lockable value.
+ * tasks that they submitted. Insertion of tasks in shared mode
+ * requires a lock but we use only a simple spinlock (using field
+ * phase), because submitters encountering a busy queue move to a
+ * different position to use or create other queues -- they block
+ * only when creating and registering new queues. Because it is
+ * used only as a spinlock, unlocking requires only a "releasing"
+ * store (using setRelease).
*
* Management
* ==========
@@ -305,42 +305,34 @@
* There are only a few properties that we can globally track or
* maintain, so we pack them into a small number of variables,
* often maintaining atomicity without blocking or locking.
- * Nearly all essentially atomic control state is held in two
+ * Nearly all essentially atomic control state is held in a few
* volatile variables that are by far most often read (not
- * written) as status and consistency checks. (Also, field
- * "config" holds unchanging configuration state.)
+ * written) as status and consistency checks. We pack as much
+ * information into them as we can.
*
* Field "ctl" contains 64 bits holding information needed to
- * atomically decide to add, inactivate, enqueue (on an event
- * queue), dequeue, and/or re-activate workers. To enable this
+ * atomically decide to add, enqueue (on an event queue), and
+ * dequeue (and release)-activate workers. To enable this
* packing, we restrict maximum parallelism to (1<<15)-1 (which is
* far in excess of normal operating range) to allow ids, counts,
* and their negations (used for thresholding) to fit into 16bit
* subfields.
*
- * Field "runState" holds lifetime status, atomically and
- * monotonically setting STARTED, SHUTDOWN, STOP, and finally
- * TERMINATED bits.
- *
- * Field "auxState" is a ReentrantLock subclass that also
- * opportunistically holds some other bookkeeping fields accessed
- * only when locked. It is mainly used to lock (infrequent)
- * updates to workQueues. The auxState instance is itself lazily
- * constructed (see tryInitialize), requiring a double-check-style
- * bootstrapping use of field runState, and locking a private
- * static.
+ * Field "mode" holds configuration parameters as well as lifetime
+ * status, atomically and monotonically setting SHUTDOWN, STOP,
+ * and finally TERMINATED bits.
*
* Field "workQueues" holds references to WorkQueues. It is
- * updated (only during worker creation and termination) under the
- * lock, but is otherwise concurrently readable, and accessed
- * directly. We also ensure that reads of the array reference
- * itself never become too stale (for example, re-reading before
- * each scan). To simplify index-based operations, the array size
- * is always a power of two, and all readers must tolerate null
- * slots. Worker queues are at odd indices. Shared (submission)
- * queues are at even indices, up to a maximum of 64 slots, to
- * limit growth even if array needs to expand to add more
- * workers. Grouping them together in this way simplifies and
+ * updated (only during worker creation and termination) under
+ * lock (using field workerNamePrefix as lock), but is otherwise
+ * concurrently readable, and accessed directly. We also ensure
+ * that uses of the array reference itself never become too stale
+ * in case of resizing. To simplify index-based operations, the
+ * array size is always a power of two, and all readers must
+ * tolerate null slots. Worker queues are at odd indices. Shared
+ * (submission) queues are at even indices, up to a maximum of 64
+ * slots, to limit growth even if array needs to expand to add
+ * more workers. Grouping them together in this way simplifies and
* speeds up task scanning.
*
* All worker thread creation is on-demand, triggered by task
@@ -360,30 +352,37 @@
* workers unless there appear to be tasks available. On the
* other hand, we must quickly prod them into action when new
* tasks are submitted or generated. In many usages, ramp-up time
- * to activate workers is the main limiting factor in overall
- * performance, which is compounded at program start-up by JIT
- * compilation and allocation. So we streamline this as much as
- * possible.
+ * is the main limiting factor in overall performance, which is
+ * compounded at program start-up by JIT compilation and
+ * allocation. So we streamline this as much as possible.
*
- * The "ctl" field atomically maintains active and total worker
- * counts as well as a queue to place waiting threads so they can
- * be located for signalling. Active counts also play the role of
- * quiescence indicators, so are decremented when workers believe
- * that there are no more tasks to execute. The "queue" is
- * actually a form of Treiber stack. A stack is ideal for
- * activating threads in most-recently used order. This improves
+ * The "ctl" field atomically maintains total worker and
+ * "released" worker counts, plus the head of the available worker
+ * queue (actually stack, represented by the lower 32bit subfield
+ * of ctl). Released workers are those known to be scanning for
+ * and/or running tasks. Unreleased ("available") workers are
+ * recorded in the ctl stack. These workers are made available for
+ * signalling by enqueuing in ctl (see method runWorker). The
+ * "queue" is a form of Treiber stack. This is ideal for
+ * activating threads in most-recently used order, and improves
* performance and locality, outweighing the disadvantages of
* being prone to contention and inability to release a worker
- * unless it is topmost on stack. We block/unblock workers after
- * pushing on the idle worker stack (represented by the lower
- * 32bit subfield of ctl) when they cannot find work. The top
- * stack state holds the value of the "scanState" field of the
- * worker: its index and status, plus a version counter that, in
- * addition to the count subfields (also serving as version
- * stamps) provide protection against Treiber stack ABA effects.
+ * unless it is topmost on stack. To avoid missed signal problems
+ * inherent in any wait/signal design, available workers rescan
+ * for (and if found run) tasks after enqueuing. Normally their
+ * release status will be updated while doing so, but the released
+ * worker ctl count may underestimate the number of active
+ * threads. (However, it is still possible to determine quiescence
+ * via a validation traversal -- see isQuiescent). After an
+ * unsuccessful rescan, available workers are blocked until
+ * signalled (see signalWork). The top stack state holds the
+ * value of the "phase" field of the worker: its index and status,
+ * plus a version counter that, in addition to the count subfields
+ * (also serving as version stamps) provide protection against
+ * Treiber stack ABA effects.
*
- * Creating workers. To create a worker, we pre-increment total
- * count (serving as a reservation), and attempt to construct a
+ * Creating workers. To create a worker, we pre-increment counts
+ * (serving as a reservation), and attempt to construct a
* ForkJoinWorkerThread via its factory. Upon construction, the
* new thread invokes registerWorker, where it constructs a
* WorkQueue and is assigned an index in the workQueues array
@@ -405,16 +404,15 @@
* submission queues for existing external threads (see
* externalPush).
*
- * WorkQueue field scanState is used by both workers and the pool
- * to manage and track whether a worker is UNSIGNALLED (possibly
- * blocked waiting for a signal). When a worker is inactivated,
- * its scanState field is set, and is prevented from executing
- * tasks, even though it must scan once for them to avoid queuing
- * races. Note that scanState updates lag queue CAS releases so
- * usage requires care. When queued, the lower 16 bits of
- * scanState must hold its pool index. So we place the index there
- * upon initialization (see registerWorker) and otherwise keep it
- * there or restore it when necessary.
+ * WorkQueue field "phase" is used by both workers and the pool to
+ * manage and track whether a worker is UNSIGNALLED (possibly
+ * blocked waiting for a signal). When a worker is enqueued its
+ * phase field is set. Note that phase field updates lag queue CAS
+ * releases so usage requires care -- seeing a negative phase does
+ * not guarantee that the worker is available. When queued, the
+ * lower 16 bits of scanState must hold its pool index. So we
+ * place the index there upon initialization (see registerWorker)
+ * and otherwise keep it there or restore it when necessary.
*
* The ctl field also serves as the basis for memory
* synchronization surrounding activation. This uses a more
@@ -423,15 +421,14 @@
* if to its current value). This would be extremely costly. So
* we relax it in several ways: (1) Producers only signal when
* their queue is empty. Other workers propagate this signal (in
- * method scan) when they find tasks. (2) Workers only enqueue
- * after scanning (see below) and not finding any tasks. (3)
- * Rather than CASing ctl to its current value in the common case
- * where no action is required, we reduce write contention by
- * equivalently prefacing signalWork when called by an external
- * task producer using a memory access with full-volatile
- * semantics or a "fullFence". (4) For internal task producers we
- * rely on the fact that even if no other workers awaken, the
- * producer itself will eventually see the task and execute it.
+ * method scan) when they find tasks; to further reduce flailing,
+ * each worker signals only one other per activation. (2) Workers
+ * only enqueue after scanning (see below) and not finding any
+ * tasks. (3) Rather than CASing ctl to its current value in the
+ * common case where no action is required, we reduce write
+ * contention by equivalently prefacing signalWork when called by
+ * an external task producer using a memory access with
+ * full-volatile semantics or a "fullFence".
*
* Almost always, too many signals are issued. A task producer
* cannot in general tell if some existing worker is in the midst
@@ -443,64 +440,40 @@
* and bookkeeping bottlenecks during ramp-up, ramp-down, and small
* computations involving only a few workers.
*
- * Scanning. Method scan() performs top-level scanning for tasks.
- * Each scan traverses (and tries to poll from) each queue in
- * pseudorandom permutation order by randomly selecting an origin
- * index and a step value. (The pseudorandom generator need not
- * have high-quality statistical properties in the long term, but
- * just within computations; We use 64bit and 32bit Marsaglia
- * XorShifts, which are cheap and suffice here.) Scanning also
- * employs contention reduction: When scanning workers fail a CAS
- * polling for work, they soon restart with a different
- * pseudorandom scan order (thus likely retrying at different
- * intervals). This improves throughput when many threads are
- * trying to take tasks from few queues. Scans do not otherwise
- * explicitly take into account core affinities, loads, cache
- * localities, etc, However, they do exploit temporal locality
- * (which usually approximates these) by preferring to re-poll (up
- * to POLL_LIMIT times) from the same queue after a successful
- * poll before trying others. Restricted forms of scanning occur
- * in methods helpComplete and findNonEmptyStealQueue, and take
- * similar but simpler forms.
- *
- * Deactivation and waiting. Queuing encounters several intrinsic
- * races; most notably that an inactivating scanning worker can
- * miss seeing a task produced during a scan. So when a worker
- * cannot find a task to steal, it inactivates and enqueues, and
- * then rescans to ensure that it didn't miss one, reactivating
- * upon seeing one with probability approximately proportional to
- * probability of a miss. (In most cases, the worker will be
- * signalled before self-signalling, avoiding cascades of multiple
- * signals for the same task).
- *
- * Workers block (in method awaitWork) using park/unpark;
- * advertising the need for signallers to unpark by setting their
- * "parker" fields.
+ * Scanning. Method runWorker performs top-level scanning for
+ * tasks. Each scan traverses and tries to poll from each queue
+ * starting at a random index and circularly stepping. Scans are
+ * not performed in ideal random permutation order, to reduce
+ * cacheline contention. The pseudorandom generator need not have
+ * high-quality statistical properties in the long term, but just
+ * within computations; We use Marsaglia XorShifts (often via
+ * ThreadLocalRandom.nextSecondarySeed), which are cheap and
+ * suffice. Scanning also employs contention reduction: When
+ * scanning workers fail to extract an apparently existing task,
+ * they soon restart at a different pseudorandom index. This
+ * improves throughput when many threads are trying to take tasks
+ * from few queues, which can be common in some usages. Scans do
+ * not otherwise explicitly take into account core affinities,
+ * loads, cache localities, etc, However, they do exploit temporal
+ * locality (which usually approximates these) by preferring to
+ * re-poll (at most #workers times) from the same queue after a
+ * successful poll before trying others.
*
* Trimming workers. To release resources after periods of lack of
* use, a worker starting to wait when the pool is quiescent will
- * time out and terminate (see awaitWork) if the pool has remained
- * quiescent for period given by IDLE_TIMEOUT_MS, increasing the
- * period as the number of threads decreases, eventually removing
- * all workers.
+ * time out and terminate (see method scan) if the pool has
+ * remained quiescent for period given by field keepAlive.
*
* Shutdown and Termination. A call to shutdownNow invokes
* tryTerminate to atomically set a runState bit. The calling
* thread, as well as every other worker thereafter terminating,
- * helps terminate others by setting their (qlock) status,
- * cancelling their unprocessed tasks, and waking them up, doing
- * so repeatedly until stable. Calls to non-abrupt shutdown()
- * preface this by checking whether termination should commence.
- * This relies primarily on the active count bits of "ctl"
- * maintaining consensus -- tryTerminate is called from awaitWork
- * whenever quiescent. However, external submitters do not take
- * part in this consensus. So, tryTerminate sweeps through queues
- * (until stable) to ensure lack of in-flight submissions and
- * workers about to process them before triggering the "STOP"
- * phase of termination. (Note: there is an intrinsic conflict if
- * helpQuiescePool is called when shutdown is enabled. Both wait
- * for quiescence, but tryTerminate is biased to not trigger until
- * helpQuiescePool completes.)
+ * helps terminate others by cancelling their unprocessed tasks,
+ * and waking them up, doing so repeatedly until stable. Calls to
+ * non-abrupt shutdown() preface this by checking whether
+ * termination should commence by sweeping through queues (until
+ * stable) to ensure lack of in-flight submissions and workers
+ * about to process them before triggering the "STOP" phase of
+ * termination.
*
* Joining Tasks
* =============
@@ -508,12 +481,12 @@
* Any of several actions may be taken when one worker is waiting
* to join a task stolen (or always held) by another. Because we
* are multiplexing many tasks on to a pool of workers, we can't
- * just let them block (as in Thread.join). We also cannot just
- * reassign the joiner's run-time stack with another and replace
- * it later, which would be a form of "continuation", that even if
- * possible is not necessarily a good idea since we may need both
- * an unblocked task and its continuation to progress. Instead we
- * combine two tactics:
+ * always just let them block (as in Thread.join). We also cannot
+ * just reassign the joiner's run-time stack with another and
+ * replace it later, which would be a form of "continuation", that
+ * even if possible is not necessarily a good idea since we may
+ * need both an unblocked task and its continuation to progress.
+ * Instead we combine two tactics:
*
* Helping: Arranging for the joiner to execute some task that it
* would be running if the steal had not occurred.
@@ -526,79 +499,43 @@
* helping a hypothetical compensator: If we can readily tell that
* a possible action of a compensator is to steal and execute the
* task being joined, the joining thread can do so directly,
- * without the need for a compensation thread (although at the
- * expense of larger run-time stacks, but the tradeoff is
- * typically worthwhile).
+ * without the need for a compensation thread.
*
* The ManagedBlocker extension API can't use helping so relies
* only on compensation in method awaitBlocker.
*
- * The algorithm in helpStealer entails a form of "linear
- * helping". Each worker records (in field currentSteal) the most
- * recent task it stole from some other worker (or a submission).
- * It also records (in field currentJoin) the task it is currently
- * actively joining. Method helpStealer uses these markers to try
- * to find a worker to help (i.e., steal back a task from and
- * execute it) that could hasten completion of the actively joined
- * task. Thus, the joiner executes a task that would be on its
- * own local deque had the to-be-joined task not been stolen. This
- * is a conservative variant of the approach described in Wagner &
- * Calder "Leapfrogging: a portable technique for implementing
- * efficient futures" SIGPLAN Notices, 1993
- * (http://portal.acm.org/citation.cfm?id=155354). It differs in
- * that: (1) We only maintain dependency links across workers upon
- * steals, rather than use per-task bookkeeping. This sometimes
- * requires a linear scan of workQueues array to locate stealers,
- * but often doesn't because stealers leave hints (that may become
- * stale/wrong) of where to locate them. It is only a hint
- * because a worker might have had multiple steals and the hint
- * records only one of them (usually the most current). Hinting
- * isolates cost to when it is needed, rather than adding to
- * per-task overhead. (2) It is "shallow", ignoring nesting and
- * potentially cyclic mutual steals. (3) It is intentionally
- * racy: field currentJoin is updated only while actively joining,
- * which means that we miss links in the chain during long-lived
- * tasks, GC stalls etc (which is OK since blocking in such cases
- * is usually a good idea). (4) We bound the number of attempts
- * to find work using checksums and fall back to suspending the
- * worker and if necessary replacing it with another.
+ * The algorithm in awaitJoin entails a form of "linear helping".
+ * Each worker records (in field source) the id of the queue from
+ * which it last stole a task. The scan in method awaitJoin uses
+ * these markers to try to find a worker to help (i.e., steal back
+ * a task from and execute it) that could hasten completion of the
+ * actively joined task. Thus, the joiner executes a task that
+ * would be on its own local deque if the to-be-joined task had
+ * not been stolen. This is a conservative variant of the approach
+ * described in Wagner & Calder "Leapfrogging: a portable
+ * technique for implementing efficient futures" SIGPLAN Notices,
+ * 1993 (http://portal.acm.org/citation.cfm?id=155354). It differs
+ * mainly in that we only record queue ids, not full dependency
+ * links. This requires a linear scan of the workQueues array to
+ * locate stealers, but isolates cost to when it is needed, rather
+ * than adding to per-task overhead. Searches can fail to locate
+ * stealers GC stalls and the like delay recording sources.
+ * Further, even when accurately identified, stealers might not
+ * ever produce a task that the joiner can in turn help with. So,
+ * compensation is tried upon failure to find tasks to run.
*
- * Helping actions for CountedCompleters do not require tracking
- * currentJoins: Method helpComplete takes and executes any task
- * with the same root as the task being waited on (preferring
- * local pops to non-local polls). However, this still entails
- * some traversal of completer chains, so is less efficient than
- * using CountedCompleters without explicit joins.
- *
- * Compensation does not aim to keep exactly the target
+ * Compensation does not by default aim to keep exactly the target
* parallelism number of unblocked threads running at any given
* time. Some previous versions of this class employed immediate
* compensations for any blocked join. However, in practice, the
* vast majority of blockages are transient byproducts of GC and
* other JVM or OS activities that are made worse by replacement.
- * Currently, compensation is attempted only after validating that
- * all purportedly active threads are processing tasks by checking
- * field WorkQueue.scanState, which eliminates most false
- * positives. Also, compensation is bypassed (tolerating fewer
- * threads) in the most common case in which it is rarely
- * beneficial: when a worker with an empty queue (thus no
- * continuation tasks) blocks on a join and there still remain
- * enough threads to ensure liveness.
- *
- * Spare threads are removed as soon as they notice that the
- * target parallelism level has been exceeded, in method
- * tryDropSpare. (Method scan arranges returns for rechecks upon
- * each probe via the "bound" parameter.)
- *
- * The compensation mechanism may be bounded. Bounds for the
- * commonPool (see COMMON_MAX_SPARES) better enable JVMs to cope
- * with programming errors and abuse before running out of
- * resources to do so. In other cases, users may supply factories
- * that limit thread construction. The effects of bounding in this
- * pool (like all others) is imprecise. Total worker counts are
- * decremented when threads deregister, not when they exit and
- * resources are reclaimed by the JVM and OS. So the number of
- * simultaneously live threads may transiently exceed bounds.
+ * Rather than impose arbitrary policies, we allow users to
+ * override the default of only adding threads upon apparent
+ * starvation. The compensation mechanism may also be bounded.
+ * Bounds for the commonPool (see COMMON_MAX_SPARES) better enable
+ * JVMs to cope with programming errors and abuse before running
+ * out of resources to do so.
*
* Common Pool
* ===========
@@ -606,9 +543,7 @@
* The static common pool always exists after static
* initialization. Since it (or any other created pool) need
* never be used, we minimize initial construction overhead and
- * footprint to the setup of about a dozen fields, with no nested
- * allocation. Most bootstrapping occurs within method
- * externalSubmit during the first submission to the pool.
+ * footprint to the setup of about a dozen fields.
*
* When external threads submit to the common pool, they can
* perform subtask processing (see externalHelpComplete and
@@ -628,28 +563,22 @@
* InnocuousForkJoinWorkerThread when there is a SecurityManager
* present. These workers have no permissions set, do not belong
* to any user-defined ThreadGroup, and erase all ThreadLocals
- * after executing any top-level task (see WorkQueue.runTask).
- * The associated mechanics (mainly in ForkJoinWorkerThread) may
- * be JVM-dependent and must access particular Thread class fields
- * to achieve this effect.
+ * after executing any top-level task (see
+ * WorkQueue.afterTopLevelExec). The associated mechanics (mainly
+ * in ForkJoinWorkerThread) may be JVM-dependent and must access
+ * particular Thread class fields to achieve this effect.
*
* Style notes
* ===========
*
- * Memory ordering relies mainly on Unsafe intrinsics that carry
- * the further responsibility of explicitly performing null- and
- * bounds- checks otherwise carried out implicitly by JVMs. This
- * can be awkward and ugly, but also reflects the need to control
+ * Memory ordering relies mainly on VarHandles. This can be
+ * awkward and ugly, but also reflects the need to control
* outcomes across the unusual cases that arise in very racy code
- * with very few invariants. So these explicit checks would exist
- * in some form anyway. All fields are read into locals before
- * use, and null-checked if they are references. This is usually
- * done in a "C"-like style of listing declarations at the heads
- * of methods or blocks, and using inline assignments on first
- * encounter. Array bounds-checks are usually performed by
- * masking with array.length-1, which relies on the invariant that
- * these arrays are created with positive lengths, which is itself
- * paranoically checked. Nearly all explicit checks lead to
+ * with very few invariants. All fields are read into locals
+ * before use, and null-checked if they are references. This is
+ * usually done in a "C"-like style of listing declarations at the
+ * heads of methods or blocks, and using inline assignments on
+ * first encounter. Nearly all explicit checks lead to
* bypass/return, not exception throws, because they may
* legitimately arise due to cancellation/revocation during
* shutdown.
@@ -701,10 +630,17 @@
public static interface ForkJoinWorkerThreadFactory {
/**
* Returns a new worker thread operating in the given pool.
+ * Returning null or throwing an exception may result in tasks
+ * never being executed. If this method throws an exception,
+ * it is relayed to the caller of the method (for example
+ * {@code execute}) causing attempted thread creation. If this
+ * method returns null or throws an exception, it is not
+ * retried until the next attempted creation (for example
+ * another call to {@code execute}).
*
* @param pool the pool this thread works in
* @return the new worker thread, or {@code null} if the request
- * to create a thread is rejected
+ * to create a thread is rejected.
* @throws NullPointerException if the pool is null
*/
public ForkJoinWorkerThread newThread(ForkJoinPool pool);
@@ -721,56 +657,35 @@
}
}
- /**
- * Class for artificial tasks that are used to replace the target
- * of local joins if they are removed from an interior queue slot
- * in WorkQueue.tryRemoveAndExec. We don't need the proxy to
- * actually do anything beyond having a unique identity.
- */
- private static final class EmptyTask extends ForkJoinTask<Void> {
- private static final long serialVersionUID = -7721805057305804111L;
- EmptyTask() { status = ForkJoinTask.NORMAL; } // force done
- public final Void getRawResult() { return null; }
- public final void setRawResult(Void x) {}
- public final boolean exec() { return true; }
- }
-
- /**
- * Additional fields and lock created upon initialization.
- */
- private static final class AuxState extends ReentrantLock {
- private static final long serialVersionUID = -6001602636862214147L;
- volatile long stealCount; // cumulative steal count
- long indexSeed; // index bits for registerWorker
- AuxState() {}
- }
-
// Constants shared across ForkJoinPool and WorkQueue
// Bounds
+ static final int SWIDTH = 16; // width of short
static final int SMASK = 0xffff; // short bits == max index
static final int MAX_CAP = 0x7fff; // max #workers - 1
- static final int EVENMASK = 0xfffe; // even short bits
static final int SQMASK = 0x007e; // max 64 (even) slots
- // Masks and units for WorkQueue.scanState and ctl sp subfield
+ // Masks and units for WorkQueue.phase and ctl sp subfield
static final int UNSIGNALLED = 1 << 31; // must be negative
static final int SS_SEQ = 1 << 16; // version count
+ static final int QLOCK = 1; // must be 1
- // Mode bits for ForkJoinPool.config and WorkQueue.config
- static final int MODE_MASK = 0xffff << 16; // top half of int
- static final int SPARE_WORKER = 1 << 17; // set if tc > 0 on creation
- static final int UNREGISTERED = 1 << 18; // to skip some of deregister
- static final int FIFO_QUEUE = 1 << 31; // must be negative
- static final int LIFO_QUEUE = 0; // for clarity
- static final int IS_OWNED = 1; // low bit 0 if shared
+ // Mode bits and sentinels, some also used in WorkQueue id and.source fields
+ static final int OWNED = 1; // queue has owner thread
+ static final int FIFO = 1 << 16; // fifo queue or access mode
+ static final int SHUTDOWN = 1 << 18;
+ static final int TERMINATED = 1 << 19;
+ static final int STOP = 1 << 31; // must be negative
+ static final int QUIET = 1 << 30; // not scanning or working
+ static final int DORMANT = QUIET | UNSIGNALLED;
/**
- * The maximum number of task executions from the same queue
- * before checking other queues, bounding unfairness and impact of
- * infinite user task recursion. Must be a power of two minus 1.
+ * The maximum number of local polls from the same queue before
+ * checking others. This is a safeguard against infinitely unfair
+ * looping under unbounded user task recursion, and must be larger
+ * than plausible cases of intentional bounded task recursion.
*/
- static final int POLL_LIMIT = (1 << 10) - 1;
+ static final int POLL_LIMIT = 1 << 10;
/**
* Queues supporting work-stealing as well as external task
@@ -805,23 +720,16 @@
static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
// Instance fields
-
- volatile int scanState; // versioned, negative if inactive
- int stackPred; // pool stack (ctl) predecessor
+ volatile int phase; // versioned, negative: queued, 1: locked
+ int stackPred; // pool stack (ctl) predecessor link
int nsteals; // number of steals
- int hint; // randomization and stealer index hint
- int config; // pool index and mode
- volatile int qlock; // 1: locked, < 0: terminate; else 0
+ int id; // index, mode, tag
+ volatile int source; // source queue id, or sentinel
volatile int base; // index of next slot for poll
int top; // index of next slot for push
ForkJoinTask<?>[] array; // the elements (initially unallocated)
final ForkJoinPool pool; // the containing pool (may be null)
final ForkJoinWorkerThread owner; // owning thread or null if shared
- volatile Thread parker; // == owner during call to park; else null
- volatile ForkJoinTask<?> currentJoin; // task being joined in awaitJoin
-
- @jdk.internal.vm.annotation.Contended("group2") // segregate
- volatile ForkJoinTask<?> currentSteal; // nonnull when running some task
WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner) {
this.pool = pool;
@@ -834,7 +742,7 @@
* Returns an exportable index (used by ForkJoinWorkerThread).
*/
final int getPoolIndex() {
- return (config & 0xffff) >>> 1; // ignore odd/even tag bit
+ return (id & 0xffff) >>> 1; // ignore odd/even tag bit
}
/**
@@ -851,13 +759,14 @@
* near-empty queue has at least one unclaimed task.
*/
final boolean isEmpty() {
- ForkJoinTask<?>[] a; int n, al, s;
- return ((n = base - (s = top)) >= 0 || // possibly one task
+ ForkJoinTask<?>[] a; int n, al, b;
+ return ((n = (b = base) - top) >= 0 || // possibly one task
(n == -1 && ((a = array) == null ||
(al = a.length) == 0 ||
- a[(al - 1) & (s - 1)] == null)));
+ a[(al - 1) & b] == null)));
}
+
/**
* Pushes a task. Call only by owner in unshared queues.
*
@@ -865,17 +774,17 @@
* @throws RejectedExecutionException if array cannot be resized
*/
final void push(ForkJoinTask<?> task) {
- U.storeFence(); // ensure safe publication
- int s = top, al, d; ForkJoinTask<?>[] a;
+ int s = top; ForkJoinTask<?>[] a; int al, d;
if ((a = array) != null && (al = a.length) > 0) {
- a[(al - 1) & s] = task; // relaxed writes OK
- top = s + 1;
+ int index = (al - 1) & s;
ForkJoinPool p = pool;
+ top = s + 1;
+ QA.setRelease(a, index, task);
if ((d = base - s) == 0 && p != null) {
- U.fullFence();
+ VarHandle.fullFence();
p.signalWork();
}
- else if (al + d == 1)
+ else if (d + al == 1)
growArray();
}
}
@@ -887,24 +796,24 @@
*/
final ForkJoinTask<?>[] growArray() {
ForkJoinTask<?>[] oldA = array;
- int size = oldA != null ? oldA.length << 1 : INITIAL_QUEUE_CAPACITY;
+ int oldSize = oldA != null ? oldA.length : 0;
+ int size = oldSize > 0 ? oldSize << 1 : INITIAL_QUEUE_CAPACITY;
if (size < INITIAL_QUEUE_CAPACITY || size > MAXIMUM_QUEUE_CAPACITY)
throw new RejectedExecutionException("Queue capacity exceeded");
int oldMask, t, b;
ForkJoinTask<?>[] a = array = new ForkJoinTask<?>[size];
- if (oldA != null && (oldMask = oldA.length - 1) > 0 &&
+ if (oldA != null && (oldMask = oldSize - 1) > 0 &&
(t = top) - (b = base) > 0) {
int mask = size - 1;
do { // emulate poll from old array, push to new array
int index = b & oldMask;
- long offset = ((long)index << ASHIFT) + ABASE;
ForkJoinTask<?> x = (ForkJoinTask<?>)
- U.getObjectVolatile(oldA, offset);
+ QA.getAcquire(oldA, index);
if (x != null &&
- U.compareAndSwapObject(oldA, offset, x, null))
+ QA.compareAndSet(oldA, index, x, null))
a[b & mask] = x;
} while (++b != t);
- U.storeFence();
+ VarHandle.releaseFence();
}
return a;
}
@@ -917,33 +826,12 @@
int b = base, s = top, al, i; ForkJoinTask<?>[] a;
if ((a = array) != null && b != s && (al = a.length) > 0) {
int index = (al - 1) & --s;
- long offset = ((long)index << ASHIFT) + ABASE;
ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getObject(a, offset);
+ QA.get(a, index);
if (t != null &&
- U.compareAndSwapObject(a, offset, t, null)) {
+ QA.compareAndSet(a, index, t, null)) {
top = s;
- return t;
- }
- }
- return null;
- }
-
- /**
- * Takes a task in FIFO order if b is base of queue and a task
- * can be claimed without contention. Specialized versions
- * appear in ForkJoinPool methods scan and helpStealer.
- */
- final ForkJoinTask<?> pollAt(int b) {
- ForkJoinTask<?>[] a; int al;
- if ((a = array) != null && (al = a.length) > 0) {
- int index = (al - 1) & b;
- long offset = ((long)index << ASHIFT) + ABASE;
- ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
- if (t != null && b++ == base &&
- U.compareAndSwapObject(a, offset, t, null)) {
- base = b;
+ VarHandle.releaseFence();
return t;
}
}
@@ -959,12 +847,11 @@
if ((a = array) != null && (d = b - s) < 0 &&
(al = a.length) > 0) {
int index = (al - 1) & b;
- long offset = ((long)index << ASHIFT) + ABASE;
ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
+ QA.getAcquire(a, index);
if (b++ == base) {
if (t != null) {
- if (U.compareAndSwapObject(a, offset, t, null)) {
+ if (QA.compareAndSet(a, index, t, null)) {
base = b;
return t;
}
@@ -983,7 +870,7 @@
* Takes next task, if one exists, in order specified by mode.
*/
final ForkJoinTask<?> nextLocalTask() {
- return (config < 0) ? poll() : pop();
+ return ((id & FIFO) != 0) ? poll() : pop();
}
/**
@@ -992,7 +879,8 @@
final ForkJoinTask<?> peek() {
int al; ForkJoinTask<?>[] a;
return ((a = array) != null && (al = a.length) > 0) ?
- a[(al - 1) & (config < 0 ? base : top - 1)] : null;
+ a[(al - 1) &
+ ((id & FIFO) != 0 ? base : top - 1)] : null;
}
/**
@@ -1002,9 +890,9 @@
int b = base, s = top, al; ForkJoinTask<?>[] a;
if ((a = array) != null && b != s && (al = a.length) > 0) {
int index = (al - 1) & --s;
- long offset = ((long)index << ASHIFT) + ABASE;
- if (U.compareAndSwapObject(a, offset, task, null)) {
+ if (QA.compareAndSet(a, index, task, null)) {
top = s;
+ VarHandle.releaseFence();
return true;
}
}
@@ -1012,105 +900,32 @@
}
/**
- * Shared version of push. Fails if already locked.
- *
- * @return status: > 0 locked, 0 possibly was empty, < 0 was nonempty
- */
- final int sharedPush(ForkJoinTask<?> task) {
- int stat;
- if (U.compareAndSwapInt(this, QLOCK, 0, 1)) {
- int b = base, s = top, al, d; ForkJoinTask<?>[] a;
- if ((a = array) != null && (al = a.length) > 0 &&
- al - 1 + (d = b - s) > 0) {
- a[(al - 1) & s] = task;
- top = s + 1; // relaxed writes OK here
- qlock = 0;
- stat = (d < 0 && b == base) ? d : 0;
- }
- else {
- growAndSharedPush(task);
- stat = 0;
- }
- }
- else
- stat = 1;
- return stat;
- }
-
- /**
- * Helper for sharedPush; called only when locked and resize
- * needed.
- */
- private void growAndSharedPush(ForkJoinTask<?> task) {
- try {
- growArray();
- int s = top, al; ForkJoinTask<?>[] a;
- if ((a = array) != null && (al = a.length) > 0) {
- a[(al - 1) & s] = task;
- top = s + 1;
- }
- } finally {
- qlock = 0;
- }
- }
-
- /**
- * Shared version of tryUnpush.
- */
- final boolean trySharedUnpush(ForkJoinTask<?> task) {
- boolean popped = false;
- int s = top - 1, al; ForkJoinTask<?>[] a;
- if ((a = array) != null && (al = a.length) > 0) {
- int index = (al - 1) & s;
- long offset = ((long)index << ASHIFT) + ABASE;
- ForkJoinTask<?> t = (ForkJoinTask<?>) U.getObject(a, offset);
- if (t == task &&
- U.compareAndSwapInt(this, QLOCK, 0, 1)) {
- if (top == s + 1 && array == a &&
- U.compareAndSwapObject(a, offset, task, null)) {
- popped = true;
- top = s;
- }
- U.putIntRelease(this, QLOCK, 0);
- }
- }
- return popped;
- }
-
- /**
* Removes and cancels all known tasks, ignoring any exceptions.
*/
final void cancelAll() {
- ForkJoinTask<?> t;
- if ((t = currentJoin) != null) {
- currentJoin = null;
- ForkJoinTask.cancelIgnoringExceptions(t);
- }
- if ((t = currentSteal) != null) {
- currentSteal = null;
- ForkJoinTask.cancelIgnoringExceptions(t);
- }
- while ((t = poll()) != null)
+ for (ForkJoinTask<?> t; (t = poll()) != null; )
ForkJoinTask.cancelIgnoringExceptions(t);
}
// Specialized execution methods
/**
- * Pops and executes up to POLL_LIMIT tasks or until empty.
+ * Pops and executes up to limit consecutive tasks or until empty.
+ *
+ * @param limit max runs, or zero for no limit
*/
- final void localPopAndExec() {
- for (int nexec = 0;;) {
+ final void localPopAndExec(int limit) {
+ for (;;) {
int b = base, s = top, al; ForkJoinTask<?>[] a;
if ((a = array) != null && b != s && (al = a.length) > 0) {
int index = (al - 1) & --s;
- long offset = ((long)index << ASHIFT) + ABASE;
ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getAndSetObject(a, offset, null);
+ QA.getAndSet(a, index, null);
if (t != null) {
top = s;
- (currentSteal = t).doExec();
- if (++nexec > POLL_LIMIT)
+ VarHandle.releaseFence();
+ t.doExec();
+ if (limit != 0 && --limit == 0)
break;
}
else
@@ -1122,22 +937,28 @@
}
/**
- * Polls and executes up to POLL_LIMIT tasks or until empty.
+ * Polls and executes up to limit consecutive tasks or until empty.
+ *
+ * @param limit, or zero for no limit
*/
- final void localPollAndExec() {
- for (int nexec = 0;;) {
- int b = base, s = top, al; ForkJoinTask<?>[] a;
- if ((a = array) != null && b != s && (al = a.length) > 0) {
+ final void localPollAndExec(int limit) {
+ for (int polls = 0;;) {
+ int b = base, s = top, d, al; ForkJoinTask<?>[] a;
+ if ((a = array) != null && (d = b - s) < 0 &&
+ (al = a.length) > 0) {
int index = (al - 1) & b++;
- long offset = ((long)index << ASHIFT) + ABASE;
ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getAndSetObject(a, offset, null);
+ QA.getAndSet(a, index, null);
if (t != null) {
base = b;
t.doExec();
- if (++nexec > POLL_LIMIT)
+ if (limit != 0 && ++polls == limit)
break;
}
+ else if (d == -1)
+ break; // now empty
+ else
+ polls = 0; // stolen; reset
}
else
break;
@@ -1145,188 +966,156 @@
}
/**
- * Executes the given task and (some) remaining local tasks.
+ * If present, removes task from queue and executes it.
*/
- final void runTask(ForkJoinTask<?> task) {
- if (task != null) {
- task.doExec();
- if (config < 0)
- localPollAndExec();
- else
- localPopAndExec();
- int ns = ++nsteals;
- ForkJoinWorkerThread thread = owner;
- currentSteal = null;
- if (ns < 0) // collect on overflow
- transferStealCount(pool);
- if (thread != null)
- thread.afterTopLevelExec();
- }
- }
-
- /**
- * Adds steal count to pool steal count if it exists, and resets.
- */
- final void transferStealCount(ForkJoinPool p) {
- AuxState aux;
- if (p != null && (aux = p.auxState) != null) {
- long s = nsteals;
- nsteals = 0; // if negative, correct for overflow
- if (s < 0) s = Integer.MAX_VALUE;
- aux.lock();
- try {
- aux.stealCount += s;
- } finally {
- aux.unlock();
+ final void tryRemoveAndExec(ForkJoinTask<?> task) {
+ ForkJoinTask<?>[] wa; int s, wal;
+ if (base - (s = top) < 0 && // traverse from top
+ (wa = array) != null && (wal = wa.length) > 0) {
+ for (int m = wal - 1, ns = s - 1, i = ns; ; --i) {
+ int index = i & m;
+ ForkJoinTask<?> t = (ForkJoinTask<?>)
+ QA.get(wa, index);
+ if (t == null)
+ break;
+ else if (t == task) {
+ if (QA.compareAndSet(wa, index, t, null)) {
+ top = ns; // safely shift down
+ for (int j = i; j != ns; ++j) {
+ ForkJoinTask<?> f;
+ int pindex = (j + 1) & m;
+ f = (ForkJoinTask<?>)QA.get(wa, pindex);
+ QA.setVolatile(wa, pindex, null);
+ int jindex = j & m;
+ QA.setRelease(wa, jindex, f);
+ }
+ VarHandle.releaseFence();
+ t.doExec();
+ }
+ break;
+ }
}
}
}
/**
- * If present, removes from queue and executes the given task,
- * or any other cancelled task. Used only by awaitJoin.
+ * Tries to steal and run tasks within the target's
+ * computation until done, not found, or limit exceeded.
*
- * @return true if queue empty and task not known to be done
+ * @param task root of CountedCompleter computation
+ * @param limit max runs, or zero for no limit
+ * @return task status on exit
*/
- final boolean tryRemoveAndExec(ForkJoinTask<?> task) {
- if (task != null && task.status >= 0) {
- int b, s, d, al; ForkJoinTask<?>[] a;
- while ((d = (b = base) - (s = top)) < 0 &&
- (a = array) != null && (al = a.length) > 0) {
- for (;;) { // traverse from s to b
- int index = --s & (al - 1);
- long offset = (index << ASHIFT) + ABASE;
- ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
- if (t == null)
- break; // restart
- else if (t == task) {
- boolean removed = false;
- if (s + 1 == top) { // pop
- if (U.compareAndSwapObject(a, offset, t, null)) {
- top = s;
- removed = true;
+ final int localHelpCC(CountedCompleter<?> task, int limit) {
+ int status = 0;
+ if (task != null && (status = task.status) >= 0) {
+ for (;;) {
+ boolean help = false;
+ int b = base, s = top, al; ForkJoinTask<?>[] a;
+ if ((a = array) != null && b != s && (al = a.length) > 0) {
+ int index = (al - 1) & (s - 1);
+ ForkJoinTask<?> o = (ForkJoinTask<?>)
+ QA.get(a, index);
+ if (o instanceof CountedCompleter) {
+ CountedCompleter<?> t = (CountedCompleter<?>)o;
+ for (CountedCompleter<?> f = t;;) {
+ if (f != task) {
+ if ((f = f.completer) == null) // try parent
+ break;
+ }
+ else {
+ if (QA.compareAndSet(a, index, t, null)) {
+ top = s - 1;
+ VarHandle.releaseFence();
+ t.doExec();
+ help = true;
+ }
+ break;
}
}
- else if (base == b) // replace with proxy
- removed = U.compareAndSwapObject(a, offset, t,
- new EmptyTask());
- if (removed) {
- ForkJoinTask<?> ps = currentSteal;
- (currentSteal = task).doExec();
- currentSteal = ps;
- }
- break;
- }
- else if (t.status < 0 && s + 1 == top) {
- if (U.compareAndSwapObject(a, offset, t, null)) {
- top = s;
- }
- break; // was cancelled
- }
- else if (++d == 0) {
- if (base != b) // rescan
- break;
- return false;
}
}
- if (task.status < 0)
- return false;
+ if ((status = task.status) < 0 || !help ||
+ (limit != 0 && --limit == 0))
+ break;
}
}
- return true;
+ return status;
+ }
+
+ // Operations on shared queues
+
+ /**
+ * Tries to lock shared queue by CASing phase field.
+ */
+ final boolean tryLockSharedQueue() {
+ return PHASE.compareAndSet(this, 0, QLOCK);
}
/**
- * Pops task if in the same CC computation as the given task,
- * in either shared or owned mode. Used only by helpComplete.
+ * Shared version of tryUnpush.
*/
- final CountedCompleter<?> popCC(CountedCompleter<?> task, int mode) {
- int b = base, s = top, al; ForkJoinTask<?>[] a;
- if ((a = array) != null && b != s && (al = a.length) > 0) {
- int index = (al - 1) & (s - 1);
- long offset = ((long)index << ASHIFT) + ABASE;
- ForkJoinTask<?> o = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
- if (o instanceof CountedCompleter) {
- CountedCompleter<?> t = (CountedCompleter<?>)o;
- for (CountedCompleter<?> r = t;;) {
- if (r == task) {
- if ((mode & IS_OWNED) == 0) {
- boolean popped = false;
- if (U.compareAndSwapInt(this, QLOCK, 0, 1)) {
- if (top == s && array == a &&
- U.compareAndSwapObject(a, offset,
- t, null)) {
- popped = true;
- top = s - 1;
- }
- U.putIntRelease(this, QLOCK, 0);
- if (popped)
- return t;
- }
- }
- else if (U.compareAndSwapObject(a, offset,
- t, null)) {
- top = s - 1;
- return t;
- }
- break;
- }
- else if ((r = r.completer) == null) // try parent
- break;
+ final boolean trySharedUnpush(ForkJoinTask<?> task) {
+ boolean popped = false;
+ int s = top - 1, al; ForkJoinTask<?>[] a;
+ if ((a = array) != null && (al = a.length) > 0) {
+ int index = (al - 1) & s;
+ ForkJoinTask<?> t = (ForkJoinTask<?>) QA.get(a, index);
+ if (t == task &&
+ PHASE.compareAndSet(this, 0, QLOCK)) {
+ if (top == s + 1 && array == a &&
+ QA.compareAndSet(a, index, task, null)) {
+ popped = true;
+ top = s;
}
+ PHASE.setRelease(this, 0);
}
}
- return null;
+ return popped;
}
/**
- * Steals and runs a task in the same CC computation as the
- * given task if one exists and can be taken without
- * contention. Otherwise returns a checksum/control value for
- * use by method helpComplete.
- *
- * @return 1 if successful, 2 if retryable (lost to another
- * stealer), -1 if non-empty but no matching task found, else
- * the base index, forced negative.
+ * Shared version of localHelpCC.
*/
- final int pollAndExecCC(CountedCompleter<?> task) {
- ForkJoinTask<?>[] a;
- int b = base, s = top, al, h;
- if ((a = array) != null && b != s && (al = a.length) > 0) {
- int index = (al - 1) & b;
- long offset = ((long)index << ASHIFT) + ABASE;
- ForkJoinTask<?> o = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
- if (o == null)
- h = 2; // retryable
- else if (!(o instanceof CountedCompleter))
- h = -1; // unmatchable
- else {
- CountedCompleter<?> t = (CountedCompleter<?>)o;
- for (CountedCompleter<?> r = t;;) {
- if (r == task) {
- if (b++ == base &&
- U.compareAndSwapObject(a, offset, t, null)) {
- base = b;
- t.doExec();
- h = 1; // success
+ final int sharedHelpCC(CountedCompleter<?> task, int limit) {
+ int status = 0;
+ if (task != null && (status = task.status) >= 0) {
+ for (;;) {
+ boolean help = false;
+ int b = base, s = top, al; ForkJoinTask<?>[] a;
+ if ((a = array) != null && b != s && (al = a.length) > 0) {
+ int index = (al - 1) & (s - 1);
+ ForkJoinTask<?> o = (ForkJoinTask<?>)
+ QA.get(a, index);
+ if (o instanceof CountedCompleter) {
+ CountedCompleter<?> t = (CountedCompleter<?>)o;
+ for (CountedCompleter<?> f = t;;) {
+ if (f != task) {
+ if ((f = f.completer) == null)
+ break;
+ }
+ else {
+ if (PHASE.compareAndSet(this, 0, QLOCK)) {
+ if (top == s && array == a &&
+ QA.compareAndSet(a, index, t, null)) {
+ help = true;
+ top = s - 1;
+ }
+ PHASE.setRelease(this, 0);
+ if (help)
+ t.doExec();
+ }
+ break;
+ }
}
- else
- h = 2; // lost CAS
- break;
- }
- else if ((r = r.completer) == null) {
- h = -1; // unmatched
- break;
}
}
+ if ((status = task.status) < 0 || !help ||
+ (limit != 0 && --limit == 0))
+ break;
}
}
- else
- h = b | Integer.MIN_VALUE; // to sense movement on re-poll
- return h;
+ return status;
}
/**
@@ -1334,27 +1123,18 @@
*/
final boolean isApparentlyUnblocked() {
Thread wt; Thread.State s;
- return (scanState >= 0 &&
- (wt = owner) != null &&
+ return ((wt = owner) != null &&
(s = wt.getState()) != Thread.State.BLOCKED &&
s != Thread.State.WAITING &&
s != Thread.State.TIMED_WAITING);
}
- // Unsafe mechanics. Note that some are (and must be) the same as in FJP
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long QLOCK;
- private static final int ABASE;
- private static final int ASHIFT;
+ // VarHandle mechanics.
+ private static final VarHandle PHASE;
static {
try {
- QLOCK = U.objectFieldOffset
- (WorkQueue.class.getDeclaredField("qlock"));
- ABASE = U.arrayBaseOffset(ForkJoinTask[].class);
- int scale = U.arrayIndexScale(ForkJoinTask[].class);
- if ((scale & (scale - 1)) != 0)
- throw new Error("array index scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ PHASE = l.findVarHandle(WorkQueue.class, "phase", int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -1372,7 +1152,7 @@
/**
* Permission required for callers of methods that may start or
- * kill threads. Also used as a static lock in tryInitialize.
+ * kill threads.
*/
static final RuntimePermission modifyThreadPermission;
@@ -1413,18 +1193,15 @@
// static configuration constants
/**
- * Initial timeout value (in milliseconds) for the thread
- * triggering quiescence to park waiting for new work. On timeout,
- * the thread will instead try to shrink the number of workers.
- * The value should be large enough to avoid overly aggressive
- * shrinkage during most transient stalls (long GCs etc).
+ * Default idle timeout value (in milliseconds) for the thread
+ * triggering quiescence to park waiting for new work
*/
- private static final long IDLE_TIMEOUT_MS = 2000L; // 2sec
+ private static final long DEFAULT_KEEPALIVE = 60000L;
/**
- * Tolerance for idle timeouts, to cope with timer undershoots.
+ * Undershoot tolerance for idle timeouts
*/
- private static final long TIMEOUT_SLOP_MS = 20L; // 20ms
+ private static final long TIMEOUT_SLOP = 20L;
/**
* The default value for COMMON_MAX_SPARES. Overridable using the
@@ -1444,7 +1221,7 @@
/*
* Bits and masks for field ctl, packed with 4 16 bit subfields:
- * AC: Number of active running workers minus target parallelism
+ * RC: Number of released (unqueued) workers minus target parallelism
* TC: Number of total workers minus target parallelism
* SS: version count and status of top waiting thread
* ID: poolIndex of top of Treiber stack of waiters
@@ -1453,26 +1230,30 @@
* (including version bits) as sp=(int)ctl. The offsets of counts
* by the target parallelism and the positionings of fields makes
* it possible to perform the most common checks via sign tests of
- * fields: When ac is negative, there are not enough active
+ * fields: When ac is negative, there are not enough unqueued
* workers, when tc is negative, there are not enough total
* workers. When sp is non-zero, there are waiting workers. To
* deal with possibly negative fields, we use casts in and out of
* "short" and/or signed shifts to maintain signedness.
*
- * Because it occupies uppermost bits, we can add one active count
- * using getAndAddLong of AC_UNIT, rather than CAS, when returning
+ * Because it occupies uppermost bits, we can add one release count
+ * using getAndAddLong of RC_UNIT, rather than CAS, when returning
* from a blocked join. Other updates entail multiple subfields
* and masking, requiring CAS.
+ *
+ * The limits packed in field "bounds" are also offset by the
+ * parallelism level to make them comparable to the ctl rc and tc
+ * fields.
*/
// Lower and upper word masks
private static final long SP_MASK = 0xffffffffL;
private static final long UC_MASK = ~SP_MASK;
- // Active counts
- private static final int AC_SHIFT = 48;
- private static final long AC_UNIT = 0x0001L << AC_SHIFT;
- private static final long AC_MASK = 0xffffL << AC_SHIFT;
+ // Release counts
+ private static final int RC_SHIFT = 48;
+ private static final long RC_UNIT = 0x0001L << RC_SHIFT;
+ private static final long RC_MASK = 0xffffL << RC_SHIFT;
// Total counts
private static final int TC_SHIFT = 32;
@@ -1480,52 +1261,21 @@
private static final long TC_MASK = 0xffffL << TC_SHIFT;
private static final long ADD_WORKER = 0x0001L << (TC_SHIFT + 15); // sign
- // runState bits: SHUTDOWN must be negative, others arbitrary powers of two
- private static final int STARTED = 1;
- private static final int STOP = 1 << 1;
- private static final int TERMINATED = 1 << 2;
- private static final int SHUTDOWN = 1 << 31;
+ // Instance fields
- // Instance fields
- volatile long ctl; // main pool control
- volatile int runState;
- final int config; // parallelism, mode
- AuxState auxState; // lock, steal counts
- volatile WorkQueue[] workQueues; // main registry
- final String workerNamePrefix; // to create worker name string
+ volatile long stealCount; // collects worker nsteals
+ final long keepAlive; // milliseconds before dropping if idle
+ int indexSeed; // next worker index
+ final int bounds; // min, max threads packed as shorts
+ volatile int mode; // parallelism, runstate, queue mode
+ WorkQueue[] workQueues; // main registry
+ final String workerNamePrefix; // for worker thread string; sync lock
final ForkJoinWorkerThreadFactory factory;
final UncaughtExceptionHandler ueh; // per-worker UEH
+ final Predicate<? super ForkJoinPool> saturate;
- /**
- * Instantiates fields upon first submission, or upon shutdown if
- * no submissions. If checkTermination true, also responds to
- * termination by external calls submitting tasks.
- */
- private void tryInitialize(boolean checkTermination) {
- if (runState == 0) { // bootstrap by locking static field
- int p = config & SMASK;
- int n = (p > 1) ? p - 1 : 1; // ensure at least 2 slots
- n |= n >>> 1; // create workQueues array with size a power of two
- n |= n >>> 2;
- n |= n >>> 4;
- n |= n >>> 8;
- n |= n >>> 16;
- n = ((n + 1) << 1) & SMASK;
- AuxState aux = new AuxState();
- WorkQueue[] ws = new WorkQueue[n];
- synchronized (modifyThreadPermission) { // double-check
- if (runState == 0) {
- workQueues = ws;
- auxState = aux;
- runState = STARTED;
- }
- }
- }
- if (checkTermination && runState < 0) {
- tryTerminate(false, false); // help terminate
- throw new RejectedExecutionException();
- }
- }
+ @jdk.internal.vm.annotation.Contended("fjpctl") // segregate
+ volatile long ctl; // main pool control
// Creating, registering and deregistering workers
@@ -1534,18 +1284,14 @@
* count has already been incremented as a reservation. Invokes
* deregisterWorker on any failure.
*
- * @param isSpare true if this is a spare thread
* @return true if successful
*/
- private boolean createWorker(boolean isSpare) {
+ private boolean createWorker() {
ForkJoinWorkerThreadFactory fac = factory;
Throwable ex = null;
ForkJoinWorkerThread wt = null;
- WorkQueue q;
try {
if (fac != null && (wt = fac.newThread(this)) != null) {
- if (isSpare && (q = wt.workQueue) != null)
- q.config |= SPARE_WORKER;
wt.start();
return true;
}
@@ -1566,10 +1312,10 @@
*/
private void tryAddWorker(long c) {
do {
- long nc = ((AC_MASK & (c + AC_UNIT)) |
+ long nc = ((RC_MASK & (c + RC_UNIT)) |
(TC_MASK & (c + TC_UNIT)));
- if (ctl == c && U.compareAndSwapLong(this, CTL, c, nc)) {
- createWorker(false);
+ if (ctl == c && CTL.compareAndSet(this, c, nc)) {
+ createWorker();
break;
}
} while (((c = ctl) & ADD_WORKER) != 0L && (int)c == 0);
@@ -1584,41 +1330,57 @@
*/
final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
UncaughtExceptionHandler handler;
- AuxState aux;
- wt.setDaemon(true); // configure thread
+ wt.setDaemon(true); // configure thread
if ((handler = ueh) != null)
wt.setUncaughtExceptionHandler(handler);
WorkQueue w = new WorkQueue(this, wt);
- int i = 0; // assign a pool index
- int mode = config & MODE_MASK;
- if ((aux = auxState) != null) {
- aux.lock();
- try {
- int s = (int)(aux.indexSeed += SEED_INCREMENT), n, m;
- WorkQueue[] ws = workQueues;
- if (ws != null && (n = ws.length) > 0) {
- i = (m = n - 1) & ((s << 1) | 1); // odd-numbered indices
- if (ws[i] != null) { // collision
- int probes = 0; // step by approx half n
- int step = (n <= 4) ? 2 : ((n >>> 1) & EVENMASK) + 2;
- while (ws[i = (i + step) & m] != null) {
- if (++probes >= n) {
- workQueues = ws = Arrays.copyOf(ws, n <<= 1);
- m = n - 1;
- probes = 0;
- }
+ int tid = 0; // for thread name
+ int fifo = mode & FIFO;
+ String prefix = workerNamePrefix;
+ if (prefix != null) {
+ synchronized (prefix) {
+ WorkQueue[] ws = workQueues; int n;
+ int s = indexSeed += SEED_INCREMENT;
+ if (ws != null && (n = ws.length) > 1) {
+ int m = n - 1;
+ tid = s & m;
+ int i = m & ((s << 1) | 1); // odd-numbered indices
+ for (int probes = n >>> 1;;) { // find empty slot
+ WorkQueue q;
+ if ((q = ws[i]) == null || q.phase == QUIET)
+ break;
+ else if (--probes == 0) {
+ i = n | 1; // resize below
+ break;
}
+ else
+ i = (i + 2) & m;
}
- w.hint = s; // use as random seed
- w.config = i | mode;
- w.scanState = i | (s & 0x7fff0000); // random seq bits
- ws[i] = w;
+
+ int id = i | fifo | (s & ~(SMASK | FIFO | DORMANT));
+ w.phase = w.id = id; // now publishable
+
+ if (i < n)
+ ws[i] = w;
+ else { // expand array
+ int an = n << 1;
+ WorkQueue[] as = new WorkQueue[an];
+ as[i] = w;
+ int am = an - 1;
+ for (int j = 0; j < n; ++j) {
+ WorkQueue v; // copy external queue
+ if ((v = ws[j]) != null) // position may change
+ as[v.id & am & SQMASK] = v;
+ if (++j >= n)
+ break;
+ as[j] = ws[j]; // copy worker
+ }
+ workQueues = as;
+ }
}
- } finally {
- aux.unlock();
}
+ wt.setName(prefix.concat(Integer.toString(tid)));
}
- wt.setName(workerNamePrefix.concat(Integer.toString(i >>> 1)));
return w;
}
@@ -1633,64 +1395,48 @@
*/
final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
WorkQueue w = null;
+ int phase = 0;
if (wt != null && (w = wt.workQueue) != null) {
- AuxState aux; WorkQueue[] ws; // remove index from array
- int idx = w.config & SMASK;
- int ns = w.nsteals;
- if ((aux = auxState) != null) {
- aux.lock();
- try {
+ Object lock = workerNamePrefix;
+ long ns = (long)w.nsteals & 0xffffffffL;
+ int idx = w.id & SMASK;
+ if (lock != null) {
+ WorkQueue[] ws; // remove index from array
+ synchronized (lock) {
if ((ws = workQueues) != null && ws.length > idx &&
ws[idx] == w)
ws[idx] = null;
- aux.stealCount += ns;
- } finally {
- aux.unlock();
+ stealCount += ns;
}
}
- }
- if (w == null || (w.config & UNREGISTERED) == 0) { // else pre-adjusted
- long c; // decrement counts
- do {} while (!U.compareAndSwapLong
- (this, CTL, c = ctl, ((AC_MASK & (c - AC_UNIT)) |
- (TC_MASK & (c - TC_UNIT)) |
- (SP_MASK & c))));
- }
- if (w != null) {
- w.currentSteal = null;
- w.qlock = -1; // ensure set
- w.cancelAll(); // cancel remaining tasks
+ phase = w.phase;
}
- while (tryTerminate(false, false) >= 0) { // possibly replace
- WorkQueue[] ws; int wl, sp; long c;
- if (w == null || w.array == null ||
- (ws = workQueues) == null || (wl = ws.length) <= 0)
- break;
- else if ((sp = (int)(c = ctl)) != 0) { // wake up replacement
- if (tryRelease(c, ws[(wl - 1) & sp], AC_UNIT))
- break;
- }
- else if (ex != null && (c & ADD_WORKER) != 0L) {
- tryAddWorker(c); // create replacement
- break;
- }
- else // don't need replacement
- break;
+ if (phase != QUIET) { // else pre-adjusted
+ long c; // decrement counts
+ do {} while (!CTL.weakCompareAndSetVolatile
+ (this, c = ctl, ((RC_MASK & (c - RC_UNIT)) |
+ (TC_MASK & (c - TC_UNIT)) |
+ (SP_MASK & c))));
}
+ if (w != null)
+ w.cancelAll(); // cancel remaining tasks
+
+ if (!tryTerminate(false, false) && // possibly replace worker
+ w != null && w.array != null) // avoid repeated failures
+ signalWork();
+
if (ex == null) // help clean on way out
ForkJoinTask.helpExpungeStaleExceptions();
else // rethrow
ForkJoinTask.rethrow(ex);
}
- // Signalling
-
/**
- * Tries to create or activate a worker if too few are active.
+ * Tries to create or release a worker if too few are running.
*/
final void signalWork() {
for (;;) {
- long c; int sp, i; WorkQueue v; WorkQueue[] ws;
+ long c; int sp; WorkQueue[] ws; int i; WorkQueue v;
if ((c = ctl) >= 0L) // enough workers
break;
else if ((sp = (int)c) == 0) { // no idle workers
@@ -1705,12 +1451,14 @@
else if ((v = ws[i]) == null)
break; // terminating
else {
- int ns = sp & ~UNSIGNALLED;
- int vs = v.scanState;
- long nc = (v.stackPred & SP_MASK) | (UC_MASK & (c + AC_UNIT));
- if (sp == vs && U.compareAndSwapLong(this, CTL, c, nc)) {
- v.scanState = ns;
- LockSupport.unpark(v.parker);
+ int np = sp & ~UNSIGNALLED;
+ int vp = v.phase;
+ long nc = (v.stackPred & SP_MASK) | (UC_MASK & (c + RC_UNIT));
+ Thread vt = v.owner;
+ if (sp == vp && CTL.compareAndSet(this, c, nc)) {
+ v.phase = np;
+ if (v.source < 0)
+ LockSupport.unpark(vt);
break;
}
}
@@ -1718,442 +1466,183 @@
}
/**
- * Signals and releases worker v if it is top of idle worker
- * stack. This performs a one-shot version of signalWork only if
- * there is (apparently) at least one idle worker.
+ * Tries to decrement counts (sometimes implicitly) and possibly
+ * arrange for a compensating worker in preparation for blocking:
+ * If not all core workers yet exist, creates one, else if any are
+ * unreleased (possibly including caller) releases one, else if
+ * fewer than the minimum allowed number of workers running,
+ * checks to see that they are all active, and if so creates an
+ * extra worker unless over maximum limit and policy is to
+ * saturate. Most of these steps can fail due to interference, in
+ * which case 0 is returned so caller will retry. A negative
+ * return value indicates that the caller doesn't need to
+ * re-adjust counts when later unblocked.
*
- * @param c incoming ctl value
- * @param v if non-null, a worker
- * @param inc the increment to active count (zero when compensating)
- * @return true if successful
- */
- private boolean tryRelease(long c, WorkQueue v, long inc) {
- int sp = (int)c, ns = sp & ~UNSIGNALLED;
- if (v != null) {
- int vs = v.scanState;
- long nc = (v.stackPred & SP_MASK) | (UC_MASK & (c + inc));
- if (sp == vs && U.compareAndSwapLong(this, CTL, c, nc)) {
- v.scanState = ns;
- LockSupport.unpark(v.parker);
- return true;
- }
- }
- return false;
- }
-
- /**
- * With approx probability of a missed signal, tries (once) to
- * reactivate worker w (or some other worker), failing if stale or
- * known to be already active.
- *
- * @param w the worker
- * @param ws the workQueue array to use
- * @param r random seed
- */
- private void tryReactivate(WorkQueue w, WorkQueue[] ws, int r) {
- long c; int sp, wl; WorkQueue v;
- if ((sp = (int)(c = ctl)) != 0 && w != null &&
- ws != null && (wl = ws.length) > 0 &&
- ((sp ^ r) & SS_SEQ) == 0 &&
- (v = ws[(wl - 1) & sp]) != null) {
- long nc = (v.stackPred & SP_MASK) | (UC_MASK & (c + AC_UNIT));
- int ns = sp & ~UNSIGNALLED;
- if (w.scanState < 0 &&
- v.scanState == sp &&
- U.compareAndSwapLong(this, CTL, c, nc)) {
- v.scanState = ns;
- LockSupport.unpark(v.parker);
- }
- }
- }
-
- /**
- * If worker w exists and is active, enqueues and sets status to inactive.
- *
- * @param w the worker
- * @param ss current (non-negative) scanState
+ * @return 1: block then adjust, -1: block without adjust, 0 : retry
*/
- private void inactivate(WorkQueue w, int ss) {
- int ns = (ss + SS_SEQ) | UNSIGNALLED;
- long lc = ns & SP_MASK, nc, c;
- if (w != null) {
- w.scanState = ns;
- do {
- nc = lc | (UC_MASK & ((c = ctl) - AC_UNIT));
- w.stackPred = (int)c;
- } while (!U.compareAndSwapLong(this, CTL, c, nc));
- }
- }
-
- /**
- * Possibly blocks worker w waiting for signal, or returns
- * negative status if the worker should terminate. May return
- * without status change if multiple stale unparks and/or
- * interrupts occur.
- *
- * @param w the calling worker
- * @return negative if w should terminate
- */
- private int awaitWork(WorkQueue w) {
- int stat = 0;
- if (w != null && w.scanState < 0) {
- long c = ctl;
- if ((int)(c >> AC_SHIFT) + (config & SMASK) <= 0)
- stat = timedAwaitWork(w, c); // possibly quiescent
- else if ((runState & STOP) != 0)
- stat = w.qlock = -1; // pool terminating
- else if (w.scanState < 0) {
- w.parker = Thread.currentThread();
- if (w.scanState < 0) // recheck after write
- LockSupport.park(this);
- w.parker = null;
- if ((runState & STOP) != 0)
- stat = w.qlock = -1; // recheck
- else if (w.scanState < 0)
- Thread.interrupted(); // clear status
+ private int tryCompensate(WorkQueue w) {
+ int t, n, sp;
+ long c = ctl;
+ WorkQueue[] ws = workQueues;
+ if ((t = (short)(c >>> TC_SHIFT)) >= 0) {
+ if (ws == null || (n = ws.length) <= 0 || w == null)
+ return 0; // disabled
+ else if ((sp = (int)c) != 0) { // replace or release
+ WorkQueue v = ws[sp & (n - 1)];
+ int wp = w.phase;
+ long uc = UC_MASK & ((wp < 0) ? c + RC_UNIT : c);
+ int np = sp & ~UNSIGNALLED;
+ if (v != null) {
+ int vp = v.phase;
+ Thread vt = v.owner;
+ long nc = ((long)v.stackPred & SP_MASK) | uc;
+ if (vp == sp && CTL.compareAndSet(this, c, nc)) {
+ v.phase = np;
+ if (v.source < 0)
+ LockSupport.unpark(vt);
+ return (wp < 0) ? -1 : 1;
+ }
+ }
+ return 0;
+ }
+ else if ((int)(c >> RC_SHIFT) - // reduce parallelism
+ (short)(bounds & SMASK) > 0) {
+ long nc = ((RC_MASK & (c - RC_UNIT)) | (~RC_MASK & c));
+ return CTL.compareAndSet(this, c, nc) ? 1 : 0;
}
- }
- return stat;
- }
-
- /**
- * Possibly triggers shutdown and tries (once) to block worker
- * when pool is (or may be) quiescent. Waits up to a duration
- * determined by number of workers. On timeout, if ctl has not
- * changed, terminates the worker, which will in turn wake up
- * another worker to possibly repeat this process.
- *
- * @param w the calling worker
- * @return negative if w should terminate
- */
- private int timedAwaitWork(WorkQueue w, long c) {
- int stat = 0;
- int scale = 1 - (short)(c >>> TC_SHIFT);
- long deadline = (((scale <= 0) ? 1 : scale) * IDLE_TIMEOUT_MS +
- System.currentTimeMillis());
- if ((runState >= 0 || (stat = tryTerminate(false, false)) > 0) &&
- w != null && w.scanState < 0) {
- int ss; AuxState aux;
- w.parker = Thread.currentThread();
- if (w.scanState < 0)
- LockSupport.parkUntil(this, deadline);
- w.parker = null;
- if ((runState & STOP) != 0)
- stat = w.qlock = -1; // pool terminating
- else if ((ss = w.scanState) < 0 && !Thread.interrupted() &&
- (int)c == ss && (aux = auxState) != null && ctl == c &&
- deadline - System.currentTimeMillis() <= TIMEOUT_SLOP_MS) {
- aux.lock();
- try { // pre-deregister
- WorkQueue[] ws;
- int cfg = w.config, idx = cfg & SMASK;
- long nc = ((UC_MASK & (c - TC_UNIT)) |
- (SP_MASK & w.stackPred));
- if ((runState & STOP) == 0 &&
- (ws = workQueues) != null &&
- idx < ws.length && idx >= 0 && ws[idx] == w &&
- U.compareAndSwapLong(this, CTL, c, nc)) {
- ws[idx] = null;
- w.config = cfg | UNREGISTERED;
- stat = w.qlock = -1;
+ else { // validate
+ int md = mode, pc = md & SMASK, tc = pc + t, bc = 0;
+ boolean unstable = false;
+ for (int i = 1; i < n; i += 2) {
+ WorkQueue q; Thread wt; Thread.State ts;
+ if ((q = ws[i]) != null) {
+ if (q.source == 0) {
+ unstable = true;
+ break;
+ }
+ else {
+ --tc;
+ if ((wt = q.owner) != null &&
+ ((ts = wt.getState()) == Thread.State.BLOCKED ||
+ ts == Thread.State.WAITING))
+ ++bc; // worker is blocking
+ }
}
- } finally {
- aux.unlock();
+ }
+ if (unstable || tc != 0 || ctl != c)
+ return 0; // inconsistent
+ else if (t + pc >= MAX_CAP || t >= (bounds >>> SWIDTH)) {
+ Predicate<? super ForkJoinPool> sat;
+ if ((sat = saturate) != null && sat.test(this))
+ return -1;
+ else if (bc < pc) { // lagging
+ Thread.yield(); // for retry spins
+ return 0;
+ }
+ else
+ throw new RejectedExecutionException(
+ "Thread limit exceeded replacing blocked worker");
}
}
}
- return stat;
- }
- /**
- * If the given worker is a spare with no queued tasks, and there
- * are enough existing workers, drops it from ctl counts and sets
- * its state to terminated.
- *
- * @param w the calling worker -- must be a spare
- * @return true if dropped (in which case it must not process more tasks)
- */
- private boolean tryDropSpare(WorkQueue w) {
- if (w != null && w.isEmpty()) { // no local tasks
- long c; int sp, wl; WorkQueue[] ws; WorkQueue v;
- while ((short)((c = ctl) >> TC_SHIFT) > 0 &&
- ((sp = (int)c) != 0 || (int)(c >> AC_SHIFT) > 0) &&
- (ws = workQueues) != null && (wl = ws.length) > 0) {
- boolean dropped, canDrop;
- if (sp == 0) { // no queued workers
- long nc = ((AC_MASK & (c - AC_UNIT)) |
- (TC_MASK & (c - TC_UNIT)) | (SP_MASK & c));
- dropped = U.compareAndSwapLong(this, CTL, c, nc);
- }
- else if (
- (v = ws[(wl - 1) & sp]) == null || v.scanState != sp)
- dropped = false; // stale; retry
- else {
- long nc = v.stackPred & SP_MASK;
- if (w == v || w.scanState >= 0) {
- canDrop = true; // w unqueued or topmost
- nc |= ((AC_MASK & c) | // ensure replacement
- (TC_MASK & (c - TC_UNIT)));
- }
- else { // w may be queued
- canDrop = false; // help uncover
- nc |= ((AC_MASK & (c + AC_UNIT)) |
- (TC_MASK & c));
- }
- if (U.compareAndSwapLong(this, CTL, c, nc)) {
- v.scanState = sp & ~UNSIGNALLED;
- LockSupport.unpark(v.parker);
- dropped = canDrop;
- }
- else
- dropped = false;
- }
- if (dropped) { // pre-deregister
- int cfg = w.config, idx = cfg & SMASK;
- if (idx >= 0 && idx < ws.length && ws[idx] == w)
- ws[idx] = null;
- w.config = cfg | UNREGISTERED;
- w.qlock = -1;
- return true;
- }
- }
- }
- return false;
+ long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK); // expand pool
+ return CTL.compareAndSet(this, c, nc) && createWorker() ? 1 : 0;
}
/**
* Top-level runloop for workers, called by ForkJoinWorkerThread.run.
+ * See above for explanation.
*/
final void runWorker(WorkQueue w) {
+ WorkQueue[] ws;
w.growArray(); // allocate queue
- int bound = (w.config & SPARE_WORKER) != 0 ? 0 : POLL_LIMIT;
- long seed = w.hint * 0xdaba0b6eb09322e3L; // initial random seed
- if ((runState & STOP) == 0) {
- for (long r = (seed == 0L) ? 1L : seed;;) { // ensure nonzero
- if (bound == 0 && tryDropSpare(w))
- break;
- // high bits of prev seed for step; current low bits for idx
- int step = (int)(r >>> 48) | 1;
- r ^= r >>> 12; r ^= r << 25; r ^= r >>> 27; // xorshift
- if (scan(w, bound, step, (int)r) < 0 && awaitWork(w) < 0)
- break;
- }
- }
- }
-
- // Scanning for tasks
-
- /**
- * Repeatedly scans for and tries to steal and execute (via
- * workQueue.runTask) a queued task. Each scan traverses queues in
- * pseudorandom permutation. Upon finding a non-empty queue, makes
- * at most the given bound attempts to re-poll (fewer if
- * contended) on the same queue before returning (impossible
- * scanState value) 0 to restart scan. Else returns after at least
- * 1 and at most 32 full scans.
- *
- * @param w the worker (via its WorkQueue)
- * @param bound repoll bound as bitmask (0 if spare)
- * @param step (circular) index increment per iteration (must be odd)
- * @param r a random seed for origin index
- * @return negative if should await signal
- */
- private int scan(WorkQueue w, int bound, int step, int r) {
- int stat = 0, wl; WorkQueue[] ws;
- if ((ws = workQueues) != null && w != null && (wl = ws.length) > 0) {
- for (int m = wl - 1,
- origin = m & r, idx = origin,
- npolls = 0,
- ss = w.scanState;;) { // negative if inactive
- WorkQueue q; ForkJoinTask<?>[] a; int b, al;
- if ((q = ws[idx]) != null && (b = q.base) - q.top < 0 &&
+ int r = w.id ^ ThreadLocalRandom.nextSecondarySeed();
+ if (r == 0) // initial nonzero seed
+ r = 1;
+ int lastSignalId = 0; // avoid unneeded signals
+ while ((ws = workQueues) != null) {
+ boolean nonempty = false; // scan
+ for (int n = ws.length, j = n, m = n - 1; j > 0; --j) {
+ WorkQueue q; int i, b, al; ForkJoinTask<?>[] a;
+ if ((i = r & m) >= 0 && i < n && // always true
+ (q = ws[i]) != null && (b = q.base) - q.top < 0 &&
(a = q.array) != null && (al = a.length) > 0) {
+ int qid = q.id; // (never zero)
int index = (al - 1) & b;
- long offset = ((long)index << ASHIFT) + ABASE;
ForkJoinTask<?> t = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
- if (t == null)
- break; // empty or busy
- else if (b++ != q.base)
- break; // busy
- else if (ss < 0) {
- tryReactivate(w, ws, r);
- break; // retry upon rescan
- }
- else if (!U.compareAndSwapObject(a, offset, t, null))
- break; // contended
- else {
- q.base = b;
- w.currentSteal = t;
- if (b != q.top) // propagate signal
- signalWork();
- w.runTask(t);
- if (++npolls > bound)
- break;
+ QA.getAcquire(a, index);
+ if (t != null && b++ == q.base &&
+ QA.compareAndSet(a, index, t, null)) {
+ if ((q.base = b) - q.top < 0 && qid != lastSignalId)
+ signalWork(); // propagate signal
+ w.source = lastSignalId = qid;
+ t.doExec();
+ if ((w.id & FIFO) != 0) // run remaining locals
+ w.localPollAndExec(POLL_LIMIT);
+ else
+ w.localPopAndExec(POLL_LIMIT);
+ ForkJoinWorkerThread thread = w.owner;
+ ++w.nsteals;
+ w.source = 0; // now idle
+ if (thread != null)
+ thread.afterTopLevelExec();
}
+ nonempty = true;
}
- else if (npolls != 0) // rescan
+ else if (nonempty)
break;
- else if ((idx = (idx + step) & m) == origin) {
- if (ss < 0) { // await signal
- stat = ss;
- break;
- }
- else if (r >= 0) {
- inactivate(w, ss);
- break;
- }
- else
- r <<= 1; // at most 31 rescans
- }
+ else
+ ++r;
}
- }
- return stat;
- }
-
- // Joining tasks
- /**
- * Tries to steal and run tasks within the target's computation.
- * Uses a variant of the top-level algorithm, restricted to tasks
- * with the given task as ancestor: It prefers taking and running
- * eligible tasks popped from the worker's own queue (via
- * popCC). Otherwise it scans others, randomly moving on
- * contention or execution, deciding to give up based on a
- * checksum (via return codes from pollAndExecCC). The maxTasks
- * argument supports external usages; internal calls use zero,
- * allowing unbounded steps (external calls trap non-positive
- * values).
- *
- * @param w caller
- * @param maxTasks if non-zero, the maximum number of other tasks to run
- * @return task status on exit
- */
- final int helpComplete(WorkQueue w, CountedCompleter<?> task,
- int maxTasks) {
- WorkQueue[] ws; int s = 0, wl;
- if ((ws = workQueues) != null && (wl = ws.length) > 1 &&
- task != null && w != null) {
- for (int m = wl - 1,
- mode = w.config,
- r = ~mode, // scanning seed
- origin = r & m, k = origin, // first queue to scan
- step = 3, // first scan step
- h = 1, // 1:ran, >1:contended, <0:hash
- oldSum = 0, checkSum = 0;;) {
- CountedCompleter<?> p; WorkQueue q; int i;
- if ((s = task.status) < 0)
- break;
- if (h == 1 && (p = w.popCC(task, mode)) != null) {
- p.doExec(); // run local task
- if (maxTasks != 0 && --maxTasks == 0)
- break;
- origin = k; // reset
- oldSum = checkSum = 0;
- }
- else { // poll other worker queues
- if ((i = k | 1) < 0 || i > m || (q = ws[i]) == null)
- h = 0;
- else if ((h = q.pollAndExecCC(task)) < 0)
- checkSum += h;
- if (h > 0) {
- if (h == 1 && maxTasks != 0 && --maxTasks == 0)
- break;
- step = (r >>> 16) | 3;
- r ^= r << 13; r ^= r >>> 17; r ^= r << 5; // xorshift
- k = origin = r & m; // move and restart
- oldSum = checkSum = 0;
- }
- else if ((k = (k + step) & m) == origin) {
- if (oldSum == (oldSum = checkSum))
- break;
- checkSum = 0;
- }
- }
+ if (nonempty) { // move (xorshift)
+ r ^= r << 13; r ^= r >>> 17; r ^= r << 5;
}
- }
- return s;
- }
-
- /**
- * Tries to locate and execute tasks for a stealer of the given
- * task, or in turn one of its stealers. Traces currentSteal ->
- * currentJoin links looking for a thread working on a descendant
- * of the given task and with a non-empty queue to steal back and
- * execute tasks from. The first call to this method upon a
- * waiting join will often entail scanning/search, (which is OK
- * because the joiner has nothing better to do), but this method
- * leaves hints in workers to speed up subsequent calls.
- *
- * @param w caller
- * @param task the task to join
- */
- private void helpStealer(WorkQueue w, ForkJoinTask<?> task) {
- if (task != null && w != null) {
- ForkJoinTask<?> ps = w.currentSteal;
- WorkQueue[] ws; int wl, oldSum = 0;
- outer: while (w.tryRemoveAndExec(task) && task.status >= 0 &&
- (ws = workQueues) != null && (wl = ws.length) > 0) {
- ForkJoinTask<?> subtask;
- int m = wl - 1, checkSum = 0; // for stability check
- WorkQueue j = w, v; // v is subtask stealer
- descent: for (subtask = task; subtask.status >= 0; ) {
- for (int h = j.hint | 1, k = 0, i;;) {
- if ((v = ws[i = (h + (k << 1)) & m]) != null) {
- if (v.currentSteal == subtask) {
- j.hint = i;
- break;
- }
- checkSum += v.base;
+ else {
+ int phase;
+ lastSignalId = 0; // clear for next scan
+ if ((phase = w.phase) >= 0) { // enqueue
+ int np = w.phase = (phase + SS_SEQ) | UNSIGNALLED;
+ long c, nc;
+ do {
+ w.stackPred = (int)(c = ctl);
+ nc = ((c - RC_UNIT) & UC_MASK) | (SP_MASK & np);
+ } while (!CTL.weakCompareAndSetVolatile(this, c, nc));
+ }
+ else { // already queued
+ int pred = w.stackPred;
+ w.source = DORMANT; // enable signal
+ for (int steps = 0;;) {
+ int md, rc; long c;
+ if (w.phase >= 0) {
+ w.source = 0;
+ break;
}
- if (++k > m) // can't find stealer
- break outer;
- }
-
- for (;;) { // help v or descend
- ForkJoinTask<?>[] a; int b, al;
- if (subtask.status < 0) // too late to help
- break descent;
- checkSum += (b = v.base);
- ForkJoinTask<?> next = v.currentJoin;
- ForkJoinTask<?> t = null;
- if ((a = v.array) != null && (al = a.length) > 0) {
- int index = (al - 1) & b;
- long offset = ((long)index << ASHIFT) + ABASE;
- t = (ForkJoinTask<?>)
- U.getObjectVolatile(a, offset);
- if (t != null && b++ == v.base) {
- if (j.currentJoin != subtask ||
- v.currentSteal != subtask ||
- subtask.status < 0)
- break descent; // stale
- if (U.compareAndSwapObject(a, offset, t, null)) {
- v.base = b;
- w.currentSteal = t;
- for (int top = w.top;;) {
- t.doExec(); // help
- w.currentSteal = ps;
- if (task.status < 0)
- break outer;
- if (w.top == top)
- break; // run local tasks
- if ((t = w.pop()) == null)
- break descent;
- w.currentSteal = t;
- }
+ else if ((md = mode) < 0) // shutting down
+ return;
+ else if ((rc = ((md & SMASK) + // possibly quiescent
+ (int)((c = ctl) >> RC_SHIFT))) <= 0 &&
+ (md & SHUTDOWN) != 0 &&
+ tryTerminate(false, false))
+ return; // help terminate
+ else if ((++steps & 1) == 0)
+ Thread.interrupted(); // clear between parks
+ else if (rc <= 0 && pred != 0 && phase == (int)c) {
+ long d = keepAlive + System.currentTimeMillis();
+ LockSupport.parkUntil(this, d);
+ if (ctl == c &&
+ d - System.currentTimeMillis() <= TIMEOUT_SLOP) {
+ long nc = ((UC_MASK & (c - TC_UNIT)) |
+ (SP_MASK & pred));
+ if (CTL.compareAndSet(this, c, nc)) {
+ w.phase = QUIET;
+ return; // drop on timeout
}
}
}
- if (t == null && b == v.base && b - v.top >= 0) {
- if ((subtask = next) == null) { // try to descend
- if (next == v.currentJoin &&
- oldSum == (oldSum = checkSum))
- break outer;
- break descent;
- }
- j = v;
- break;
- }
+ else
+ LockSupport.park(this);
}
}
}
@@ -2161,59 +1650,10 @@
}
/**
- * Tries to decrement active count (sometimes implicitly) and
- * possibly release or create a compensating worker in preparation
- * for blocking. Returns false (retryable by caller), on
- * contention, detected staleness, instability, or termination.
- *
- * @param w caller
- */
- private boolean tryCompensate(WorkQueue w) {
- boolean canBlock; int wl;
- long c = ctl;
- WorkQueue[] ws = workQueues;
- int pc = config & SMASK;
- int ac = pc + (int)(c >> AC_SHIFT);
- int tc = pc + (short)(c >> TC_SHIFT);
- if (w == null || w.qlock < 0 || pc == 0 || // terminating or disabled
- ws == null || (wl = ws.length) <= 0)
- canBlock = false;
- else {
- int m = wl - 1, sp;
- boolean busy = true; // validate ac
- for (int i = 0; i <= m; ++i) {
- int k; WorkQueue v;
- if ((k = (i << 1) | 1) <= m && k >= 0 && (v = ws[k]) != null &&
- v.scanState >= 0 && v.currentSteal == null) {
- busy = false;
- break;
- }
- }
- if (!busy || ctl != c)
- canBlock = false; // unstable or stale
- else if ((sp = (int)c) != 0) // release idle worker
- canBlock = tryRelease(c, ws[m & sp], 0L);
- else if (tc >= pc && ac > 1 && w.isEmpty()) {
- long nc = ((AC_MASK & (c - AC_UNIT)) |
- (~AC_MASK & c)); // uncompensated
- canBlock = U.compareAndSwapLong(this, CTL, c, nc);
- }
- else if (tc >= MAX_CAP ||
- (this == common && tc >= pc + COMMON_MAX_SPARES))
- throw new RejectedExecutionException(
- "Thread limit exceeded replacing blocked worker");
- else { // similar to tryAddWorker
- boolean isSpare = (tc >= pc);
- long nc = (AC_MASK & c) | (TC_MASK & (c + TC_UNIT));
- canBlock = (U.compareAndSwapLong(this, CTL, c, nc) &&
- createWorker(isSpare)); // throws on exception
- }
- }
- return canBlock;
- }
-
- /**
* Helps and/or blocks until the given task is done or timeout.
+ * First tries locally helping, then scans other queues for a task
+ * produced by one of w's stealers; compensating and blocking if
+ * none are found (rescanning if tryCompensate fails).
*
* @param w caller
* @param task the task
@@ -2222,61 +1662,166 @@
*/
final int awaitJoin(WorkQueue w, ForkJoinTask<?> task, long deadline) {
int s = 0;
- if (w != null) {
- ForkJoinTask<?> prevJoin = w.currentJoin;
- if (task != null && (s = task.status) >= 0) {
- w.currentJoin = task;
- CountedCompleter<?> cc = (task instanceof CountedCompleter) ?
- (CountedCompleter<?>)task : null;
- for (;;) {
- if (cc != null)
- helpComplete(w, cc, 0);
- else
- helpStealer(w, task);
- if ((s = task.status) < 0)
- break;
- long ms, ns;
+ if (w != null && task != null &&
+ (!(task instanceof CountedCompleter) ||
+ (s = w.localHelpCC((CountedCompleter<?>)task, 0)) >= 0)) {
+ w.tryRemoveAndExec(task);
+ int src = w.source, id = w.id;
+ s = task.status;
+ while (s >= 0) {
+ WorkQueue[] ws;
+ boolean nonempty = false;
+ int r = ThreadLocalRandom.nextSecondarySeed() | 1; // odd indices
+ if ((ws = workQueues) != null) { // scan for matching id
+ for (int n = ws.length, m = n - 1, j = -n; j < n; j += 2) {
+ WorkQueue q; int i, b, al; ForkJoinTask<?>[] a;
+ if ((i = (r + j) & m) >= 0 && i < n &&
+ (q = ws[i]) != null && q.source == id &&
+ (b = q.base) - q.top < 0 &&
+ (a = q.array) != null && (al = a.length) > 0) {
+ int qid = q.id;
+ int index = (al - 1) & b;
+ ForkJoinTask<?> t = (ForkJoinTask<?>)
+ QA.getAcquire(a, index);
+ if (t != null && b++ == q.base && id == q.source &&
+ QA.compareAndSet(a, index, t, null)) {
+ q.base = b;
+ w.source = qid;
+ t.doExec();
+ w.source = src;
+ }
+ nonempty = true;
+ break;
+ }
+ }
+ }
+ if ((s = task.status) < 0)
+ break;
+ else if (!nonempty) {
+ long ms, ns; int block;
if (deadline == 0L)
- ms = 0L;
+ ms = 0L; // untimed
else if ((ns = deadline - System.nanoTime()) <= 0L)
- break;
+ break; // timeout
else if ((ms = TimeUnit.NANOSECONDS.toMillis(ns)) <= 0L)
- ms = 1L;
- if (tryCompensate(w)) {
+ ms = 1L; // avoid 0 for timed wait
+ if ((block = tryCompensate(w)) != 0) {
task.internalWait(ms);
- U.getAndAddLong(this, CTL, AC_UNIT);
+ CTL.getAndAdd(this, (block > 0) ? RC_UNIT : 0L);
}
- if ((s = task.status) < 0)
- break;
+ s = task.status;
}
- w.currentJoin = prevJoin;
}
}
return s;
}
- // Specialized scanning
+ /**
+ * Runs tasks until {@code isQuiescent()}. Rather than blocking
+ * when tasks cannot be found, rescans until all others cannot
+ * find tasks either.
+ */
+ final void helpQuiescePool(WorkQueue w) {
+ int prevSrc = w.source, fifo = w.id & FIFO;
+ for (int source = prevSrc, released = -1;;) { // -1 until known
+ WorkQueue[] ws;
+ if (fifo != 0)
+ w.localPollAndExec(0);
+ else
+ w.localPopAndExec(0);
+ if (released == -1 && w.phase >= 0)
+ released = 1;
+ boolean quiet = true, empty = true;
+ int r = ThreadLocalRandom.nextSecondarySeed();
+ if ((ws = workQueues) != null) {
+ for (int n = ws.length, j = n, m = n - 1; j > 0; --j) {
+ WorkQueue q; int i, b, al; ForkJoinTask<?>[] a;
+ if ((i = (r - j) & m) >= 0 && i < n && (q = ws[i]) != null) {
+ if ((b = q.base) - q.top < 0 &&
+ (a = q.array) != null && (al = a.length) > 0) {
+ int qid = q.id;
+ if (released == 0) { // increment
+ released = 1;
+ CTL.getAndAdd(this, RC_UNIT);
+ }
+ int index = (al - 1) & b;
+ ForkJoinTask<?> t = (ForkJoinTask<?>)
+ QA.getAcquire(a, index);
+ if (t != null && b++ == q.base &&
+ QA.compareAndSet(a, index, t, null)) {
+ q.base = b;
+ w.source = source = q.id;
+ t.doExec();
+ w.source = source = prevSrc;
+ }
+ quiet = empty = false;
+ break;
+ }
+ else if ((q.source & QUIET) == 0)
+ quiet = false;
+ }
+ }
+ }
+ if (quiet) {
+ if (released == 0)
+ CTL.getAndAdd(this, RC_UNIT);
+ w.source = prevSrc;
+ break;
+ }
+ else if (empty) {
+ if (source != QUIET)
+ w.source = source = QUIET;
+ if (released == 1) { // decrement
+ released = 0;
+ CTL.getAndAdd(this, RC_MASK & -RC_UNIT);
+ }
+ }
+ }
+ }
/**
- * Returns a (probably) non-empty steal queue, if one is found
- * during a scan, else null. This method must be retried by
- * caller if, by the time it tries to use the queue, it is empty.
+ * Scans for and returns a polled task, if available.
+ * Used only for untracked polls.
+ *
+ * @param submissionsOnly if true, only scan submission queues
*/
- private WorkQueue findNonEmptyStealQueue() {
- WorkQueue[] ws; int wl; // one-shot version of scan loop
- int r = ThreadLocalRandom.nextSecondarySeed();
- if ((ws = workQueues) != null && (wl = ws.length) > 0) {
- int m = wl - 1, origin = r & m;
+ private ForkJoinTask<?> pollScan(boolean submissionsOnly) {
+ WorkQueue[] ws; int n;
+ rescan: while ((mode & STOP) == 0 && (ws = workQueues) != null &&
+ (n = ws.length) > 0) {
+ int m = n - 1;
+ int r = ThreadLocalRandom.nextSecondarySeed();
+ int h = r >>> 16;
+ int origin, step;
+ if (submissionsOnly) {
+ origin = (r & ~1) & m; // even indices and steps
+ step = (h & ~1) | 2;
+ }
+ else {
+ origin = r & m;
+ step = h | 1;
+ }
for (int k = origin, oldSum = 0, checkSum = 0;;) {
- WorkQueue q; int b;
+ WorkQueue q; int b, al; ForkJoinTask<?>[] a;
if ((q = ws[k]) != null) {
- if ((b = q.base) - q.top < 0)
- return q;
- checkSum += b;
+ checkSum += b = q.base;
+ if (b - q.top < 0 &&
+ (a = q.array) != null && (al = a.length) > 0) {
+ int index = (al - 1) & b;
+ ForkJoinTask<?> t = (ForkJoinTask<?>)
+ QA.getAcquire(a, index);
+ if (t != null && b++ == q.base &&
+ QA.compareAndSet(a, index, t, null)) {
+ q.base = b;
+ return t;
+ }
+ else
+ break; // restart
+ }
}
- if ((k = (k + 1) & m) == origin) {
+ if ((k = (k + step) & m) == origin) {
if (oldSum == (oldSum = checkSum))
- break;
+ break rescan;
checkSum = 0;
}
}
@@ -2285,58 +1830,160 @@
}
/**
- * Runs tasks until {@code isQuiescent()}. We piggyback on
- * active count ctl maintenance, but rather than blocking
- * when tasks cannot be found, we rescan until all others cannot
- * find tasks either.
- */
- final void helpQuiescePool(WorkQueue w) {
- ForkJoinTask<?> ps = w.currentSteal; // save context
- int wc = w.config;
- for (boolean active = true;;) {
- long c; WorkQueue q; ForkJoinTask<?> t;
- if (wc >= 0 && (t = w.pop()) != null) { // run locals if LIFO
- (w.currentSteal = t).doExec();
- w.currentSteal = ps;
- }
- else if ((q = findNonEmptyStealQueue()) != null) {
- if (!active) { // re-establish active count
- active = true;
- U.getAndAddLong(this, CTL, AC_UNIT);
- }
- if ((t = q.pollAt(q.base)) != null) {
- (w.currentSteal = t).doExec();
- w.currentSteal = ps;
- if (++w.nsteals < 0)
- w.transferStealCount(this);
- }
- }
- else if (active) { // decrement active count without queuing
- long nc = (AC_MASK & ((c = ctl) - AC_UNIT)) | (~AC_MASK & c);
- if (U.compareAndSwapLong(this, CTL, c, nc))
- active = false;
- }
- else if ((int)((c = ctl) >> AC_SHIFT) + (config & SMASK) <= 0 &&
- U.compareAndSwapLong(this, CTL, c, c + AC_UNIT))
- break;
- }
- }
-
- /**
* Gets and removes a local or stolen task for the given worker.
*
* @return a task, if available
*/
final ForkJoinTask<?> nextTaskFor(WorkQueue w) {
- for (ForkJoinTask<?> t;;) {
- WorkQueue q;
- if ((t = w.nextLocalTask()) != null)
- return t;
- if ((q = findNonEmptyStealQueue()) == null)
- return null;
- if ((t = q.pollAt(q.base)) != null)
- return t;
+ ForkJoinTask<?> t;
+ if (w != null &&
+ (t = (w.id & FIFO) != 0 ? w.poll() : w.pop()) != null)
+ return t;
+ else
+ return pollScan(false);
+ }
+
+ // External operations
+
+ /**
+ * Adds the given task to a submission queue at submitter's
+ * current queue, creating one if null or contended.
+ *
+ * @param task the task. Caller must ensure non-null.
+ */
+ final void externalPush(ForkJoinTask<?> task) {
+ int r; // initialize caller's probe
+ if ((r = ThreadLocalRandom.getProbe()) == 0) {
+ ThreadLocalRandom.localInit();
+ r = ThreadLocalRandom.getProbe();
}
+ for (;;) {
+ int md = mode, n;
+ WorkQueue[] ws = workQueues;
+ if ((md & SHUTDOWN) != 0 || ws == null || (n = ws.length) <= 0)
+ throw new RejectedExecutionException();
+ else {
+ WorkQueue q;
+ boolean push = false, grow = false;
+ if ((q = ws[(n - 1) & r & SQMASK]) == null) {
+ Object lock = workerNamePrefix;
+ int qid = (r | QUIET) & ~(FIFO | OWNED);
+ q = new WorkQueue(this, null);
+ q.id = qid;
+ q.source = QUIET;
+ q.phase = QLOCK; // lock queue
+ if (lock != null) {
+ synchronized (lock) { // lock pool to install
+ int i;
+ if ((ws = workQueues) != null &&
+ (n = ws.length) > 0 &&
+ ws[i = qid & (n - 1) & SQMASK] == null) {
+ ws[i] = q;
+ push = grow = true;
+ }
+ }
+ }
+ }
+ else if (q.tryLockSharedQueue()) {
+ int b = q.base, s = q.top, al, d; ForkJoinTask<?>[] a;
+ if ((a = q.array) != null && (al = a.length) > 0 &&
+ al - 1 + (d = b - s) > 0) {
+ a[(al - 1) & s] = task;
+ q.top = s + 1; // relaxed writes OK here
+ q.phase = 0;
+ if (d < 0 && q.base - s < -1)
+ break; // no signal needed
+ }
+ else
+ grow = true;
+ push = true;
+ }
+ if (push) {
+ if (grow) {
+ try {
+ q.growArray();
+ int s = q.top, al; ForkJoinTask<?>[] a;
+ if ((a = q.array) != null && (al = a.length) > 0) {
+ a[(al - 1) & s] = task;
+ q.top = s + 1;
+ }
+ } finally {
+ q.phase = 0;
+ }
+ }
+ signalWork();
+ break;
+ }
+ else // move if busy
+ r = ThreadLocalRandom.advanceProbe(r);
+ }
+ }
+ }
+
+ /**
+ * Pushes a possibly-external submission.
+ */
+ private <T> ForkJoinTask<T> externalSubmit(ForkJoinTask<T> task) {
+ Thread t; ForkJoinWorkerThread w; WorkQueue q;
+ if (task == null)
+ throw new NullPointerException();
+ if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) &&
+ (w = (ForkJoinWorkerThread)t).pool == this &&
+ (q = w.workQueue) != null)
+ q.push(task);
+ else
+ externalPush(task);
+ return task;
+ }
+
+ /**
+ * Returns common pool queue for an external thread.
+ */
+ static WorkQueue commonSubmitterQueue() {
+ ForkJoinPool p = common;
+ int r = ThreadLocalRandom.getProbe();
+ WorkQueue[] ws; int n;
+ return (p != null && (ws = p.workQueues) != null &&
+ (n = ws.length) > 0) ?
+ ws[(n - 1) & r & SQMASK] : null;
+ }
+
+ /**
+ * Performs tryUnpush for an external submitter.
+ */
+ final boolean tryExternalUnpush(ForkJoinTask<?> task) {
+ int r = ThreadLocalRandom.getProbe();
+ WorkQueue[] ws; WorkQueue w; int n;
+ return ((ws = workQueues) != null &&
+ (n = ws.length) > 0 &&
+ (w = ws[(n - 1) & r & SQMASK]) != null &&
+ w.trySharedUnpush(task));
+ }
+
+ /**
+ * Performs helpComplete for an external submitter.
+ */
+ final int externalHelpComplete(CountedCompleter<?> task, int maxTasks) {
+ int r = ThreadLocalRandom.getProbe();
+ WorkQueue[] ws; WorkQueue w; int n;
+ return ((ws = workQueues) != null && (n = ws.length) > 0 &&
+ (w = ws[(n - 1) & r & SQMASK]) != null) ?
+ w.sharedHelpCC(task, maxTasks) : 0;
+ }
+
+ /**
+ * Tries to steal and run tasks within the target's computation.
+ * The maxTasks argument supports external usages; internal calls
+ * use zero, allowing unbounded steps (external calls trap
+ * non-positive values).
+ *
+ * @param w caller
+ * @param maxTasks if non-zero, the maximum number of other tasks to run
+ * @return task status on exit
+ */
+ final int helpComplete(WorkQueue w, CountedCompleter<?> task,
+ int maxTasks) {
+ return (w == null) ? 0 : w.localHelpCC(task, maxTasks);
}
/**
@@ -2383,10 +2030,12 @@
*/
static int getSurplusQueuedTaskCount() {
Thread t; ForkJoinWorkerThread wt; ForkJoinPool pool; WorkQueue q;
- if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
- int p = (pool = (wt = (ForkJoinWorkerThread)t).pool).config & SMASK;
- int n = (q = wt.workQueue).top - q.base;
- int a = (int)(pool.ctl >> AC_SHIFT) + p;
+ if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) &&
+ (pool = (wt = (ForkJoinWorkerThread)t).pool) != null &&
+ (q = wt.workQueue) != null) {
+ int p = pool.mode & SMASK;
+ int a = p + (int)(pool.ctl >> RC_SHIFT);
+ int n = q.top - q.base;
return n - (a > (p >>>= 1) ? 0 :
a > (p >>>= 1) ? 1 :
a > (p >>>= 1) ? 2 :
@@ -2396,7 +2045,7 @@
return 0;
}
- // Termination
+ // Termination
/**
* Possibly initiates and/or completes termination.
@@ -2404,198 +2053,86 @@
* @param now if true, unconditionally terminate, else only
* if no work and no active workers
* @param enable if true, terminate when next possible
- * @return -1: terminating/terminated, 0: retry if internal caller, else 1
+ * @return true if terminating or terminated
*/
- private int tryTerminate(boolean now, boolean enable) {
- int rs; // 3 phases: try to set SHUTDOWN, then STOP, then TERMINATED
+ private boolean tryTerminate(boolean now, boolean enable) {
+ int md; // 3 phases: try to set SHUTDOWN, then STOP, then TERMINATED
- while ((rs = runState) >= 0) {
+ while (((md = mode) & SHUTDOWN) == 0) {
if (!enable || this == common) // cannot shutdown
- return 1;
- else if (rs == 0)
- tryInitialize(false); // ensure initialized
+ return false;
else
- U.compareAndSwapInt(this, RUNSTATE, rs, rs | SHUTDOWN);
+ MODE.compareAndSet(this, md, md | SHUTDOWN);
}
- if ((rs & STOP) == 0) { // try to initiate termination
- if (!now) { // check quiescence
+ while (((md = mode) & STOP) == 0) { // try to initiate termination
+ if (!now) { // check if quiescent & empty
for (long oldSum = 0L;;) { // repeat until stable
- WorkQueue[] ws; WorkQueue w; int b;
+ boolean running = false;
long checkSum = ctl;
- if ((int)(checkSum >> AC_SHIFT) + (config & SMASK) > 0)
- return 0; // still active workers
- if ((ws = workQueues) != null) {
+ WorkQueue[] ws = workQueues;
+ if ((md & SMASK) + (int)(checkSum >> RC_SHIFT) > 0)
+ running = true;
+ else if (ws != null) {
+ WorkQueue w; int b;
for (int i = 0; i < ws.length; ++i) {
if ((w = ws[i]) != null) {
- checkSum += (b = w.base);
- if (w.currentSteal != null || b != w.top)
- return 0; // retry if internal caller
+ checkSum += (b = w.base) + w.id;
+ if (b != w.top ||
+ ((i & 1) == 1 && w.source >= 0)) {
+ running = true;
+ break;
+ }
}
}
}
- if (oldSum == (oldSum = checkSum))
+ if (((md = mode) & STOP) != 0)
+ break; // already triggered
+ else if (running)
+ return false;
+ else if (workQueues == ws && oldSum == (oldSum = checkSum))
break;
}
}
- do {} while (!U.compareAndSwapInt(this, RUNSTATE,
- rs = runState, rs | STOP));
+ if ((md & STOP) == 0)
+ MODE.compareAndSet(this, md, md | STOP);
}
- for (long oldSum = 0L;;) { // repeat until stable
- WorkQueue[] ws; WorkQueue w; ForkJoinWorkerThread wt;
- long checkSum = ctl;
- if ((ws = workQueues) != null) { // help terminate others
- for (int i = 0; i < ws.length; ++i) {
- if ((w = ws[i]) != null) {
- w.cancelAll(); // clear queues
- checkSum += w.base;
- if (w.qlock >= 0) {
- w.qlock = -1; // racy set OK
- if ((wt = w.owner) != null) {
+ while (((md = mode) & TERMINATED) == 0) { // help terminate others
+ for (long oldSum = 0L;;) { // repeat until stable
+ WorkQueue[] ws; WorkQueue w;
+ long checkSum = ctl;
+ if ((ws = workQueues) != null) {
+ for (int i = 0; i < ws.length; ++i) {
+ if ((w = ws[i]) != null) {
+ ForkJoinWorkerThread wt = w.owner;
+ w.cancelAll(); // clear queues
+ if (wt != null) {
try { // unblock join or park
wt.interrupt();
} catch (Throwable ignore) {
}
}
+ checkSum += w.base + w.id;
}
}
}
- }
- if (oldSum == (oldSum = checkSum))
- break;
- }
-
- if ((short)(ctl >>> TC_SHIFT) + (config & SMASK) <= 0) {
- runState = (STARTED | SHUTDOWN | STOP | TERMINATED); // final write
- synchronized (this) {
- notifyAll(); // for awaitTermination
+ if (((md = mode) & TERMINATED) != 0 ||
+ (workQueues == ws && oldSum == (oldSum = checkSum)))
+ break;
}
- }
-
- return -1;
- }
-
- // External operations
-
- /**
- * Constructs and tries to install a new external queue,
- * failing if the workQueues array already has a queue at
- * the given index.
- *
- * @param index the index of the new queue
- */
- private void tryCreateExternalQueue(int index) {
- AuxState aux;
- if ((aux = auxState) != null && index >= 0) {
- WorkQueue q = new WorkQueue(this, null);
- q.config = index;
- q.scanState = ~UNSIGNALLED;
- q.qlock = 1; // lock queue
- boolean installed = false;
- aux.lock();
- try { // lock pool to install
- WorkQueue[] ws;
- if ((ws = workQueues) != null && index < ws.length &&
- ws[index] == null) {
- ws[index] = q; // else throw away
- installed = true;
+ if ((md & TERMINATED) != 0)
+ break;
+ else if ((md & SMASK) + (short)(ctl >>> TC_SHIFT) > 0)
+ break;
+ else if (MODE.compareAndSet(this, md, md | TERMINATED)) {
+ synchronized (this) {
+ notifyAll(); // for awaitTermination
}
- } finally {
- aux.unlock();
- }
- if (installed) {
- try {
- q.growArray();
- } finally {
- q.qlock = 0;
- }
+ break;
}
}
- }
-
- /**
- * Adds the given task to a submission queue at submitter's
- * current queue. Also performs secondary initialization upon the
- * first submission of the first task to the pool, and detects
- * first submission by an external thread and creates a new shared
- * queue if the one at index if empty or contended.
- *
- * @param task the task. Caller must ensure non-null.
- */
- final void externalPush(ForkJoinTask<?> task) {
- int r; // initialize caller's probe
- if ((r = ThreadLocalRandom.getProbe()) == 0) {
- ThreadLocalRandom.localInit();
- r = ThreadLocalRandom.getProbe();
- }
- for (;;) {
- WorkQueue q; int wl, k, stat;
- int rs = runState;
- WorkQueue[] ws = workQueues;
- if (rs <= 0 || ws == null || (wl = ws.length) <= 0)
- tryInitialize(true);
- else if ((q = ws[k = (wl - 1) & r & SQMASK]) == null)
- tryCreateExternalQueue(k);
- else if ((stat = q.sharedPush(task)) < 0)
- break;
- else if (stat == 0) {
- signalWork();
- break;
- }
- else // move if busy
- r = ThreadLocalRandom.advanceProbe(r);
- }
- }
-
- /**
- * Pushes a possibly-external submission.
- */
- private <T> ForkJoinTask<T> externalSubmit(ForkJoinTask<T> task) {
- Thread t; ForkJoinWorkerThread w; WorkQueue q;
- if (task == null)
- throw new NullPointerException();
- if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) &&
- (w = (ForkJoinWorkerThread)t).pool == this &&
- (q = w.workQueue) != null)
- q.push(task);
- else
- externalPush(task);
- return task;
- }
-
- /**
- * Returns common pool queue for an external thread.
- */
- static WorkQueue commonSubmitterQueue() {
- ForkJoinPool p = common;
- int r = ThreadLocalRandom.getProbe();
- WorkQueue[] ws; int wl;
- return (p != null && (ws = p.workQueues) != null &&
- (wl = ws.length) > 0) ?
- ws[(wl - 1) & r & SQMASK] : null;
- }
-
- /**
- * Performs tryUnpush for an external submitter.
- */
- final boolean tryExternalUnpush(ForkJoinTask<?> task) {
- int r = ThreadLocalRandom.getProbe();
- WorkQueue[] ws; WorkQueue w; int wl;
- return ((ws = workQueues) != null &&
- (wl = ws.length) > 0 &&
- (w = ws[(wl - 1) & r & SQMASK]) != null &&
- w.trySharedUnpush(task));
- }
-
- /**
- * Performs helpComplete for an external submitter.
- */
- final int externalHelpComplete(CountedCompleter<?> task, int maxTasks) {
- WorkQueue[] ws; int wl;
- int r = ThreadLocalRandom.getProbe();
- return ((ws = workQueues) != null && (wl = ws.length) > 0) ?
- helpComplete(ws[(wl - 1) & r & SQMASK], task, maxTasks) : 0;
+ return true;
}
// Exported methods
@@ -2604,9 +2141,10 @@
/**
* Creates a {@code ForkJoinPool} with parallelism equal to {@link
- * java.lang.Runtime#availableProcessors}, using the {@linkplain
- * #defaultForkJoinWorkerThreadFactory default thread factory},
- * no UncaughtExceptionHandler, and non-async LIFO processing mode.
+ * java.lang.Runtime#availableProcessors}, using defaults for all
+ * other parameters (see {@link #ForkJoinPool(int,
+ * ForkJoinWorkerThreadFactory, UncaughtExceptionHandler, boolean,
+ * int, int, int, Predicate, long, TimeUnit)}).
*
* @throws SecurityException if a security manager exists and
* the caller is not permitted to modify threads
@@ -2615,14 +2153,16 @@
*/
public ForkJoinPool() {
this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
- defaultForkJoinWorkerThreadFactory, null, false);
+ defaultForkJoinWorkerThreadFactory, null, false,
+ 0, MAX_CAP, 1, null, DEFAULT_KEEPALIVE, TimeUnit.MILLISECONDS);
}
/**
* Creates a {@code ForkJoinPool} with the indicated parallelism
- * level, the {@linkplain
- * #defaultForkJoinWorkerThreadFactory default thread factory},
- * no UncaughtExceptionHandler, and non-async LIFO processing mode.
+ * level, using defaults for all other parameters (see {@link
+ * #ForkJoinPool(int, ForkJoinWorkerThreadFactory,
+ * UncaughtExceptionHandler, boolean, int, int, int, Predicate,
+ * long, TimeUnit)}).
*
* @param parallelism the parallelism level
* @throws IllegalArgumentException if parallelism less than or
@@ -2633,11 +2173,15 @@
* java.lang.RuntimePermission}{@code ("modifyThread")}
*/
public ForkJoinPool(int parallelism) {
- this(parallelism, defaultForkJoinWorkerThreadFactory, null, false);
+ this(parallelism, defaultForkJoinWorkerThreadFactory, null, false,
+ 0, MAX_CAP, 1, null, DEFAULT_KEEPALIVE, TimeUnit.MILLISECONDS);
}
/**
- * Creates a {@code ForkJoinPool} with the given parameters.
+ * Creates a {@code ForkJoinPool} with the given parameters (using
+ * defaults for others -- see {@link #ForkJoinPool(int,
+ * ForkJoinWorkerThreadFactory, UncaughtExceptionHandler, boolean,
+ * int, int, int, Predicate, long, TimeUnit)}).
*
* @param parallelism the parallelism level. For default value,
* use {@link java.lang.Runtime#availableProcessors}.
@@ -2664,43 +2208,185 @@
ForkJoinWorkerThreadFactory factory,
UncaughtExceptionHandler handler,
boolean asyncMode) {
- this(checkParallelism(parallelism),
- checkFactory(factory),
- handler,
- asyncMode ? FIFO_QUEUE : LIFO_QUEUE,
- "ForkJoinPool-" + nextPoolId() + "-worker-");
+ this(parallelism, factory, handler, asyncMode,
+ 0, MAX_CAP, 1, null, DEFAULT_KEEPALIVE, TimeUnit.MILLISECONDS);
+ }
+
+ /**
+ * Creates a {@code ForkJoinPool} with the given parameters.
+ *
+ * @param parallelism the parallelism level. For default value,
+ * use {@link java.lang.Runtime#availableProcessors}.
+ *
+ * @param factory the factory for creating new threads. For
+ * default value, use {@link #defaultForkJoinWorkerThreadFactory}.
+ *
+ * @param handler the handler for internal worker threads that
+ * terminate due to unrecoverable errors encountered while
+ * executing tasks. For default value, use {@code null}.
+ *
+ * @param asyncMode if true, establishes local first-in-first-out
+ * scheduling mode for forked tasks that are never joined. This
+ * mode may be more appropriate than default locally stack-based
+ * mode in applications in which worker threads only process
+ * event-style asynchronous tasks. For default value, use {@code
+ * false}.
+ *
+ * @param corePoolSize the number of threads to keep in the pool
+ * (unless timed out after an elapsed keep-alive). Normally (and
+ * by default) this is the same value as the parallelism level,
+ * but may be set to a larger value to reduce dynamic overhead if
+ * tasks regularly block. Using a smaller value (for example
+ * {@code 0}) has the same effect as the default.
+ *
+ * @param maximumPoolSize the maximum number of threads allowed.
+ * When the maximum is reached, attempts to replace blocked
+ * threads fail. (However, because creation and termination of
+ * different threads may overlap, and may be managed by the given
+ * thread factory, this value may be transiently exceeded.) To
+ * arrange the same value as is used by default for the common
+ * pool, use {@code 256} plus the {@code parallelism} level. (By
+ * default, the common pool allows a maximum of 256 spare
+ * threads.) Using a value (for example {@code
+ * Integer.MAX_VALUE}) larger than the implementation's total
+ * thread limit has the same effect as using this limit (which is
+ * the default).
+ *
+ * @param minimumRunnable the minimum allowed number of core
+ * threads not blocked by a join or {@link ManagedBlocker}. To
+ * ensure progress, when too few unblocked threads exist and
+ * unexecuted tasks may exist, new threads are constructed, up to
+ * the given maximumPoolSize. For the default value, use {@code
+ * 1}, that ensures liveness. A larger value might improve
+ * throughput in the presence of blocked activities, but might
+ * not, due to increased overhead. A value of zero may be
+ * acceptable when submitted tasks cannot have dependencies
+ * requiring additional threads.
+ *
+ * @param saturate if non-null, a predicate invoked upon attempts
+ * to create more than the maximum total allowed threads. By
+ * default, when a thread is about to block on a join or {@link
+ * ManagedBlocker}, but cannot be replaced because the
+ * maximumPoolSize would be exceeded, a {@link
+ * RejectedExecutionException} is thrown. But if this predicate
+ * returns {@code true}, then no exception is thrown, so the pool
+ * continues to operate with fewer than the target number of
+ * runnable threads, which might not ensure progress.
+ *
+ * @param keepAliveTime the elapsed time since last use before
+ * a thread is terminated (and then later replaced if needed).
+ * For the default value, use {@code 60, TimeUnit.SECONDS}.
+ *
+ * @param unit the time unit for the {@code keepAliveTime} argument
+ *
+ * @throws IllegalArgumentException if parallelism is less than or
+ * equal to zero, or is greater than implementation limit,
+ * or if maximumPoolSize is less than parallelism,
+ * of if the keepAliveTime is less than or equal to zero.
+ * @throws NullPointerException if the factory is null
+ * @throws SecurityException if a security manager exists and
+ * the caller is not permitted to modify threads
+ * because it does not hold {@link
+ * java.lang.RuntimePermission}{@code ("modifyThread")}
+ * @since 9
+ */
+ public ForkJoinPool(int parallelism,
+ ForkJoinWorkerThreadFactory factory,
+ UncaughtExceptionHandler handler,
+ boolean asyncMode,
+ int corePoolSize,
+ int maximumPoolSize,
+ int minimumRunnable,
+ Predicate<? super ForkJoinPool> saturate,
+ long keepAliveTime,
+ TimeUnit unit) {
+ // check, encode, pack parameters
+ if (parallelism <= 0 || parallelism > MAX_CAP ||
+ maximumPoolSize < parallelism || keepAliveTime <= 0L)
+ throw new IllegalArgumentException();
+ if (factory == null)
+ throw new NullPointerException();
+ long ms = Math.max(unit.toMillis(keepAliveTime), TIMEOUT_SLOP);
+
+ String prefix = "ForkJoinPool-" + nextPoolId() + "-worker-";
+ int corep = Math.min(Math.max(corePoolSize, parallelism), MAX_CAP);
+ long c = ((((long)(-corep) << TC_SHIFT) & TC_MASK) |
+ (((long)(-parallelism) << RC_SHIFT) & RC_MASK));
+ int m = parallelism | (asyncMode ? FIFO : 0);
+ int maxSpares = Math.min(maximumPoolSize, MAX_CAP) - parallelism;
+ int minAvail = Math.min(Math.max(minimumRunnable, 0), MAX_CAP);
+ int b = ((minAvail - parallelism) & SMASK) | (maxSpares << SWIDTH);
+ int n = (parallelism > 1) ? parallelism - 1 : 1; // at least 2 slots
+ n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
+ n = (n + 1) << 1; // power of two, including space for submission queues
+
+ this.workQueues = new WorkQueue[n];
+ this.workerNamePrefix = prefix;
+ this.factory = factory;
+ this.ueh = handler;
+ this.saturate = saturate;
+ this.keepAlive = ms;
+ this.bounds = b;
+ this.mode = m;
+ this.ctl = c;
checkPermission();
}
- private static int checkParallelism(int parallelism) {
- if (parallelism <= 0 || parallelism > MAX_CAP)
- throw new IllegalArgumentException();
- return parallelism;
- }
-
- private static ForkJoinWorkerThreadFactory checkFactory
- (ForkJoinWorkerThreadFactory factory) {
- if (factory == null)
- throw new NullPointerException();
- return factory;
- }
+ /**
+ * Constructor for common pool using parameters possibly
+ * overridden by system properties
+ */
+ @SuppressWarnings("deprecation") // Class.newInstance
+ private ForkJoinPool(byte forCommonPoolOnly) {
+ int parallelism = -1;
+ ForkJoinWorkerThreadFactory fac = null;
+ UncaughtExceptionHandler handler = null;
+ try { // ignore exceptions in accessing/parsing properties
+ String pp = System.getProperty
+ ("java.util.concurrent.ForkJoinPool.common.parallelism");
+ String fp = System.getProperty
+ ("java.util.concurrent.ForkJoinPool.common.threadFactory");
+ String hp = System.getProperty
+ ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
+ if (pp != null)
+ parallelism = Integer.parseInt(pp);
+ if (fp != null)
+ fac = ((ForkJoinWorkerThreadFactory)ClassLoader.
+ getSystemClassLoader().loadClass(fp).newInstance());
+ if (hp != null)
+ handler = ((UncaughtExceptionHandler)ClassLoader.
+ getSystemClassLoader().loadClass(hp).newInstance());
+ } catch (Exception ignore) {
+ }
- /**
- * Creates a {@code ForkJoinPool} with the given parameters, without
- * any security checks or parameter validation. Invoked directly by
- * makeCommonPool.
- */
- private ForkJoinPool(int parallelism,
- ForkJoinWorkerThreadFactory factory,
- UncaughtExceptionHandler handler,
- int mode,
- String workerNamePrefix) {
- this.workerNamePrefix = workerNamePrefix;
- this.factory = factory;
+ if (fac == null) {
+ if (System.getSecurityManager() == null)
+ fac = defaultForkJoinWorkerThreadFactory;
+ else // use security-managed default
+ fac = new InnocuousForkJoinWorkerThreadFactory();
+ }
+ if (parallelism < 0 && // default 1 less than #cores
+ (parallelism = Runtime.getRuntime().availableProcessors() - 1) <= 0)
+ parallelism = 1;
+ if (parallelism > MAX_CAP)
+ parallelism = MAX_CAP;
+
+ long c = ((((long)(-parallelism) << TC_SHIFT) & TC_MASK) |
+ (((long)(-parallelism) << RC_SHIFT) & RC_MASK));
+ int b = ((1 - parallelism) & SMASK) | (COMMON_MAX_SPARES << SWIDTH);
+ int n = (parallelism > 1) ? parallelism - 1 : 1;
+ n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
+ n = (n + 1) << 1;
+
+ this.workQueues = new WorkQueue[n];
+ this.workerNamePrefix = "ForkJoinPool.commonPool-worker-";
+ this.factory = fac;
this.ueh = handler;
- this.config = (parallelism & SMASK) | mode;
- long np = (long)(-parallelism); // offset ctl counts
- this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
+ this.saturate = null;
+ this.keepAlive = DEFAULT_KEEPALIVE;
+ this.bounds = b;
+ this.mode = parallelism;
+ this.ctl = c;
}
/**
@@ -2876,8 +2562,8 @@
* @return the targeted parallelism level of this pool
*/
public int getParallelism() {
- int par;
- return ((par = config & SMASK) > 0) ? par : 1;
+ int par = mode & SMASK;
+ return (par > 0) ? par : 1;
}
/**
@@ -2899,7 +2585,7 @@
* @return the number of worker threads
*/
public int getPoolSize() {
- return (config & SMASK) + (short)(ctl >>> TC_SHIFT);
+ return ((mode & SMASK) + (short)(ctl >>> TC_SHIFT));
}
/**
@@ -2909,7 +2595,7 @@
* @return {@code true} if this pool uses async mode
*/
public boolean getAsyncMode() {
- return (config & FIFO_QUEUE) != 0;
+ return (mode & FIFO) != 0;
}
/**
@@ -2940,7 +2626,7 @@
* @return the number of active threads
*/
public int getActiveThreadCount() {
- int r = (config & SMASK) + (int)(ctl >> AC_SHIFT);
+ int r = (mode & SMASK) + (int)(ctl >> RC_SHIFT);
return (r <= 0) ? 0 : r; // suppress momentarily negative values
}
@@ -2956,7 +2642,30 @@
* @return {@code true} if all threads are currently idle
*/
public boolean isQuiescent() {
- return (config & SMASK) + (int)(ctl >> AC_SHIFT) <= 0;
+ for (;;) {
+ long c = ctl;
+ int md = mode, pc = md & SMASK;
+ int tc = pc + (short)(c >>> TC_SHIFT);
+ int rc = pc + (int)(c >> RC_SHIFT);
+ if ((md & (STOP | TERMINATED)) != 0)
+ return true;
+ else if (rc > 0)
+ return false;
+ else {
+ WorkQueue[] ws; WorkQueue v;
+ if ((ws = workQueues) != null) {
+ for (int i = 1; i < ws.length; i += 2) {
+ if ((v = ws[i]) != null) {
+ if ((v.source & QUIET) == 0)
+ return false;
+ --tc;
+ }
+ }
+ }
+ if (tc == 0 && ctl == c)
+ return true;
+ }
+ }
}
/**
@@ -2971,13 +2680,12 @@
* @return the number of steals
*/
public long getStealCount() {
- AuxState sc = auxState;
- long count = (sc == null) ? 0L : sc.stealCount;
+ long count = stealCount;
WorkQueue[] ws; WorkQueue w;
if ((ws = workQueues) != null) {
for (int i = 1; i < ws.length; i += 2) {
if ((w = ws[i]) != null)
- count += w.nsteals;
+ count += (long)w.nsteals & 0xffffffffL;
}
}
return count;
@@ -3049,15 +2757,7 @@
* @return the next submission, or {@code null} if none
*/
protected ForkJoinTask<?> pollSubmission() {
- WorkQueue[] ws; int wl; WorkQueue w; ForkJoinTask<?> t;
- int r = ThreadLocalRandom.nextSecondarySeed();
- if ((ws = workQueues) != null && (wl = ws.length) > 0) {
- for (int m = wl - 1, i = 0; i < wl; ++i) {
- if ((w = ws[(i << 1) & m]) != null && (t = w.poll()) != null)
- return t;
- }
- }
- return null;
+ return pollScan(true);
}
/**
@@ -3103,9 +2803,7 @@
public String toString() {
// Use a single pass through workQueues to collect counts
long qt = 0L, qs = 0L; int rc = 0;
- AuxState sc = auxState;
- long st = (sc == null) ? 0L : sc.stealCount;
- long c = ctl;
+ long st = stealCount;
WorkQueue[] ws; WorkQueue w;
if ((ws = workQueues) != null) {
for (int i = 0; i < ws.length; ++i) {
@@ -3115,22 +2813,24 @@
qs += size;
else {
qt += size;
- st += w.nsteals;
+ st += (long)w.nsteals & 0xffffffffL;
if (w.isApparentlyUnblocked())
++rc;
}
}
}
}
- int pc = (config & SMASK);
+
+ int md = mode;
+ int pc = (md & SMASK);
+ long c = ctl;
int tc = pc + (short)(c >>> TC_SHIFT);
- int ac = pc + (int)(c >> AC_SHIFT);
+ int ac = pc + (int)(c >> RC_SHIFT);
if (ac < 0) // ignore transient negative
ac = 0;
- int rs = runState;
- String level = ((rs & TERMINATED) != 0 ? "Terminated" :
- (rs & STOP) != 0 ? "Terminating" :
- (rs & SHUTDOWN) != 0 ? "Shutting down" :
+ String level = ((md & TERMINATED) != 0 ? "Terminated" :
+ (md & STOP) != 0 ? "Terminating" :
+ (md & SHUTDOWN) != 0 ? "Shutting down" :
"Running");
return super.toString() +
"[" + level +
@@ -3193,7 +2893,7 @@
* @return {@code true} if all tasks have completed following shut down
*/
public boolean isTerminated() {
- return (runState & TERMINATED) != 0;
+ return (mode & TERMINATED) != 0;
}
/**
@@ -3210,8 +2910,8 @@
* @return {@code true} if terminating but not yet terminated
*/
public boolean isTerminating() {
- int rs = runState;
- return (rs & STOP) != 0 && (rs & TERMINATED) == 0;
+ int md = mode;
+ return (md & STOP) != 0 && (md & TERMINATED) == 0;
}
/**
@@ -3220,7 +2920,7 @@
* @return {@code true} if this pool has been shut down
*/
public boolean isShutdown() {
- return (runState & SHUTDOWN) != 0;
+ return (mode & SHUTDOWN) != 0;
}
/**
@@ -3284,30 +2984,19 @@
helpQuiescePool(wt.workQueue);
return true;
}
- long startTime = System.nanoTime();
- WorkQueue[] ws;
- int r = 0, wl;
- boolean found = true;
- while (!isQuiescent() && (ws = workQueues) != null &&
- (wl = ws.length) > 0) {
- if (!found) {
- if ((System.nanoTime() - startTime) > nanos)
+ else {
+ for (long startTime = System.nanoTime();;) {
+ ForkJoinTask<?> t;
+ if ((t = pollScan(false)) != null)
+ t.doExec();
+ else if (isQuiescent())
+ return true;
+ else if ((System.nanoTime() - startTime) > nanos)
return false;
- Thread.yield(); // cannot block
- }
- found = false;
- for (int m = wl - 1, j = (m + 1) << 2; j >= 0; --j) {
- ForkJoinTask<?> t; WorkQueue q; int b, k;
- if ((k = r++ & m) <= m && k >= 0 && (q = ws[k]) != null &&
- (b = q.base) - q.top < 0) {
- found = true;
- if ((t = q.pollAt(b)) != null)
- t.doExec();
- break;
- }
+ else
+ Thread.yield(); // cannot block
}
}
- return true;
}
/**
@@ -3422,17 +3111,19 @@
throws InterruptedException {
ForkJoinPool p;
ForkJoinWorkerThread wt;
+ WorkQueue w;
Thread t = Thread.currentThread();
if ((t instanceof ForkJoinWorkerThread) &&
- (p = (wt = (ForkJoinWorkerThread)t).pool) != null) {
- WorkQueue w = wt.workQueue;
+ (p = (wt = (ForkJoinWorkerThread)t).pool) != null &&
+ (w = wt.workQueue) != null) {
+ int block;
while (!blocker.isReleasable()) {
- if (p.tryCompensate(w)) {
+ if ((block = p.tryCompensate(w)) != 0) {
try {
do {} while (!blocker.isReleasable() &&
!blocker.block());
} finally {
- U.getAndAddLong(p, CTL, AC_UNIT);
+ CTL.getAndAdd(p, (block > 0) ? RC_UNIT : 0L);
}
break;
}
@@ -3444,6 +3135,55 @@
}
}
+ /**
+ * If the given executor is a ForkJoinPool, poll and execute
+ * AsynchronousCompletionTasks from worker's queue until none are
+ * available or blocker is released.
+ */
+ static void helpAsyncBlocker(Executor e, ManagedBlocker blocker) {
+ if (blocker != null && (e instanceof ForkJoinPool)) {
+ WorkQueue w; ForkJoinWorkerThread wt; WorkQueue[] ws; int r, n;
+ ForkJoinPool p = (ForkJoinPool)e;
+ Thread thread = Thread.currentThread();
+ if (thread instanceof ForkJoinWorkerThread &&
+ (wt = (ForkJoinWorkerThread)thread).pool == p)
+ w = wt.workQueue;
+ else if ((r = ThreadLocalRandom.getProbe()) != 0 &&
+ (ws = p.workQueues) != null && (n = ws.length) > 0)
+ w = ws[(n - 1) & r & SQMASK];
+ else
+ w = null;
+ if (w != null) {
+ for (;;) {
+ int b = w.base, s = w.top, d, al; ForkJoinTask<?>[] a;
+ if ((a = w.array) != null && (d = b - s) < 0 &&
+ (al = a.length) > 0) {
+ int index = (al - 1) & b;
+ ForkJoinTask<?> t = (ForkJoinTask<?>)
+ QA.getAcquire(a, index);
+ if (blocker.isReleasable())
+ break;
+ else if (b++ == w.base) {
+ if (t == null) {
+ if (d == -1)
+ break;
+ }
+ else if (!(t instanceof CompletableFuture.
+ AsynchronousCompletionTask))
+ break;
+ else if (QA.compareAndSet(a, index, t, null)) {
+ w.base = b;
+ t.doExec();
+ }
+ }
+ }
+ else
+ break;
+ }
+ }
+ }
+ }
+
// AbstractExecutorService overrides. These rely on undocumented
// fact that ForkJoinTask.adapt returns ForkJoinTasks that also
// implement RunnableFuture.
@@ -3456,24 +3196,17 @@
return new ForkJoinTask.AdaptedCallable<T>(callable);
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long CTL;
- private static final long RUNSTATE;
- private static final int ABASE;
- private static final int ASHIFT;
+ // VarHandle mechanics
+ private static final VarHandle CTL;
+ private static final VarHandle MODE;
+ private static final VarHandle QA;
static {
try {
- CTL = U.objectFieldOffset
- (ForkJoinPool.class.getDeclaredField("ctl"));
- RUNSTATE = U.objectFieldOffset
- (ForkJoinPool.class.getDeclaredField("runState"));
- ABASE = U.arrayBaseOffset(ForkJoinTask[].class);
- int scale = U.arrayIndexScale(ForkJoinTask[].class);
- if ((scale & (scale - 1)) != 0)
- throw new Error("array index scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ CTL = l.findVarHandle(ForkJoinPool.class, "ctl", long.class);
+ MODE = l.findVarHandle(ForkJoinPool.class, "mode", int.class);
+ QA = MethodHandles.arrayElementVarHandle(ForkJoinTask[].class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -3497,51 +3230,10 @@
common = java.security.AccessController.doPrivileged
(new java.security.PrivilegedAction<ForkJoinPool>() {
- public ForkJoinPool run() { return makeCommonPool(); }});
-
- // report 1 even if threads disabled
- COMMON_PARALLELISM = Math.max(common.config & SMASK, 1);
- }
+ public ForkJoinPool run() {
+ return new ForkJoinPool((byte)0); }});
- /**
- * Creates and returns the common pool, respecting user settings
- * specified via system properties.
- */
- @SuppressWarnings("deprecation") // Class.newInstance
- static ForkJoinPool makeCommonPool() {
- int parallelism = -1;
- ForkJoinWorkerThreadFactory factory = null;
- UncaughtExceptionHandler handler = null;
- try { // ignore exceptions in accessing/parsing properties
- String pp = System.getProperty
- ("java.util.concurrent.ForkJoinPool.common.parallelism");
- String fp = System.getProperty
- ("java.util.concurrent.ForkJoinPool.common.threadFactory");
- String hp = System.getProperty
- ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
- if (pp != null)
- parallelism = Integer.parseInt(pp);
- if (fp != null)
- factory = ((ForkJoinWorkerThreadFactory)ClassLoader.
- getSystemClassLoader().loadClass(fp).newInstance());
- if (hp != null)
- handler = ((UncaughtExceptionHandler)ClassLoader.
- getSystemClassLoader().loadClass(hp).newInstance());
- } catch (Exception ignore) {
- }
- if (factory == null) {
- if (System.getSecurityManager() == null)
- factory = defaultForkJoinWorkerThreadFactory;
- else // use security-managed default
- factory = new InnocuousForkJoinWorkerThreadFactory();
- }
- if (parallelism < 0 && // default 1 less than #cores
- (parallelism = Runtime.getRuntime().availableProcessors() - 1) <= 0)
- parallelism = 1;
- if (parallelism > MAX_CAP)
- parallelism = MAX_CAP;
- return new ForkJoinPool(parallelism, factory, handler, LIFO_QUEUE,
- "ForkJoinPool.commonPool-worker-");
+ COMMON_PARALLELISM = Math.max(common.mode & SMASK, 1);
}
/**
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java Thu Jul 21 17:13:23 2016 +0000
@@ -36,6 +36,8 @@
package java.util.concurrent;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
@@ -92,7 +94,7 @@
* encountering the exception; minimally only the latter.
*
* <p>It is possible to define and use ForkJoinTasks that may block,
- * but doing do requires three further considerations: (1) Completion
+ * but doing so requires three further considerations: (1) Completion
* of few if any <em>other</em> tasks should be dependent on a task
* that blocks on external synchronization or I/O. Event-style async
* tasks that are never joined (for example, those subclassing {@link
@@ -259,7 +261,7 @@
for (int s;;) {
if ((s = status) < 0)
return s;
- if (U.compareAndSwapInt(this, STATUS, s, s | completion)) {
+ if (STATUS.compareAndSet(this, s, s | completion)) {
if ((s >>> 16) != 0)
synchronized (this) { notifyAll(); }
return completion;
@@ -297,7 +299,7 @@
final void internalWait(long timeout) {
int s;
if ((s = status) >= 0 && // force completer to issue notify
- U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
+ STATUS.compareAndSet(this, s, s | SIGNAL)) {
synchronized (this) {
if (status >= 0)
try { wait(timeout); } catch (InterruptedException ie) { }
@@ -319,7 +321,7 @@
if (s >= 0 && (s = status) >= 0) {
boolean interrupted = false;
do {
- if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
+ if (STATUS.compareAndSet(this, s, s | SIGNAL)) {
synchronized (this) {
if (status >= 0) {
try {
@@ -353,7 +355,7 @@
ForkJoinPool.common.tryExternalUnpush(this) ? doExec() :
0)) >= 0) {
while ((s = status) >= 0) {
- if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
+ if (STATUS.compareAndSet(this, s, s | SIGNAL)) {
synchronized (this) {
if (status >= 0)
wait(0L);
@@ -400,22 +402,24 @@
// Exception table support
/**
- * Table of exceptions thrown by tasks, to enable reporting by
- * callers. Because exceptions are rare, we don't directly keep
+ * Hash table of exceptions thrown by tasks, to enable reporting
+ * by callers. Because exceptions are rare, we don't directly keep
* them with task objects, but instead use a weak ref table. Note
* that cancellation exceptions don't appear in the table, but are
* instead recorded as status values.
*
- * Note: These statics are initialized below in static block.
+ * The exception table has a fixed capacity.
*/
- private static final ExceptionNode[] exceptionTable;
- private static final ReentrantLock exceptionTableLock;
- private static final ReferenceQueue<Object> exceptionTableRefQueue;
+ private static final ExceptionNode[] exceptionTable
+ = new ExceptionNode[32];
- /**
- * Fixed capacity for exceptionTable.
- */
- private static final int EXCEPTION_MAP_CAPACITY = 32;
+ /** Lock protecting access to exceptionTable. */
+ private static final ReentrantLock exceptionTableLock
+ = new ReentrantLock();
+
+ /** Reference queue of stale exceptionally completed tasks. */
+ private static final ReferenceQueue<ForkJoinTask<?>> exceptionTableRefQueue
+ = new ReferenceQueue<ForkJoinTask<?>>();
/**
* Key-value nodes for exception table. The chained hash table
@@ -435,7 +439,7 @@
final long thrower; // use id not ref to avoid weak cycles
final int hashCode; // store task hashCode before weak ref disappears
ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next,
- ReferenceQueue<Object> exceptionTableRefQueue) {
+ ReferenceQueue<ForkJoinTask<?>> exceptionTableRefQueue) {
super(task, exceptionTableRefQueue);
this.ex = ex;
this.next = next;
@@ -599,9 +603,8 @@
private static void expungeStaleExceptions() {
for (Object x; (x = exceptionTableRefQueue.poll()) != null;) {
if (x instanceof ExceptionNode) {
- int hashCode = ((ExceptionNode)x).hashCode;
ExceptionNode[] t = exceptionTable;
- int i = hashCode & (t.length - 1);
+ int i = ((ExceptionNode)x).hashCode & (t.length - 1);
ExceptionNode e = t[i];
ExceptionNode pred = null;
while (e != null) {
@@ -1031,7 +1034,7 @@
while ((s = status) >= 0 &&
(ns = deadline - System.nanoTime()) > 0L) {
if ((ms = TimeUnit.NANOSECONDS.toMillis(ns)) > 0L &&
- U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
+ STATUS.compareAndSet(this, s, s | SIGNAL)) {
synchronized (this) {
if (status >= 0)
wait(ms); // OK to throw InterruptedException
@@ -1324,8 +1327,8 @@
*/
public final short setForkJoinTaskTag(short newValue) {
for (int s;;) {
- if (U.compareAndSwapInt(this, STATUS, s = status,
- (s & ~SMASK) | (newValue & SMASK)))
+ if (STATUS.compareAndSet(this, s = status,
+ (s & ~SMASK) | (newValue & SMASK)))
return (short)s;
}
}
@@ -1348,8 +1351,8 @@
for (int s;;) {
if ((short)(s = status) != expect)
return false;
- if (U.compareAndSwapInt(this, STATUS, s,
- (s & ~SMASK) | (update & SMASK)))
+ if (STATUS.compareAndSet(this, s,
+ (s & ~SMASK) | (update & SMASK)))
return true;
}
}
@@ -1510,17 +1513,12 @@
setExceptionalCompletion((Throwable)ex);
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long STATUS;
-
+ // VarHandle mechanics
+ private static final VarHandle STATUS;
static {
- exceptionTableLock = new ReentrantLock();
- exceptionTableRefQueue = new ReferenceQueue<Object>();
- exceptionTable = new ExceptionNode[EXCEPTION_MAP_CAPACITY];
try {
- STATUS = U.objectFieldOffset
- (ForkJoinTask.class.getDeclaredField("status"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ STATUS = l.findVarHandle(ForkJoinTask.class, "status", int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java Thu Jul 21 17:13:23 2016 +0000
@@ -66,8 +66,9 @@
* owning thread.
*
* Support for (non-public) subclass InnocuousForkJoinWorkerThread
- * requires that we break quite a lot of encapsulation (via Unsafe)
- * both here and in the subclass to access and set Thread fields.
+ * requires that we break quite a lot of encapsulation (via helper
+ * methods in ThreadLocalRandom) both here and in the subclass to
+ * access and set Thread fields.
*/
final ForkJoinPool pool; // the pool this thread works in
@@ -92,8 +93,8 @@
ForkJoinWorkerThread(ForkJoinPool pool, ThreadGroup threadGroup,
AccessControlContext acc) {
super(threadGroup, null, "aForkJoinWorkerThread");
- U.putObjectRelease(this, INHERITEDACCESSCONTROLCONTEXT, acc);
- eraseThreadLocals(); // clear before registering
+ ThreadLocalRandom.setInheritedAccessControlContext(this, acc);
+ ThreadLocalRandom.eraseThreadLocals(this); // clear before registering
this.pool = pool;
this.workQueue = pool.registerWorker(this);
}
@@ -171,37 +172,11 @@
}
/**
- * Erases ThreadLocals by nulling out Thread maps.
- */
- final void eraseThreadLocals() {
- U.putObject(this, THREADLOCALS, null);
- U.putObject(this, INHERITABLETHREADLOCALS, null);
- }
-
- /**
* Non-public hook method for InnocuousForkJoinWorkerThread.
*/
void afterTopLevelExec() {
}
- // Set up to allow setting thread fields in constructor
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long THREADLOCALS;
- private static final long INHERITABLETHREADLOCALS;
- private static final long INHERITEDACCESSCONTROLCONTEXT;
- static {
- try {
- THREADLOCALS = U.objectFieldOffset
- (Thread.class.getDeclaredField("threadLocals"));
- INHERITABLETHREADLOCALS = U.objectFieldOffset
- (Thread.class.getDeclaredField("inheritableThreadLocals"));
- INHERITEDACCESSCONTROLCONTEXT = U.objectFieldOffset
- (Thread.class.getDeclaredField("inheritedAccessControlContext"));
- } catch (ReflectiveOperationException e) {
- throw new Error(e);
- }
- }
-
/**
* A worker thread that has no permissions, is not a member of any
* user-defined ThreadGroup, and erases all ThreadLocals after
@@ -210,7 +185,7 @@
static final class InnocuousForkJoinWorkerThread extends ForkJoinWorkerThread {
/** The ThreadGroup for all InnocuousForkJoinWorkerThreads */
private static final ThreadGroup innocuousThreadGroup =
- createThreadGroup();
+ ThreadLocalRandom.createThreadGroup("InnocuousForkJoinWorkerThreadGroup");
/** An AccessControlContext supporting no privileges */
private static final AccessControlContext INNOCUOUS_ACC =
@@ -225,7 +200,7 @@
@Override // to erase ThreadLocals
void afterTopLevelExec() {
- eraseThreadLocals();
+ ThreadLocalRandom.eraseThreadLocals(this);
}
@Override // to always report system loader
@@ -241,33 +216,5 @@
throw new SecurityException("setContextClassLoader");
}
- /**
- * Returns a new group with the system ThreadGroup (the
- * topmost, parent-less group) as parent. Uses Unsafe to
- * traverse Thread.group and ThreadGroup.parent fields.
- */
- private static ThreadGroup createThreadGroup() {
- try {
- jdk.internal.misc.Unsafe u = jdk.internal.misc.Unsafe.getUnsafe();
- long tg = u.objectFieldOffset
- (Thread.class.getDeclaredField("group"));
- long gp = u.objectFieldOffset
- (ThreadGroup.class.getDeclaredField("parent"));
- ThreadGroup group = (ThreadGroup)
- u.getObject(Thread.currentThread(), tg);
- while (group != null) {
- ThreadGroup parent = (ThreadGroup)u.getObject(group, gp);
- if (parent == null)
- return new ThreadGroup(group,
- "InnocuousForkJoinWorkerThreadGroup");
- group = parent;
- }
- } catch (ReflectiveOperationException e) {
- throw new Error(e);
- }
- // fall through if null as cannot-happen safeguard
- throw new Error("Cannot create ThreadGroup");
- }
}
-
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.concurrent.locks.LockSupport;
/**
@@ -69,9 +71,6 @@
* cancellation races. Sync control in the current design relies
* on a "state" field updated via CAS to track completion, along
* with a simple Treiber stack to hold waiting threads.
- *
- * Style note: As usual, we bypass overhead of using
- * AtomicXFieldUpdaters and instead directly use Unsafe intrinsics.
*/
/**
@@ -163,9 +162,8 @@
}
public boolean cancel(boolean mayInterruptIfRunning) {
- if (!(state == NEW &&
- U.compareAndSwapInt(this, STATE, NEW,
- mayInterruptIfRunning ? INTERRUPTING : CANCELLED)))
+ if (!(state == NEW && STATE.compareAndSet
+ (this, NEW, mayInterruptIfRunning ? INTERRUPTING : CANCELLED)))
return false;
try { // in case call to interrupt throws exception
if (mayInterruptIfRunning) {
@@ -174,7 +172,7 @@
if (t != null)
t.interrupt();
} finally { // final state
- U.putIntRelease(this, STATE, INTERRUPTED);
+ STATE.setRelease(this, INTERRUPTED);
}
}
} finally {
@@ -228,9 +226,9 @@
* @param v the value
*/
protected void set(V v) {
- if (U.compareAndSwapInt(this, STATE, NEW, COMPLETING)) {
+ if (STATE.compareAndSet(this, NEW, COMPLETING)) {
outcome = v;
- U.putIntRelease(this, STATE, NORMAL); // final state
+ STATE.setRelease(this, NORMAL); // final state
finishCompletion();
}
}
@@ -246,16 +244,16 @@
* @param t the cause of failure
*/
protected void setException(Throwable t) {
- if (U.compareAndSwapInt(this, STATE, NEW, COMPLETING)) {
+ if (STATE.compareAndSet(this, NEW, COMPLETING)) {
outcome = t;
- U.putIntRelease(this, STATE, EXCEPTIONAL); // final state
+ STATE.setRelease(this, EXCEPTIONAL); // final state
finishCompletion();
}
}
public void run() {
if (state != NEW ||
- !U.compareAndSwapObject(this, RUNNER, null, Thread.currentThread()))
+ !RUNNER.compareAndSet(this, null, Thread.currentThread()))
return;
try {
Callable<V> c = callable;
@@ -296,7 +294,7 @@
*/
protected boolean runAndReset() {
if (state != NEW ||
- !U.compareAndSwapObject(this, RUNNER, null, Thread.currentThread()))
+ !RUNNER.compareAndSet(this, null, Thread.currentThread()))
return false;
boolean ran = false;
int s = state;
@@ -363,7 +361,7 @@
private void finishCompletion() {
// assert state > COMPLETING;
for (WaitNode q; (q = waiters) != null;) {
- if (U.compareAndSwapObject(this, WAITERS, q, null)) {
+ if (WAITERS.weakCompareAndSetVolatile(this, q, null)) {
for (;;) {
Thread t = q.thread;
if (t != null) {
@@ -425,8 +423,7 @@
q = new WaitNode();
}
else if (!queued)
- queued = U.compareAndSwapObject(this, WAITERS,
- q.next = waiters, q);
+ queued = WAITERS.weakCompareAndSetVolatile(this, q.next = waiters, q);
else if (timed) {
final long parkNanos;
if (startTime == 0L) { // first time
@@ -475,7 +472,7 @@
if (pred.thread == null) // check for race
continue retry;
}
- else if (!U.compareAndSwapObject(this, WAITERS, q, s))
+ else if (!WAITERS.compareAndSet(this, q, s))
continue retry;
}
break;
@@ -483,19 +480,16 @@
}
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long STATE;
- private static final long RUNNER;
- private static final long WAITERS;
+ // VarHandle mechanics
+ private static final VarHandle STATE;
+ private static final VarHandle RUNNER;
+ private static final VarHandle WAITERS;
static {
try {
- STATE = U.objectFieldOffset
- (FutureTask.class.getDeclaredField("state"));
- RUNNER = U.objectFieldOffset
- (FutureTask.class.getDeclaredField("runner"));
- WAITERS = U.objectFieldOffset
- (FutureTask.class.getDeclaredField("waiters"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ STATE = l.findVarHandle(FutureTask.class, "state", int.class);
+ RUNNER = l.findVarHandle(FutureTask.class, "runner", Thread.class);
+ WAITERS = l.findVarHandle(FutureTask.class, "waiters", WaitNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.AbstractQueue;
import java.util.Arrays;
import java.util.Collection;
@@ -444,7 +446,7 @@
/**
* Queue nodes. Uses Object, not E, for items to allow forgetting
- * them after use. Relies heavily on Unsafe mechanics to minimize
+ * them after use. Relies heavily on VarHandles to minimize
* unnecessary ordering constraints: Writes that are intrinsically
* ordered wrt other accesses or CASes use simple relaxed forms.
*/
@@ -456,12 +458,12 @@
// CAS methods for fields
final boolean casNext(Node cmp, Node val) {
- return U.compareAndSwapObject(this, NEXT, cmp, val);
+ return NEXT.compareAndSet(this, cmp, val);
}
final boolean casItem(Object cmp, Object val) {
// assert cmp == null || cmp.getClass() != Node.class;
- return U.compareAndSwapObject(this, ITEM, cmp, val);
+ return ITEM.compareAndSet(this, cmp, val);
}
/**
@@ -469,7 +471,7 @@
* only be seen after publication via casNext.
*/
Node(Object item, boolean isData) {
- U.putObject(this, ITEM, item); // relaxed write
+ ITEM.set(this, item); // relaxed write
this.isData = isData;
}
@@ -478,7 +480,7 @@
* only after CASing head field, so uses relaxed write.
*/
final void forgetNext() {
- U.putObject(this, NEXT, this);
+ NEXT.set(this, this);
}
/**
@@ -491,8 +493,8 @@
* else we don't care).
*/
final void forgetContents() {
- U.putObject(this, ITEM, this);
- U.putObject(this, WAITER, null);
+ ITEM.set(this, this);
+ WAITER.set(this, null);
}
/**
@@ -537,19 +539,16 @@
private static final long serialVersionUID = -3375979862319811754L;
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long ITEM;
- private static final long NEXT;
- private static final long WAITER;
+ // VarHandle mechanics
+ private static final VarHandle ITEM;
+ private static final VarHandle NEXT;
+ private static final VarHandle WAITER;
static {
try {
- ITEM = U.objectFieldOffset
- (Node.class.getDeclaredField("item"));
- NEXT = U.objectFieldOffset
- (Node.class.getDeclaredField("next"));
- WAITER = U.objectFieldOffset
- (Node.class.getDeclaredField("waiter"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ ITEM = l.findVarHandle(Node.class, "item", Object.class);
+ NEXT = l.findVarHandle(Node.class, "next", Node.class);
+ WAITER = l.findVarHandle(Node.class, "waiter", Thread.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -567,15 +566,15 @@
// CAS methods for fields
private boolean casTail(Node cmp, Node val) {
- return U.compareAndSwapObject(this, TAIL, cmp, val);
+ return TAIL.compareAndSet(this, cmp, val);
}
private boolean casHead(Node cmp, Node val) {
- return U.compareAndSwapObject(this, HEAD, cmp, val);
+ return HEAD.compareAndSet(this, cmp, val);
}
private boolean casSweepVotes(int cmp, int val) {
- return U.compareAndSwapInt(this, SWEEPVOTES, cmp, val);
+ return SWEEPVOTES.compareAndSet(this, cmp, val);
}
/*
@@ -1562,20 +1561,19 @@
}
}
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long HEAD;
- private static final long TAIL;
- private static final long SWEEPVOTES;
+ // VarHandle mechanics
+ private static final VarHandle HEAD;
+ private static final VarHandle TAIL;
+ private static final VarHandle SWEEPVOTES;
static {
try {
- HEAD = U.objectFieldOffset
- (LinkedTransferQueue.class.getDeclaredField("head"));
- TAIL = U.objectFieldOffset
- (LinkedTransferQueue.class.getDeclaredField("tail"));
- SWEEPVOTES = U.objectFieldOffset
- (LinkedTransferQueue.class.getDeclaredField("sweepVotes"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ HEAD = l.findVarHandle(LinkedTransferQueue.class, "head",
+ Node.class);
+ TAIL = l.findVarHandle(LinkedTransferQueue.class, "tail",
+ Node.class);
+ SWEEPVOTES = l.findVarHandle(LinkedTransferQueue.class, "sweepVotes",
+ int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport;
@@ -221,7 +223,6 @@
* phaser.arriveAndDeregister();
* }}</pre>
*
- *
* <p>To create a set of {@code n} tasks using a tree of phasers, you
* could use code of the following form, assuming a Task class with a
* constructor accepting a {@code Phaser} that it registers with upon
@@ -384,7 +385,7 @@
int unarrived = (counts == EMPTY) ? 0 : (counts & UNARRIVED_MASK);
if (unarrived <= 0)
throw new IllegalStateException(badArrive(s));
- if (U.compareAndSwapLong(this, STATE, s, s-=adjust)) {
+ if (STATE.compareAndSet(this, s, s-=adjust)) {
if (unarrived == 1) {
long n = s & PARTIES_MASK; // base of next state
int nextUnarrived = (int)n >>> PARTIES_SHIFT;
@@ -397,12 +398,12 @@
n |= nextUnarrived;
int nextPhase = (phase + 1) & MAX_PHASE;
n |= (long)nextPhase << PHASE_SHIFT;
- U.compareAndSwapLong(this, STATE, s, n);
+ STATE.compareAndSet(this, s, n);
releaseWaiters(phase);
}
else if (nextUnarrived == 0) { // propagate deregistration
phase = parent.doArrive(ONE_DEREGISTER);
- U.compareAndSwapLong(this, STATE, s, s | EMPTY);
+ STATE.compareAndSet(this, s, s | EMPTY);
}
else
phase = parent.doArrive(ONE_ARRIVAL);
@@ -437,13 +438,13 @@
if (parent == null || reconcileState() == s) {
if (unarrived == 0) // wait out advance
root.internalAwaitAdvance(phase, null);
- else if (U.compareAndSwapLong(this, STATE, s, s + adjust))
+ else if (STATE.compareAndSet(this, s, s + adjust))
break;
}
}
else if (parent == null) { // 1st root registration
long next = ((long)phase << PHASE_SHIFT) | adjust;
- if (U.compareAndSwapLong(this, STATE, s, next))
+ if (STATE.compareAndSet(this, s, next))
break;
}
else {
@@ -455,8 +456,8 @@
// finish registration whenever parent registration
// succeeded, even when racing with termination,
// since these are part of the same "transaction".
- while (!U.compareAndSwapLong
- (this, STATE, s,
+ while (!STATE.weakCompareAndSetVolatile
+ (this, s,
((long)phase << PHASE_SHIFT) | adjust)) {
s = state;
phase = (int)(root.state >>> PHASE_SHIFT);
@@ -487,8 +488,8 @@
// CAS to root phase with current parties, tripping unarrived
while ((phase = (int)(root.state >>> PHASE_SHIFT)) !=
(int)(s >>> PHASE_SHIFT) &&
- !U.compareAndSwapLong
- (this, STATE, s,
+ !STATE.weakCompareAndSetVolatile
+ (this, s,
s = (((long)phase << PHASE_SHIFT) |
((phase < 0) ? (s & COUNTS_MASK) :
(((p = (int)s >>> PARTIES_SHIFT) == 0) ? EMPTY :
@@ -677,7 +678,7 @@
int unarrived = (counts == EMPTY) ? 0 : (counts & UNARRIVED_MASK);
if (unarrived <= 0)
throw new IllegalStateException(badArrive(s));
- if (U.compareAndSwapLong(this, STATE, s, s -= ONE_ARRIVAL)) {
+ if (STATE.compareAndSet(this, s, s -= ONE_ARRIVAL)) {
if (unarrived > 1)
return root.internalAwaitAdvance(phase, null);
if (root != this)
@@ -692,7 +693,7 @@
n |= nextUnarrived;
int nextPhase = (phase + 1) & MAX_PHASE;
n |= (long)nextPhase << PHASE_SHIFT;
- if (!U.compareAndSwapLong(this, STATE, s, n))
+ if (!STATE.compareAndSet(this, s, n))
return (int)(state >>> PHASE_SHIFT); // terminated
releaseWaiters(phase);
return nextPhase;
@@ -808,7 +809,7 @@
final Phaser root = this.root;
long s;
while ((s = root.state) >= 0) {
- if (U.compareAndSwapLong(root, STATE, s, s | TERMINATION_BIT)) {
+ if (STATE.compareAndSet(root, s, s | TERMINATION_BIT)) {
// signal all threads
releaseWaiters(0); // Waiters on evenQ
releaseWaiters(1); // Waiters on oddQ
@@ -1043,6 +1044,8 @@
node = new QNode(this, phase, false, false, 0L);
node.wasInterrupted = interrupted;
}
+ else
+ Thread.onSpinWait();
}
else if (node.isReleasable()) // done or aborted
break;
@@ -1131,14 +1134,12 @@
}
}
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long STATE;
+ // VarHandle mechanics
+ private static final VarHandle STATE;
static {
try {
- STATE = U.objectFieldOffset
- (Phaser.class.getDeclaredField("state"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ STATE = l.findVarHandle(Phaser.class, "state", long.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.AbstractQueue;
import java.util.Arrays;
import java.util.Collection;
@@ -289,7 +291,7 @@
lock.unlock(); // must release and then re-acquire main lock
Object[] newArray = null;
if (allocationSpinLock == 0 &&
- U.compareAndSwapInt(this, ALLOCATIONSPINLOCK, 0, 1)) {
+ ALLOCATIONSPINLOCK.compareAndSet(this, 0, 1)) {
try {
int newCap = oldCap + ((oldCap < 64) ?
(oldCap + 2) : // grow faster if small
@@ -1009,13 +1011,14 @@
return new PBQSpliterator<E>(this, null, 0, -1);
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long ALLOCATIONSPINLOCK;
+ // VarHandle mechanics
+ private static final VarHandle ALLOCATIONSPINLOCK;
static {
try {
- ALLOCATIONSPINLOCK = U.objectFieldOffset
- (PriorityBlockingQueue.class.getDeclaredField("allocationSpinLock"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ ALLOCATIONSPINLOCK = l.findVarHandle(PriorityBlockingQueue.class,
+ "allocationSpinLock",
+ int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.locks.LockSupport;
@@ -866,7 +868,7 @@
/** Subscriber for method consume */
private static final class ConsumerSubscriber<T>
- implements Flow.Subscriber<T> {
+ implements Flow.Subscriber<T> {
final CompletableFuture<Void> status;
final Consumer<? super T> consumer;
Flow.Subscription subscription;
@@ -906,7 +908,7 @@
*/
@SuppressWarnings("serial")
static final class ConsumerTask<T> extends ForkJoinTask<Void>
- implements Runnable {
+ implements Runnable, CompletableFuture.AsynchronousCompletionTask {
final BufferedSubscription<T> consumer;
ConsumerTask(BufferedSubscription<T> consumer) {
this.consumer = consumer;
@@ -959,11 +961,9 @@
* Blocking control relies on the "waiter" field. Producers set
* the field before trying to block, but must then recheck (via
* offer) before parking. Signalling then just unparks and clears
- * waiter field. If the producer and consumer are both in the same
- * ForkJoinPool, or consumers are running in commonPool, the
- * producer attempts to help run consumer tasks that it forked
- * before blocking. To avoid potential cycles, only one level of
- * helping is currently supported.
+ * waiter field. If the producer and/or consumer are using a
+ * ForkJoinPool, the producer attempts to help run consumer tasks
+ * via ForkJoinPool.helpAsyncBlocker before blocking.
*
* This class uses @Contended and heuristic field declaration
* ordering to reduce false-sharing-based memory contention among
@@ -983,7 +983,6 @@
volatile long demand; // # unfilled requests
int maxCapacity; // reduced on OOME
int putStat; // offer result for ManagedBlocker
- int helpDepth; // nested helping depth (at most 1)
volatile int ctl; // atomic run state flags
volatile int head; // next position to take
int tail; // next position to put
@@ -1077,7 +1076,7 @@
alloc = true;
}
else {
- U.fullFence(); // recheck
+ VarHandle.fullFence(); // recheck
int h = head, t = tail, size = t + 1 - h;
if (cap >= size) {
a[(cap - 1) & t] = item;
@@ -1116,10 +1115,10 @@
if (a != null && cap > 0) {
int mask = cap - 1;
for (int j = head; j != t; ++j) {
- long k = ((long)(j & mask) << ASHIFT) + ABASE;
- Object x = U.getObjectVolatile(a, k);
+ int k = j & mask;
+ Object x = QA.getAcquire(a, k);
if (x != null && // races with consumer
- U.compareAndSwapObject(a, k, x, null))
+ QA.compareAndSet(a, k, x, null))
newArray[j & newMask] = x;
}
}
@@ -1136,28 +1135,20 @@
* initial offer return 0.
*/
final int submit(T item) {
- int stat; Executor e; ForkJoinWorkerThread w;
- if ((stat = offer(item)) == 0 && helpDepth == 0 &&
- ((e = executor) instanceof ForkJoinPool)) {
- helpDepth = 1;
- Thread thread = Thread.currentThread();
- if ((thread instanceof ForkJoinWorkerThread) &&
- ((w = (ForkJoinWorkerThread)thread)).getPool() == e)
- stat = internalHelpConsume(w.workQueue, item);
- else if (e == ForkJoinPool.commonPool())
- stat = externalHelpConsume
- (ForkJoinPool.commonSubmitterQueue(), item);
- helpDepth = 0;
- }
- if (stat == 0 && (stat = offer(item)) == 0) {
+ int stat;
+ if ((stat = offer(item)) == 0) {
putItem = item;
timeout = 0L;
- try {
- ForkJoinPool.managedBlock(this);
- } catch (InterruptedException ie) {
- timeout = INTERRUPTED;
+ putStat = 0;
+ ForkJoinPool.helpAsyncBlocker(executor, this);
+ if ((stat = putStat) == 0) {
+ try {
+ ForkJoinPool.managedBlock(this);
+ } catch (InterruptedException ie) {
+ timeout = INTERRUPTED;
+ }
+ stat = putStat;
}
- stat = putStat;
if (timeout < 0L)
Thread.currentThread().interrupt();
}
@@ -1165,71 +1156,22 @@
}
/**
- * Tries helping for FJ submitter.
- */
- private int internalHelpConsume(ForkJoinPool.WorkQueue w, T item) {
- int stat = 0;
- if (w != null) {
- ForkJoinTask<?> t;
- while ((t = w.peek()) != null && (t instanceof ConsumerTask)) {
- if ((stat = offer(item)) != 0 || !w.tryUnpush(t))
- break;
- ((ConsumerTask<?>)t).consumer.consume();
- }
- }
- return stat;
- }
-
- /**
- * Tries helping for non-FJ submitter.
- */
- private int externalHelpConsume(ForkJoinPool.WorkQueue w, T item) {
- int stat = 0;
- if (w != null) {
- ForkJoinTask<?> t;
- while ((t = w.peek()) != null && (t instanceof ConsumerTask)) {
- if ((stat = offer(item)) != 0 || !w.trySharedUnpush(t))
- break;
- ((ConsumerTask<?>)t).consumer.consume();
- }
- }
- return stat;
- }
-
- /**
* Timeout version; similar to submit.
*/
final int timedOffer(T item, long nanos) {
- int stat; Executor e;
- if ((stat = offer(item)) == 0 && helpDepth == 0 &&
- ((e = executor) instanceof ForkJoinPool)) {
- Thread thread = Thread.currentThread();
- if (((thread instanceof ForkJoinWorkerThread) &&
- ((ForkJoinWorkerThread)thread).getPool() == e) ||
- e == ForkJoinPool.commonPool()) {
- helpDepth = 1;
- ForkJoinTask<?> t;
- long deadline = System.nanoTime() + nanos;
- while ((t = ForkJoinTask.peekNextLocalTask()) != null &&
- (t instanceof ConsumerTask)) {
- if ((stat = offer(item)) != 0 ||
- (nanos = deadline - System.nanoTime()) <= 0L ||
- !t.tryUnfork())
- break;
- ((ConsumerTask<?>)t).consumer.consume();
+ int stat;
+ if ((stat = offer(item)) == 0 && (timeout = nanos) > 0L) {
+ putItem = item;
+ putStat = 0;
+ ForkJoinPool.helpAsyncBlocker(executor, this);
+ if ((stat = putStat) == 0) {
+ try {
+ ForkJoinPool.managedBlock(this);
+ } catch (InterruptedException ie) {
+ timeout = INTERRUPTED;
}
- helpDepth = 0;
+ stat = putStat;
}
- }
- if (stat == 0 && (stat = offer(item)) == 0 &&
- (timeout = nanos) > 0L) {
- putItem = item;
- try {
- ForkJoinPool.managedBlock(this);
- } catch (InterruptedException ie) {
- timeout = INTERRUPTED;
- }
- stat = putStat;
if (timeout < 0L)
Thread.currentThread().interrupt();
}
@@ -1249,22 +1191,20 @@
}
else if ((c & ACTIVE) != 0) { // ensure keep-alive
if ((c & CONSUME) != 0 ||
- U.compareAndSwapInt(this, CTL, c,
- c | CONSUME))
+ CTL.compareAndSet(this, c, c | CONSUME))
break;
}
else if (demand == 0L || tail == head)
break;
- else if (U.compareAndSwapInt(this, CTL, c,
- c | (ACTIVE | CONSUME))) {
+ else if (CTL.compareAndSet(this, c, c | (ACTIVE | CONSUME))) {
try {
e.execute(new ConsumerTask<T>(this));
break;
} catch (RuntimeException | Error ex) { // back out
do {} while (((c = ctl) & DISABLED) == 0 &&
(c & ACTIVE) != 0 &&
- !U.compareAndSwapInt(this, CTL, c,
- c & ~ACTIVE));
+ !CTL.weakCompareAndSetVolatile
+ (this, c, c & ~ACTIVE));
throw ex;
}
}
@@ -1300,10 +1240,10 @@
break;
else if ((c & ACTIVE) != 0) {
pendingError = ex;
- if (U.compareAndSwapInt(this, CTL, c, c | ERROR))
+ if (CTL.compareAndSet(this, c, c | ERROR))
break; // cause consumer task to exit
}
- else if (U.compareAndSwapInt(this, CTL, c, DISABLED)) {
+ else if (CTL.compareAndSet(this, c, DISABLED)) {
Flow.Subscriber<? super T> s = subscriber;
if (s != null && ex != null) {
try {
@@ -1330,7 +1270,7 @@
for (int c;;) {
if ((c = ctl) == DISABLED || (c & ACTIVE) == 0)
break;
- if (U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE)) {
+ if (CTL.compareAndSet(this, c, c & ~ACTIVE)) {
onError(ex);
break;
}
@@ -1343,8 +1283,8 @@
for (int c;;) {
if ((c = ctl) == DISABLED)
break;
- if (U.compareAndSwapInt(this, CTL, c,
- c | (ACTIVE | CONSUME | COMPLETE))) {
+ if (CTL.compareAndSet(this, c,
+ c | (ACTIVE | CONSUME | COMPLETE))) {
if ((c & ACTIVE) == 0)
startOrDisable();
break;
@@ -1356,8 +1296,8 @@
for (int c;;) {
if ((c = ctl) == DISABLED)
break;
- if (U.compareAndSwapInt(this, CTL, c,
- c | (ACTIVE | CONSUME | SUBSCRIBE))) {
+ if (CTL.compareAndSet(this, c,
+ c | (ACTIVE | CONSUME | SUBSCRIBE))) {
if ((c & ACTIVE) == 0)
startOrDisable();
break;
@@ -1375,11 +1315,11 @@
if ((c = ctl) == DISABLED)
break;
else if ((c & ACTIVE) != 0) {
- if (U.compareAndSwapInt(this, CTL, c,
- c | (CONSUME | ERROR)))
+ if (CTL.compareAndSet(this, c,
+ c | (CONSUME | ERROR)))
break;
}
- else if (U.compareAndSwapInt(this, CTL, c, DISABLED)) {
+ else if (CTL.compareAndSet(this, c, DISABLED)) {
detach();
break;
}
@@ -1395,19 +1335,18 @@
long prev = demand, d;
if ((d = prev + n) < prev) // saturate
d = Long.MAX_VALUE;
- if (U.compareAndSwapLong(this, DEMAND, prev, d)) {
+ if (DEMAND.compareAndSet(this, prev, d)) {
for (int c, h;;) {
if ((c = ctl) == DISABLED)
break;
else if ((c & ACTIVE) != 0) {
if ((c & CONSUME) != 0 ||
- U.compareAndSwapInt(this, CTL, c,
- c | CONSUME))
+ CTL.compareAndSet(this, c, c | CONSUME))
break;
}
else if ((h = head) != tail) {
- if (U.compareAndSwapInt(this, CTL, c,
- c | (ACTIVE|CONSUME))) {
+ if (CTL.compareAndSet(this, c,
+ c | (ACTIVE|CONSUME))) {
startOrDisable();
break;
}
@@ -1476,16 +1415,14 @@
if ((s = subscriber) != null) { // else disabled
for (;;) {
long d = demand;
- int c; Object[] a; int n; long i; Object x; Thread w;
+ int c; Object[] a; int n, i; Object x; Thread w;
if (((c = ctl) & (ERROR | SUBSCRIBE | DISABLED)) != 0) {
if (!checkControl(s, c))
break;
}
else if ((a = array) == null || h == tail ||
(n = a.length) == 0 ||
- (x = U.getObjectVolatile
- (a, (i = ((long)((n - 1) & h) << ASHIFT) + ABASE)))
- == null) {
+ (x = QA.getAcquire(a, i = (n - 1) & h)) == null) {
if (!checkEmpty(s, c))
break;
}
@@ -1494,10 +1431,10 @@
break;
}
else if (((c & CONSUME) != 0 ||
- U.compareAndSwapInt(this, CTL, c, c | CONSUME)) &&
- U.compareAndSwapObject(a, i, x, null)) {
- U.putIntRelease(this, HEAD, ++h);
- U.getAndAddLong(this, DEMAND, -1L);
+ CTL.compareAndSet(this, c, c | CONSUME)) &&
+ QA.compareAndSet(a, i, x, null)) {
+ HEAD.setRelease(this, ++h);
+ DEMAND.getAndAdd(this, -1L);
if ((w = waiter) != null)
signalWaiter(w);
try {
@@ -1528,7 +1465,7 @@
}
}
else if ((c & SUBSCRIBE) != 0) {
- if (U.compareAndSwapInt(this, CTL, c, c & ~SUBSCRIBE)) {
+ if (CTL.compareAndSet(this, c, c & ~SUBSCRIBE)) {
try {
if (s != null)
s.onSubscribe(this);
@@ -1551,9 +1488,9 @@
boolean stat = true;
if (head == tail) {
if ((c & CONSUME) != 0)
- U.compareAndSwapInt(this, CTL, c, c & ~CONSUME);
+ CTL.compareAndSet(this, c, c & ~CONSUME);
else if ((c & COMPLETE) != 0) {
- if (U.compareAndSwapInt(this, CTL, c, DISABLED)) {
+ if (CTL.compareAndSet(this, c, DISABLED)) {
try {
if (s != null)
s.onComplete();
@@ -1561,7 +1498,7 @@
}
}
}
- else if (U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE))
+ else if (CTL.compareAndSet(this, c, c & ~ACTIVE))
stat = false;
}
return stat;
@@ -1574,8 +1511,8 @@
boolean stat = true;
if (demand == 0L) {
if ((c & CONSUME) != 0)
- U.compareAndSwapInt(this, CTL, c, c & ~CONSUME);
- else if (U.compareAndSwapInt(this, CTL, c, c & ~ACTIVE))
+ CTL.compareAndSet(this, c, c & ~CONSUME);
+ else if (CTL.compareAndSet(this, c, c & ~ACTIVE))
stat = false;
}
return stat;
@@ -1595,31 +1532,25 @@
onError(ex);
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long CTL;
- private static final long TAIL;
- private static final long HEAD;
- private static final long DEMAND;
- private static final int ABASE;
- private static final int ASHIFT;
+ // VarHandle mechanics
+ private static final VarHandle CTL;
+ private static final VarHandle TAIL;
+ private static final VarHandle HEAD;
+ private static final VarHandle DEMAND;
+ private static final VarHandle QA;
static {
try {
- CTL = U.objectFieldOffset
- (BufferedSubscription.class.getDeclaredField("ctl"));
- TAIL = U.objectFieldOffset
- (BufferedSubscription.class.getDeclaredField("tail"));
- HEAD = U.objectFieldOffset
- (BufferedSubscription.class.getDeclaredField("head"));
- DEMAND = U.objectFieldOffset
- (BufferedSubscription.class.getDeclaredField("demand"));
-
- ABASE = U.arrayBaseOffset(Object[].class);
- int scale = U.arrayIndexScale(Object[].class);
- if ((scale & (scale - 1)) != 0)
- throw new Error("data type scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ CTL = l.findVarHandle(BufferedSubscription.class, "ctl",
+ int.class);
+ TAIL = l.findVarHandle(BufferedSubscription.class, "tail",
+ int.class);
+ HEAD = l.findVarHandle(BufferedSubscription.class, "head",
+ int.class);
+ DEMAND = l.findVarHandle(BufferedSubscription.class, "demand",
+ long.class);
+ QA = MethodHandles.arrayElementVarHandle(Object[].class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java Thu Jul 21 17:13:23 2016 +0000
@@ -36,6 +36,8 @@
package java.util.concurrent;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.AbstractQueue;
import java.util.Collection;
import java.util.Collections;
@@ -247,7 +249,7 @@
boolean casNext(SNode cmp, SNode val) {
return cmp == next &&
- U.compareAndSwapObject(this, NEXT, cmp, val);
+ SNEXT.compareAndSet(this, cmp, val);
}
/**
@@ -260,7 +262,7 @@
*/
boolean tryMatch(SNode s) {
if (match == null &&
- U.compareAndSwapObject(this, MATCH, null, s)) {
+ SMATCH.compareAndSet(this, null, s)) {
Thread w = waiter;
if (w != null) { // waiters need at most one unpark
waiter = null;
@@ -275,24 +277,21 @@
* Tries to cancel a wait by matching node to itself.
*/
void tryCancel() {
- U.compareAndSwapObject(this, MATCH, null, this);
+ SMATCH.compareAndSet(this, null, this);
}
boolean isCancelled() {
return match == this;
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long MATCH;
- private static final long NEXT;
-
+ // VarHandle mechanics
+ private static final VarHandle SMATCH;
+ private static final VarHandle SNEXT;
static {
try {
- MATCH = U.objectFieldOffset
- (SNode.class.getDeclaredField("match"));
- NEXT = U.objectFieldOffset
- (SNode.class.getDeclaredField("next"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ SMATCH = l.findVarHandle(SNode.class, "match", SNode.class);
+ SNEXT = l.findVarHandle(SNode.class, "next", SNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -304,7 +303,7 @@
boolean casHead(SNode h, SNode nh) {
return h == head &&
- U.compareAndSwapObject(this, HEAD, h, nh);
+ SHEAD.compareAndSet(this, h, nh);
}
/**
@@ -451,8 +450,10 @@
continue;
}
}
- if (spins > 0)
+ if (spins > 0) {
+ Thread.onSpinWait();
spins = shouldSpin(s) ? (spins - 1) : 0;
+ }
else if (s.waiter == null)
s.waiter = w; // establish waiter so can park next iter
else if (!timed)
@@ -508,13 +509,12 @@
}
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long HEAD;
+ // VarHandle mechanics
+ private static final VarHandle SHEAD;
static {
try {
- HEAD = U.objectFieldOffset
- (TransferStack.class.getDeclaredField("head"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ SHEAD = l.findVarHandle(TransferStack.class, "head", SNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -546,19 +546,19 @@
boolean casNext(QNode cmp, QNode val) {
return next == cmp &&
- U.compareAndSwapObject(this, NEXT, cmp, val);
+ QNEXT.compareAndSet(this, cmp, val);
}
boolean casItem(Object cmp, Object val) {
return item == cmp &&
- U.compareAndSwapObject(this, ITEM, cmp, val);
+ QITEM.compareAndSet(this, cmp, val);
}
/**
* Tries to cancel by CAS'ing ref to this as item.
*/
void tryCancel(Object cmp) {
- U.compareAndSwapObject(this, ITEM, cmp, this);
+ QITEM.compareAndSet(this, cmp, this);
}
boolean isCancelled() {
@@ -574,17 +574,14 @@
return next == this;
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long ITEM;
- private static final long NEXT;
-
+ // VarHandle mechanics
+ private static final VarHandle QITEM;
+ private static final VarHandle QNEXT;
static {
try {
- ITEM = U.objectFieldOffset
- (QNode.class.getDeclaredField("item"));
- NEXT = U.objectFieldOffset
- (QNode.class.getDeclaredField("next"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ QITEM = l.findVarHandle(QNode.class, "item", Object.class);
+ QNEXT = l.findVarHandle(QNode.class, "next", QNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -614,7 +611,7 @@
*/
void advanceHead(QNode h, QNode nh) {
if (h == head &&
- U.compareAndSwapObject(this, HEAD, h, nh))
+ QHEAD.compareAndSet(this, h, nh))
h.next = h; // forget old next
}
@@ -623,7 +620,7 @@
*/
void advanceTail(QNode t, QNode nt) {
if (tail == t)
- U.compareAndSwapObject(this, TAIL, t, nt);
+ QTAIL.compareAndSet(this, t, nt);
}
/**
@@ -631,7 +628,7 @@
*/
boolean casCleanMe(QNode cmp, QNode val) {
return cleanMe == cmp &&
- U.compareAndSwapObject(this, CLEANME, cmp, val);
+ QCLEANME.compareAndSet(this, cmp, val);
}
/**
@@ -752,8 +749,10 @@
continue;
}
}
- if (spins > 0)
+ if (spins > 0) {
--spins;
+ Thread.onSpinWait();
+ }
else if (s.waiter == null)
s.waiter = w;
else if (!timed)
@@ -817,18 +816,19 @@
}
}
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long HEAD;
- private static final long TAIL;
- private static final long CLEANME;
+ // VarHandle mechanics
+ private static final VarHandle QHEAD;
+ private static final VarHandle QTAIL;
+ private static final VarHandle QCLEANME;
static {
try {
- HEAD = U.objectFieldOffset
- (TransferQueue.class.getDeclaredField("head"));
- TAIL = U.objectFieldOffset
- (TransferQueue.class.getDeclaredField("tail"));
- CLEANME = U.objectFieldOffset
- (TransferQueue.class.getDeclaredField("cleanMe"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ QHEAD = l.findVarHandle(TransferQueue.class, "head",
+ QNode.class);
+ QTAIL = l.findVarHandle(TransferQueue.class, "tail",
+ QNode.class);
+ QCLEANME = l.findVarHandle(TransferQueue.class, "cleanMe",
+ QNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java Thu Jul 21 17:13:23 2016 +0000
@@ -36,6 +36,7 @@
package java.util.concurrent;
import java.io.ObjectStreamField;
+import java.security.AccessControlContext;
import java.util.Random;
import java.util.Spliterator;
import java.util.concurrent.atomic.AtomicInteger;
@@ -47,6 +48,7 @@
import java.util.stream.IntStream;
import java.util.stream.LongStream;
import java.util.stream.StreamSupport;
+import jdk.internal.misc.Unsafe;
/**
* A random number generator isolated to the current thread. Like the
@@ -95,7 +97,9 @@
* ThreadLocalRandom sequence. The dual use is a marriage of
* convenience, but is a simple and efficient way of reducing
* application-level overhead and footprint of most concurrent
- * programs.
+ * programs. Even more opportunistically, we also define here
+ * other package-private utilities that access Thread class
+ * fields.
*
* Even though this class subclasses java.util.Random, it uses the
* same basic algorithm as java.util.SplittableRandom. (See its
@@ -958,6 +962,49 @@
return r;
}
+ // Support for other package-private ThreadLocal access
+
+ /**
+ * Erases ThreadLocals by nulling out Thread maps.
+ */
+ static final void eraseThreadLocals(Thread thread) {
+ U.putObject(thread, THREADLOCALS, null);
+ U.putObject(thread, INHERITABLETHREADLOCALS, null);
+ }
+
+ static final void setInheritedAccessControlContext(Thread thread,
+ AccessControlContext acc) {
+ U.putObjectRelease(thread, INHERITEDACCESSCONTROLCONTEXT, acc);
+ }
+
+ /**
+ * Returns a new group with the system ThreadGroup (the
+ * topmost, parent-less group) as parent. Uses Unsafe to
+ * traverse Thread.group and ThreadGroup.parent fields.
+ */
+ static final ThreadGroup createThreadGroup(String name) {
+ if (name == null)
+ throw new NullPointerException();
+ try {
+ long tg = U.objectFieldOffset
+ (Thread.class.getDeclaredField("group"));
+ long gp = U.objectFieldOffset
+ (ThreadGroup.class.getDeclaredField("parent"));
+ ThreadGroup group = (ThreadGroup)
+ U.getObject(Thread.currentThread(), tg);
+ while (group != null) {
+ ThreadGroup parent = (ThreadGroup)U.getObject(group, gp);
+ if (parent == null)
+ return new ThreadGroup(group, name);
+ group = parent;
+ }
+ } catch (ReflectiveOperationException e) {
+ throw new Error(e);
+ }
+ // fall through if null as cannot-happen safeguard
+ throw new Error("Cannot create ThreadGroup");
+ }
+
// Serialization support
private static final long serialVersionUID = -5851777807851030925L;
@@ -1022,10 +1069,13 @@
static final String BAD_SIZE = "size must be non-negative";
// Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private static final long SEED;
private static final long PROBE;
private static final long SECONDARY;
+ private static final long THREADLOCALS;
+ private static final long INHERITABLETHREADLOCALS;
+ private static final long INHERITEDACCESSCONTROLCONTEXT;
static {
try {
SEED = U.objectFieldOffset
@@ -1034,6 +1084,12 @@
(Thread.class.getDeclaredField("threadLocalRandomProbe"));
SECONDARY = U.objectFieldOffset
(Thread.class.getDeclaredField("threadLocalRandomSecondarySeed"));
+ THREADLOCALS = U.objectFieldOffset
+ (Thread.class.getDeclaredField("threadLocals"));
+ INHERITABLETHREADLOCALS = U.objectFieldOffset
+ (Thread.class.getDeclaredField("inheritableThreadLocals"));
+ INHERITEDACCESSCONTROLCONTEXT = U.objectFieldOffset
+ (Thread.class.getDeclaredField("inheritedAccessControlContext"));
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,27 +35,26 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
/**
* A {@code boolean} value that may be updated atomically. See the
- * {@link java.util.concurrent.atomic} package specification for
- * description of the properties of atomic variables. An
- * {@code AtomicBoolean} is used in applications such as atomically
- * updated flags, and cannot be used as a replacement for a
- * {@link java.lang.Boolean}.
+ * {@link VarHandle} specification for descriptions of the properties
+ * of atomic accesses. An {@code AtomicBoolean} is used in
+ * applications such as atomically updated flags, and cannot be used
+ * as a replacement for a {@link java.lang.Boolean}.
*
* @since 1.5
* @author Doug Lea
*/
public class AtomicBoolean implements java.io.Serializable {
private static final long serialVersionUID = 4654671469794556979L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long VALUE;
-
+ private static final VarHandle VALUE;
static {
try {
- VALUE = U.objectFieldOffset
- (AtomicBoolean.class.getDeclaredField("value"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ VALUE = l.findVarHandle(AtomicBoolean.class, "value", int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -79,7 +78,8 @@
}
/**
- * Returns the current value.
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @return the current value
*/
@@ -88,40 +88,39 @@
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
+ * Atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful. False return indicates that
* the actual value was not equal to the expected value.
*/
- public final boolean compareAndSet(boolean expect, boolean update) {
- return U.compareAndSwapInt(this, VALUE,
- (expect ? 1 : 0),
- (update ? 1 : 0));
+ public final boolean compareAndSet(boolean expectedValue, boolean newValue) {
+ return VALUE.compareAndSet(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0));
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
*
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
- *
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful
*/
- public boolean weakCompareAndSet(boolean expect, boolean update) {
- return U.compareAndSwapInt(this, VALUE,
- (expect ? 1 : 0),
- (update ? 1 : 0));
+ public boolean weakCompareAndSet(boolean expectedValue, boolean newValue) {
+ return VALUE.weakCompareAndSet(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0));
}
/**
- * Unconditionally sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param newValue the new value
*/
@@ -130,17 +129,19 @@
}
/**
- * Eventually sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(boolean newValue) {
- U.putIntRelease(this, VALUE, (newValue ? 1 : 0));
+ VALUE.setRelease(this, (newValue ? 1 : 0));
}
/**
- * Atomically sets to the given value and returns the previous value.
+ * Atomically sets the value to {@code newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param newValue the new value
* @return the previous value
@@ -161,4 +162,178 @@
return Boolean.toString(get());
}
+ // jdk9
+
+ /**
+ * Returns the current value, with memory semantics of reading as
+ * if the variable was declared non-{@code volatile}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final boolean getPlain() {
+ return (int)VALUE.get(this) != 0;
+ }
+
+ /**
+ * Sets the value to {@code newValue}, with memory semantics
+ * of setting as if the variable was declared non-{@code volatile}
+ * and non-{@code final}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(boolean newValue) {
+ VALUE.set(this, newValue ? 1 : 0);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final boolean getOpaque() {
+ return (int)VALUE.getOpaque(this) != 0;
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(boolean newValue) {
+ VALUE.setOpaque(this, newValue ? 1 : 0);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final boolean getAcquire() {
+ return (int)VALUE.getAcquire(this) != 0;
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(boolean newValue) {
+ VALUE.setRelease(this, newValue ? 1 : 0);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final boolean compareAndExchange(boolean expectedValue, boolean newValue) {
+ return (int)VALUE.compareAndExchange(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0)) != 0;
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final boolean compareAndExchangeAcquire(boolean expectedValue, boolean newValue) {
+ return (int)VALUE.compareAndExchangeAcquire(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0)) != 0;
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final boolean compareAndExchangeRelease(boolean expectedValue, boolean newValue) {
+ return (int)VALUE.compareAndExchangeRelease(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0)) != 0;
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue} if the current
+ * value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(boolean expectedValue, boolean newValue) {
+ return VALUE.weakCompareAndSetVolatile(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0));
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue} if the current
+ * value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(boolean expectedValue, boolean newValue) {
+ return VALUE.weakCompareAndSetAcquire(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0));
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue} if the current
+ * value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(boolean expectedValue, boolean newValue) {
+ return VALUE.weakCompareAndSetRelease(this,
+ (expectedValue ? 1 : 0),
+ (newValue ? 1 : 0));
+ }
+
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,32 +35,30 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.function.IntBinaryOperator;
import java.util.function.IntUnaryOperator;
/**
* An {@code int} value that may be updated atomically. See the
- * {@link java.util.concurrent.atomic} package specification for
- * description of the properties of atomic variables. An
- * {@code AtomicInteger} is used in applications such as atomically
- * incremented counters, and cannot be used as a replacement for an
- * {@link java.lang.Integer}. However, this class does extend
- * {@code Number} to allow uniform access by tools and utilities that
- * deal with numerically-based classes.
+ * {@link VarHandle} specification for descriptions of the properties
+ * of atomic accesses. An {@code AtomicInteger} is used in
+ * applications such as atomically incremented counters, and cannot be
+ * used as a replacement for an {@link java.lang.Integer}. However,
+ * this class does extend {@code Number} to allow uniform access by
+ * tools and utilities that deal with numerically-based classes.
*
* @since 1.5
* @author Doug Lea
*/
public class AtomicInteger extends Number implements java.io.Serializable {
private static final long serialVersionUID = 6214790243416807050L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long VALUE;
-
+ private static final VarHandle VALUE;
static {
try {
- VALUE = U.objectFieldOffset
- (AtomicInteger.class.getDeclaredField("value"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ VALUE = l.findVarHandle(AtomicInteger.class, "value", int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -84,7 +82,8 @@
}
/**
- * Gets the current value.
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @return the current value
*/
@@ -93,7 +92,8 @@
}
/**
- * Sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param newValue the new value
*/
@@ -102,108 +102,122 @@
}
/**
- * Eventually sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(int newValue) {
- U.putIntRelease(this, VALUE, newValue);
+ VALUE.setRelease(this, newValue);
}
/**
- * Atomically sets to the given value and returns the old value.
+ * Atomically sets the value to {@code newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param newValue the new value
* @return the previous value
*/
public final int getAndSet(int newValue) {
- return U.getAndSetInt(this, VALUE, newValue);
+ return (int)VALUE.getAndSet(this, newValue);
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
+ * Atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful. False return indicates that
* the actual value was not equal to the expected value.
*/
- public final boolean compareAndSet(int expect, int update) {
- return U.compareAndSwapInt(this, VALUE, expect, update);
+ public final boolean compareAndSet(int expectedValue, int newValue) {
+ return VALUE.compareAndSet(this, expectedValue, newValue);
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
*
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
- *
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful
*/
- public final boolean weakCompareAndSet(int expect, int update) {
- return U.compareAndSwapInt(this, VALUE, expect, update);
+ public final boolean weakCompareAndSet(int expectedValue, int newValue) {
+ return VALUE.weakCompareAndSet(this, expectedValue, newValue);
}
/**
- * Atomically increments by one the current value.
+ * Atomically increments the current value,
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(1)}.
*
* @return the previous value
*/
public final int getAndIncrement() {
- return U.getAndAddInt(this, VALUE, 1);
+ return (int)VALUE.getAndAdd(this, 1);
}
/**
- * Atomically decrements by one the current value.
+ * Atomically decrements the current value,
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(-1)}.
*
* @return the previous value
*/
public final int getAndDecrement() {
- return U.getAndAddInt(this, VALUE, -1);
+ return (int)VALUE.getAndAdd(this, -1);
}
/**
- * Atomically adds the given value to the current value.
+ * Atomically adds the given value to the current value,
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
*
* @param delta the value to add
* @return the previous value
*/
public final int getAndAdd(int delta) {
- return U.getAndAddInt(this, VALUE, delta);
+ return (int)VALUE.getAndAdd(this, delta);
}
/**
- * Atomically increments by one the current value.
+ * Atomically increments the current value,
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(1)}.
*
* @return the updated value
*/
public final int incrementAndGet() {
- return U.getAndAddInt(this, VALUE, 1) + 1;
+ return (int)VALUE.addAndGet(this, 1);
}
/**
- * Atomically decrements by one the current value.
+ * Atomically decrements the current value,
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(-1)}.
*
* @return the updated value
*/
public final int decrementAndGet() {
- return U.getAndAddInt(this, VALUE, -1) - 1;
+ return (int)VALUE.addAndGet(this, -1);
}
/**
- * Atomically adds the given value to the current value.
+ * Atomically adds the given value to the current value,
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
*
* @param delta the value to add
* @return the updated value
*/
public final int addAndGet(int delta) {
- return U.getAndAddInt(this, VALUE, delta) + delta;
+ return (int)VALUE.addAndGet(this, delta);
}
/**
@@ -217,12 +231,14 @@
* @since 1.8
*/
public final int getAndUpdate(IntUnaryOperator updateFunction) {
- int prev, next;
- do {
- prev = get();
- next = updateFunction.applyAsInt(prev);
- } while (!compareAndSet(prev, next));
- return prev;
+ int prev = get(), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsInt(prev);
+ if (weakCompareAndSetVolatile(prev, next))
+ return prev;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -236,12 +252,14 @@
* @since 1.8
*/
public final int updateAndGet(IntUnaryOperator updateFunction) {
- int prev, next;
- do {
- prev = get();
- next = updateFunction.applyAsInt(prev);
- } while (!compareAndSet(prev, next));
- return next;
+ int prev = get(), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsInt(prev);
+ if (weakCompareAndSetVolatile(prev, next))
+ return next;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -260,12 +278,14 @@
*/
public final int getAndAccumulate(int x,
IntBinaryOperator accumulatorFunction) {
- int prev, next;
- do {
- prev = get();
- next = accumulatorFunction.applyAsInt(prev, x);
- } while (!compareAndSet(prev, next));
- return prev;
+ int prev = get(), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsInt(prev, x);
+ if (weakCompareAndSetVolatile(prev, next))
+ return prev;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -284,12 +304,14 @@
*/
public final int accumulateAndGet(int x,
IntBinaryOperator accumulatorFunction) {
- int prev, next;
- do {
- prev = get();
- next = accumulatorFunction.applyAsInt(prev, x);
- } while (!compareAndSet(prev, next));
- return next;
+ int prev = get(), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsInt(prev, x);
+ if (weakCompareAndSetVolatile(prev, next))
+ return next;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -301,7 +323,10 @@
}
/**
- * Returns the value of this {@code AtomicInteger} as an {@code int}.
+ * Returns the current value of this {@code AtomicInteger} as an
+ * {@code int},
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
+ *
* Equivalent to {@link #get()}.
*/
public int intValue() {
@@ -309,8 +334,9 @@
}
/**
- * Returns the value of this {@code AtomicInteger} as a {@code long}
- * after a widening primitive conversion.
+ * Returns the current value of this {@code AtomicInteger} as a
+ * {@code long} after a widening primitive conversion,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* @jls 5.1.2 Widening Primitive Conversions
*/
public long longValue() {
@@ -318,8 +344,9 @@
}
/**
- * Returns the value of this {@code AtomicInteger} as a {@code float}
- * after a widening primitive conversion.
+ * Returns the current value of this {@code AtomicInteger} as a
+ * {@code float} after a widening primitive conversion,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* @jls 5.1.2 Widening Primitive Conversions
*/
public float floatValue() {
@@ -327,12 +354,175 @@
}
/**
- * Returns the value of this {@code AtomicInteger} as a {@code double}
- * after a widening primitive conversion.
+ * Returns the current value of this {@code AtomicInteger} as a
+ * {@code double} after a widening primitive conversion,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* @jls 5.1.2 Widening Primitive Conversions
*/
public double doubleValue() {
return (double)get();
}
+ // jdk9
+
+ /**
+ * Returns the current value, with memory semantics of reading as
+ * if the variable was declared non-{@code volatile}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final int getPlain() {
+ return (int)VALUE.get(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue}, with memory semantics
+ * of setting as if the variable was declared non-{@code volatile}
+ * and non-{@code final}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(int newValue) {
+ VALUE.set(this, newValue);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final int getOpaque() {
+ return (int)VALUE.getOpaque(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(int newValue) {
+ VALUE.setOpaque(this, newValue);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final int getAcquire() {
+ return (int)VALUE.getAcquire(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(int newValue) {
+ VALUE.setRelease(this, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final int compareAndExchange(int expectedValue, int newValue) {
+ return (int)VALUE.compareAndExchange(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final int compareAndExchangeAcquire(int expectedValue, int newValue) {
+ return (int)VALUE.compareAndExchangeAcquire(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final int compareAndExchangeRelease(int expectedValue, int newValue) {
+ return (int)VALUE.compareAndExchangeRelease(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue} if
+ * the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(int expectedValue, int newValue) {
+ return VALUE.weakCompareAndSetVolatile(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue} if
+ * the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(int expectedValue, int newValue) {
+ return VALUE.weakCompareAndSetAcquire(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue} if
+ * the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(int expectedValue, int newValue) {
+ return VALUE.weakCompareAndSetRelease(this, expectedValue, newValue);
+ }
+
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,44 +35,24 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.function.IntBinaryOperator;
import java.util.function.IntUnaryOperator;
/**
* An {@code int} array in which elements may be updated atomically.
- * See the {@link java.util.concurrent.atomic} package
- * specification for description of the properties of atomic
- * variables.
+ * See the {@link VarHandle} specification for descriptions of the
+ * properties of atomic accesses.
* @since 1.5
* @author Doug Lea
*/
public class AtomicIntegerArray implements java.io.Serializable {
private static final long serialVersionUID = 2862133569453604235L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final int ABASE;
- private static final int ASHIFT;
+ private static final VarHandle AA
+ = MethodHandles.arrayElementVarHandle(int[].class);
private final int[] array;
- static {
- ABASE = U.arrayBaseOffset(int[].class);
- int scale = U.arrayIndexScale(int[].class);
- if ((scale & (scale - 1)) != 0)
- throw new Error("array index scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
- }
-
- private long checkedByteOffset(int i) {
- if (i < 0 || i >= array.length)
- throw new IndexOutOfBoundsException("index " + i);
-
- return byteOffset(i);
- }
-
- private static long byteOffset(int i) {
- return ((long) i << ASHIFT) + ABASE;
- }
-
/**
* Creates a new AtomicIntegerArray of the given length, with all
* elements initially zero.
@@ -105,147 +85,155 @@
}
/**
- * Gets the current value at position {@code i}.
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @param i the index
* @return the current value
*/
public final int get(int i) {
- return getRaw(checkedByteOffset(i));
- }
-
- private int getRaw(long offset) {
- return U.getIntVolatile(array, offset);
+ return (int)AA.getVolatile(array, i);
}
/**
- * Sets the element at position {@code i} to the given value.
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param i the index
* @param newValue the new value
*/
public final void set(int i, int newValue) {
- U.putIntVolatile(array, checkedByteOffset(i), newValue);
+ AA.setVolatile(array, i, newValue);
}
/**
- * Eventually sets the element at position {@code i} to the given value.
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param i the index
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(int i, int newValue) {
- U.putIntRelease(array, checkedByteOffset(i), newValue);
+ AA.setRelease(array, i, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * value and returns the old value.
+ * Atomically sets the element at index {@code i} to {@code
+ * newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param i the index
* @param newValue the new value
* @return the previous value
*/
public final int getAndSet(int i, int newValue) {
- return U.getAndSetInt(array, checkedByteOffset(i), newValue);
+ return (int)AA.getAndSet(array, i, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * updated value if the current value {@code ==} the expected value.
+ * Atomically sets the element at index {@code i} to {@code
+ * newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
* @param i the index
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful. False return indicates that
* the actual value was not equal to the expected value.
*/
- public final boolean compareAndSet(int i, int expect, int update) {
- return compareAndSetRaw(checkedByteOffset(i), expect, update);
- }
-
- private boolean compareAndSetRaw(long offset, int expect, int update) {
- return U.compareAndSwapInt(array, offset, expect, update);
+ public final boolean compareAndSet(int i, int expectedValue, int newValue) {
+ return AA.compareAndSet(array, i, expectedValue, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * updated value if the current value {@code ==} the expected value.
- *
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
*
* @param i the index
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful
*/
- public final boolean weakCompareAndSet(int i, int expect, int update) {
- return compareAndSet(i, expect, update);
+ public final boolean weakCompareAndSet(int i, int expectedValue, int newValue) {
+ return AA.weakCompareAndSet(array, i, expectedValue, newValue);
}
/**
- * Atomically increments by one the element at index {@code i}.
+ * Atomically increments the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(i, 1)}.
*
* @param i the index
* @return the previous value
*/
public final int getAndIncrement(int i) {
- return getAndAdd(i, 1);
+ return (int)AA.getAndAdd(array, i, 1);
}
/**
- * Atomically decrements by one the element at index {@code i}.
+ * Atomically decrements the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(i, -1)}.
*
* @param i the index
* @return the previous value
*/
public final int getAndDecrement(int i) {
- return getAndAdd(i, -1);
+ return (int)AA.getAndAdd(array, i, -1);
}
/**
- * Atomically adds the given value to the element at index {@code i}.
+ * Atomically adds the given value to the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
*
* @param i the index
* @param delta the value to add
* @return the previous value
*/
public final int getAndAdd(int i, int delta) {
- return U.getAndAddInt(array, checkedByteOffset(i), delta);
+ return (int)AA.getAndAdd(array, i, delta);
}
/**
- * Atomically increments by one the element at index {@code i}.
+ * Atomically increments the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(i, 1)}.
*
* @param i the index
* @return the updated value
*/
public final int incrementAndGet(int i) {
- return getAndAdd(i, 1) + 1;
+ return (int)AA.addAndGet(array, i, 1);
}
/**
- * Atomically decrements by one the element at index {@code i}.
+ * Atomically decrements the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(i, -1)}.
*
* @param i the index
* @return the updated value
*/
public final int decrementAndGet(int i) {
- return getAndAdd(i, -1) - 1;
+ return (int)AA.addAndGet(array, i, -1);
}
/**
- * Atomically adds the given value to the element at index {@code i}.
+ * Atomically adds the given value to the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
*
* @param i the index
* @param delta the value to add
* @return the updated value
*/
public final int addAndGet(int i, int delta) {
- return getAndAdd(i, delta) + delta;
+ return (int)AA.addAndGet(array, i, delta);
}
/**
@@ -260,13 +248,14 @@
* @since 1.8
*/
public final int getAndUpdate(int i, IntUnaryOperator updateFunction) {
- long offset = checkedByteOffset(i);
- int prev, next;
- do {
- prev = getRaw(offset);
- next = updateFunction.applyAsInt(prev);
- } while (!compareAndSetRaw(offset, prev, next));
- return prev;
+ int prev = get(i), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsInt(prev);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return prev;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
@@ -281,23 +270,25 @@
* @since 1.8
*/
public final int updateAndGet(int i, IntUnaryOperator updateFunction) {
- long offset = checkedByteOffset(i);
- int prev, next;
- do {
- prev = getRaw(offset);
- next = updateFunction.applyAsInt(prev);
- } while (!compareAndSetRaw(offset, prev, next));
- return next;
+ int prev = get(i), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsInt(prev);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return next;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
* Atomically updates the element at index {@code i} with the
- * results of applying the given function to the current and
- * given values, returning the previous value. The function should
- * be side-effect-free, since it may be re-applied when attempted
+ * results of applying the given function to the current and given
+ * values, returning the previous value. The function should be
+ * side-effect-free, since it may be re-applied when attempted
* updates fail due to contention among threads. The function is
- * applied with the current value at index {@code i} as its first
- * argument, and the given update as the second argument.
+ * applied with the current value of the element at index {@code i}
+ * as its first argument, and the given update as the second
+ * argument.
*
* @param i the index
* @param x the update value
@@ -307,23 +298,25 @@
*/
public final int getAndAccumulate(int i, int x,
IntBinaryOperator accumulatorFunction) {
- long offset = checkedByteOffset(i);
- int prev, next;
- do {
- prev = getRaw(offset);
- next = accumulatorFunction.applyAsInt(prev, x);
- } while (!compareAndSetRaw(offset, prev, next));
- return prev;
+ int prev = get(i), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsInt(prev, x);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return prev;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
* Atomically updates the element at index {@code i} with the
- * results of applying the given function to the current and
- * given values, returning the updated value. The function should
- * be side-effect-free, since it may be re-applied when attempted
+ * results of applying the given function to the current and given
+ * values, returning the updated value. The function should be
+ * side-effect-free, since it may be re-applied when attempted
* updates fail due to contention among threads. The function is
- * applied with the current value at index {@code i} as its first
- * argument, and the given update as the second argument.
+ * applied with the current value of the element at index {@code i}
+ * as its first argument, and the given update as the second
+ * argument.
*
* @param i the index
* @param x the update value
@@ -333,13 +326,14 @@
*/
public final int accumulateAndGet(int i, int x,
IntBinaryOperator accumulatorFunction) {
- long offset = checkedByteOffset(i);
- int prev, next;
- do {
- prev = getRaw(offset);
- next = accumulatorFunction.applyAsInt(prev, x);
- } while (!compareAndSetRaw(offset, prev, next));
- return next;
+ int prev = get(i), next = 0;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsInt(prev, x);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return next;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
@@ -354,11 +348,190 @@
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
- b.append(getRaw(byteOffset(i)));
+ b.append(get(i));
if (i == iMax)
return b.append(']').toString();
b.append(',').append(' ');
}
}
+ // jdk9
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory semantics of reading as if the variable was declared
+ * non-{@code volatile}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final int getPlain(int i) {
+ return (int)AA.get(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory semantics of setting as if the variable was
+ * declared non-{@code volatile} and non-{@code final}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(int i, int newValue) {
+ AA.set(array, i, newValue);
+ }
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final int getOpaque(int i) {
+ return (int)AA.getOpaque(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(int i, int newValue) {
+ AA.setOpaque(array, i, newValue);
+ }
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final int getAcquire(int i) {
+ return (int)AA.getAcquire(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(int i, int newValue) {
+ AA.setRelease(array, i, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final int compareAndExchange(int i, int expectedValue, int newValue) {
+ return (int)AA.compareAndExchange(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final int compareAndExchangeAcquire(int i, int expectedValue, int newValue) {
+ return (int)AA.compareAndExchangeAcquire(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final int compareAndExchangeRelease(int i, int expectedValue, int newValue) {
+ return (int)AA.compareAndExchangeRelease(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(int i, int expectedValue, int newValue) {
+ return AA.weakCompareAndSetVolatile(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(int i, int expectedValue, int newValue) {
+ return AA.weakCompareAndSetAcquire(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(int i, int expectedValue, int newValue) {
+ return AA.weakCompareAndSetRelease(array, i, expectedValue, newValue);
+ }
+
+
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java Thu Jul 21 17:13:23 2016 +0000
@@ -42,6 +42,7 @@
import java.security.PrivilegedExceptionAction;
import java.util.function.IntBinaryOperator;
import java.util.function.IntUnaryOperator;
+import jdk.internal.misc.Unsafe;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@@ -150,8 +151,8 @@
public abstract void lazySet(T obj, int newValue);
/**
- * Gets the current value held in the field of the given object managed
- * by this updater.
+ * Returns the current value held in the field of the given object
+ * managed by this updater.
*
* @param obj An object whose field to get
* @return the current value
@@ -367,7 +368,7 @@
*/
private static final class AtomicIntegerFieldUpdaterImpl<T>
extends AtomicIntegerFieldUpdater<T> {
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private final long offset;
/**
* if field is protected, the subclass constructing updater, else
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,31 +35,30 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.function.LongBinaryOperator;
import java.util.function.LongUnaryOperator;
/**
* A {@code long} value that may be updated atomically. See the
- * {@link java.util.concurrent.atomic} package specification for
- * description of the properties of atomic variables. An
- * {@code AtomicLong} is used in applications such as atomically
- * incremented sequence numbers, and cannot be used as a replacement
- * for a {@link java.lang.Long}. However, this class does extend
- * {@code Number} to allow uniform access by tools and utilities that
- * deal with numerically-based classes.
+ * {@link VarHandle} specification for descriptions of the properties
+ * of atomic accesses. An {@code AtomicLong} is used in applications
+ * such as atomically incremented sequence numbers, and cannot be used
+ * as a replacement for a {@link java.lang.Long}. However, this class
+ * does extend {@code Number} to allow uniform access by tools and
+ * utilities that deal with numerically-based classes.
*
* @since 1.5
* @author Doug Lea
*/
public class AtomicLong extends Number implements java.io.Serializable {
private static final long serialVersionUID = 1927816293512124184L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long VALUE;
+ private static final VarHandle VALUE;
/**
* Records whether the underlying JVM supports lockless
- * compareAndSwap for longs. While the Unsafe.compareAndSwapLong
+ * compareAndSwap for longs. While the intrinsic compareAndSwapLong
* method works in either case, some constructions should be
* handled at Java level to avoid locking user-visible locks.
*/
@@ -73,8 +72,8 @@
static {
try {
- VALUE = U.objectFieldOffset
- (AtomicLong.class.getDeclaredField("value"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ VALUE = l.findVarHandle(AtomicLong.class, "value", long.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -98,7 +97,8 @@
}
/**
- * Gets the current value.
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @return the current value
*/
@@ -107,119 +107,132 @@
}
/**
- * Sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param newValue the new value
*/
public final void set(long newValue) {
- // Use putLongVolatile instead of ordinary volatile store when
- // using compareAndSwapLong, for sake of some 32bit systems.
- U.putLongVolatile(this, VALUE, newValue);
+ VALUE.setVolatile(this, newValue);
}
/**
- * Eventually sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(long newValue) {
- U.putLongRelease(this, VALUE, newValue);
+ VALUE.setRelease(this, newValue);
}
/**
- * Atomically sets to the given value and returns the old value.
+ * Atomically sets the value to {@code newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param newValue the new value
* @return the previous value
*/
public final long getAndSet(long newValue) {
- return U.getAndSetLong(this, VALUE, newValue);
+ return (long)VALUE.getAndSet(this, newValue);
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
+ * Atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful. False return indicates that
* the actual value was not equal to the expected value.
*/
- public final boolean compareAndSet(long expect, long update) {
- return U.compareAndSwapLong(this, VALUE, expect, update);
+ public final boolean compareAndSet(long expectedValue, long newValue) {
+ return VALUE.compareAndSet(this, expectedValue, newValue);
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
*
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
- *
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful
*/
- public final boolean weakCompareAndSet(long expect, long update) {
- return U.compareAndSwapLong(this, VALUE, expect, update);
+ public final boolean weakCompareAndSet(long expectedValue, long newValue) {
+ return VALUE.weakCompareAndSet(this, expectedValue, newValue);
}
/**
- * Atomically increments by one the current value.
+ * Atomically increments the current value,
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(1)}.
*
* @return the previous value
*/
public final long getAndIncrement() {
- return U.getAndAddLong(this, VALUE, 1L);
+ return (long)VALUE.getAndAdd(this, 1L);
}
/**
- * Atomically decrements by one the current value.
+ * Atomically decrements the current value,
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(-1)}.
*
* @return the previous value
*/
public final long getAndDecrement() {
- return U.getAndAddLong(this, VALUE, -1L);
+ return (long)VALUE.getAndAdd(this, -1L);
}
/**
- * Atomically adds the given value to the current value.
+ * Atomically adds the given value to the current value,
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
*
* @param delta the value to add
* @return the previous value
*/
public final long getAndAdd(long delta) {
- return U.getAndAddLong(this, VALUE, delta);
+ return (long)VALUE.getAndAdd(this, delta);
}
/**
- * Atomically increments by one the current value.
+ * Atomically increments the current value,
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(1)}.
*
* @return the updated value
*/
public final long incrementAndGet() {
- return U.getAndAddLong(this, VALUE, 1L) + 1L;
+ return (long)VALUE.addAndGet(this, 1L);
}
/**
- * Atomically decrements by one the current value.
+ * Atomically decrements the current value,
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(-1)}.
*
* @return the updated value
*/
public final long decrementAndGet() {
- return U.getAndAddLong(this, VALUE, -1L) - 1L;
+ return (long)VALUE.addAndGet(this, -1L);
}
/**
- * Atomically adds the given value to the current value.
+ * Atomically adds the given value to the current value,
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
*
* @param delta the value to add
* @return the updated value
*/
public final long addAndGet(long delta) {
- return U.getAndAddLong(this, VALUE, delta) + delta;
+ return (long)VALUE.addAndGet(this, delta);
}
/**
@@ -233,12 +246,14 @@
* @since 1.8
*/
public final long getAndUpdate(LongUnaryOperator updateFunction) {
- long prev, next;
- do {
- prev = get();
- next = updateFunction.applyAsLong(prev);
- } while (!compareAndSet(prev, next));
- return prev;
+ long prev = get(), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsLong(prev);
+ if (weakCompareAndSetVolatile(prev, next))
+ return prev;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -252,12 +267,14 @@
* @since 1.8
*/
public final long updateAndGet(LongUnaryOperator updateFunction) {
- long prev, next;
- do {
- prev = get();
- next = updateFunction.applyAsLong(prev);
- } while (!compareAndSet(prev, next));
- return next;
+ long prev = get(), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsLong(prev);
+ if (weakCompareAndSetVolatile(prev, next))
+ return next;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -276,12 +293,14 @@
*/
public final long getAndAccumulate(long x,
LongBinaryOperator accumulatorFunction) {
- long prev, next;
- do {
- prev = get();
- next = accumulatorFunction.applyAsLong(prev, x);
- } while (!compareAndSet(prev, next));
- return prev;
+ long prev = get(), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsLong(prev, x);
+ if (weakCompareAndSetVolatile(prev, next))
+ return prev;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -300,12 +319,14 @@
*/
public final long accumulateAndGet(long x,
LongBinaryOperator accumulatorFunction) {
- long prev, next;
- do {
- prev = get();
- next = accumulatorFunction.applyAsLong(prev, x);
- } while (!compareAndSet(prev, next));
- return next;
+ long prev = get(), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsLong(prev, x);
+ if (weakCompareAndSetVolatile(prev, next))
+ return next;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -317,8 +338,9 @@
}
/**
- * Returns the value of this {@code AtomicLong} as an {@code int}
- * after a narrowing primitive conversion.
+ * Returns the current value of this {@code AtomicLong} as an {@code int}
+ * after a narrowing primitive conversion,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* @jls 5.1.3 Narrowing Primitive Conversions
*/
public int intValue() {
@@ -326,7 +348,8 @@
}
/**
- * Returns the value of this {@code AtomicLong} as a {@code long}.
+ * Returns the current value of this {@code AtomicLong} as a {@code long},
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* Equivalent to {@link #get()}.
*/
public long longValue() {
@@ -334,8 +357,9 @@
}
/**
- * Returns the value of this {@code AtomicLong} as a {@code float}
- * after a widening primitive conversion.
+ * Returns the current value of this {@code AtomicLong} as a {@code float}
+ * after a widening primitive conversion,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* @jls 5.1.2 Widening Primitive Conversions
*/
public float floatValue() {
@@ -343,12 +367,175 @@
}
/**
- * Returns the value of this {@code AtomicLong} as a {@code double}
- * after a widening primitive conversion.
+ * Returns the current value of this {@code AtomicLong} as a {@code double}
+ * after a widening primitive conversion,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
* @jls 5.1.2 Widening Primitive Conversions
*/
public double doubleValue() {
return (double)get();
}
+ // jdk9
+
+ /**
+ * Returns the current value, with memory semantics of reading as if the
+ * variable was declared non-{@code volatile}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final long getPlain() {
+ return (long)VALUE.get(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue}, with memory semantics
+ * of setting as if the variable was declared non-{@code volatile}
+ * and non-{@code final}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(long newValue) {
+ VALUE.set(this, newValue);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final long getOpaque() {
+ return (long)VALUE.getOpaque(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(long newValue) {
+ VALUE.setOpaque(this, newValue);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final long getAcquire() {
+ return (long)VALUE.getAcquire(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(long newValue) {
+ VALUE.setRelease(this, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final long compareAndExchange(long expectedValue, long newValue) {
+ return (long)VALUE.compareAndExchange(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final long compareAndExchangeAcquire(long expectedValue, long newValue) {
+ return (long)VALUE.compareAndExchangeAcquire(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final long compareAndExchangeRelease(long expectedValue, long newValue) {
+ return (long)VALUE.compareAndExchangeRelease(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(long expectedValue, long newValue) {
+ return VALUE.weakCompareAndSetVolatile(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(long expectedValue, long newValue) {
+ return VALUE.weakCompareAndSetAcquire(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(long expectedValue, long newValue) {
+ return VALUE.weakCompareAndSetRelease(this, expectedValue, newValue);
+ }
+
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,43 +35,24 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.function.LongBinaryOperator;
import java.util.function.LongUnaryOperator;
/**
* A {@code long} array in which elements may be updated atomically.
- * See the {@link java.util.concurrent.atomic} package specification
- * for description of the properties of atomic variables.
+ * See the {@link VarHandle} specification for descriptions of the
+ * properties of atomic accesses.
* @since 1.5
* @author Doug Lea
*/
public class AtomicLongArray implements java.io.Serializable {
private static final long serialVersionUID = -2308431214976778248L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final int ABASE;
- private static final int ASHIFT;
+ private static final VarHandle AA
+ = MethodHandles.arrayElementVarHandle(long[].class);
private final long[] array;
- static {
- ABASE = U.arrayBaseOffset(long[].class);
- int scale = U.arrayIndexScale(long[].class);
- if ((scale & (scale - 1)) != 0)
- throw new Error("array index scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
- }
-
- private long checkedByteOffset(int i) {
- if (i < 0 || i >= array.length)
- throw new IndexOutOfBoundsException("index " + i);
-
- return byteOffset(i);
- }
-
- private static long byteOffset(int i) {
- return ((long) i << ASHIFT) + ABASE;
- }
-
/**
* Creates a new AtomicLongArray of the given length, with all
* elements initially zero.
@@ -104,147 +85,155 @@
}
/**
- * Gets the current value at position {@code i}.
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @param i the index
* @return the current value
*/
public final long get(int i) {
- return getRaw(checkedByteOffset(i));
- }
-
- private long getRaw(long offset) {
- return U.getLongVolatile(array, offset);
+ return (long)AA.getVolatile(array, i);
}
/**
- * Sets the element at position {@code i} to the given value.
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param i the index
* @param newValue the new value
*/
public final void set(int i, long newValue) {
- U.putLongVolatile(array, checkedByteOffset(i), newValue);
+ AA.setVolatile(array, i, newValue);
}
/**
- * Eventually sets the element at position {@code i} to the given value.
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param i the index
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(int i, long newValue) {
- U.putLongRelease(array, checkedByteOffset(i), newValue);
+ AA.setRelease(array, i, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given value
- * and returns the old value.
+ * Atomically sets the element at index {@code i} to {@code
+ * newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param i the index
* @param newValue the new value
* @return the previous value
*/
public final long getAndSet(int i, long newValue) {
- return U.getAndSetLong(array, checkedByteOffset(i), newValue);
+ return (long)AA.getAndSet(array, i, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * updated value if the current value {@code ==} the expected value.
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
* @param i the index
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful. False return indicates that
* the actual value was not equal to the expected value.
*/
- public final boolean compareAndSet(int i, long expect, long update) {
- return compareAndSetRaw(checkedByteOffset(i), expect, update);
- }
-
- private boolean compareAndSetRaw(long offset, long expect, long update) {
- return U.compareAndSwapLong(array, offset, expect, update);
+ public final boolean compareAndSet(int i, long expectedValue, long newValue) {
+ return AA.compareAndSet(array, i, expectedValue, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * updated value if the current value {@code ==} the expected value.
- *
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
*
* @param i the index
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful
*/
- public final boolean weakCompareAndSet(int i, long expect, long update) {
- return compareAndSet(i, expect, update);
+ public final boolean weakCompareAndSet(int i, long expectedValue, long newValue) {
+ return AA.weakCompareAndSet(array, i, expectedValue, newValue);
}
/**
- * Atomically increments by one the element at index {@code i}.
+ * Atomically increments the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(i, 1)}.
*
* @param i the index
* @return the previous value
*/
public final long getAndIncrement(int i) {
- return getAndAdd(i, 1);
+ return (long)AA.getAndAdd(array, i, 1L);
}
/**
- * Atomically decrements by one the element at index {@code i}.
+ * Atomically decrements the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
+ *
+ * <p>Equivalent to {@code getAndAdd(i, -1)}.
*
* @param i the index
* @return the previous value
*/
public final long getAndDecrement(int i) {
- return getAndAdd(i, -1);
+ return (long)AA.getAndAdd(array, i, -1L);
}
/**
- * Atomically adds the given value to the element at index {@code i}.
+ * Atomically adds the given value to the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
*
* @param i the index
* @param delta the value to add
* @return the previous value
*/
public final long getAndAdd(int i, long delta) {
- return U.getAndAddLong(array, checkedByteOffset(i), delta);
+ return (long)AA.getAndAdd(array, i, delta);
}
/**
- * Atomically increments by one the element at index {@code i}.
+ * Atomically increments the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(i, 1)}.
*
* @param i the index
* @return the updated value
*/
public final long incrementAndGet(int i) {
- return getAndAdd(i, 1) + 1;
+ return (long)AA.addAndGet(array, i, 1L);
}
/**
- * Atomically decrements by one the element at index {@code i}.
+ * Atomically decrements the value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
+ *
+ * <p>Equivalent to {@code addAndGet(i, -1)}.
*
* @param i the index
* @return the updated value
*/
public final long decrementAndGet(int i) {
- return getAndAdd(i, -1) - 1;
+ return (long)AA.addAndGet(array, i, -1L);
}
/**
- * Atomically adds the given value to the element at index {@code i}.
+ * Atomically adds the given value to the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#addAndGet}.
*
* @param i the index
* @param delta the value to add
* @return the updated value
*/
public long addAndGet(int i, long delta) {
- return getAndAdd(i, delta) + delta;
+ return (long)AA.addAndGet(array, i, delta);
}
/**
@@ -259,13 +248,14 @@
* @since 1.8
*/
public final long getAndUpdate(int i, LongUnaryOperator updateFunction) {
- long offset = checkedByteOffset(i);
- long prev, next;
- do {
- prev = getRaw(offset);
- next = updateFunction.applyAsLong(prev);
- } while (!compareAndSetRaw(offset, prev, next));
- return prev;
+ long prev = get(i), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsLong(prev);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return prev;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
@@ -280,23 +270,25 @@
* @since 1.8
*/
public final long updateAndGet(int i, LongUnaryOperator updateFunction) {
- long offset = checkedByteOffset(i);
- long prev, next;
- do {
- prev = getRaw(offset);
- next = updateFunction.applyAsLong(prev);
- } while (!compareAndSetRaw(offset, prev, next));
- return next;
+ long prev = get(i), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.applyAsLong(prev);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return next;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
* Atomically updates the element at index {@code i} with the
- * results of applying the given function to the current and
- * given values, returning the previous value. The function should
- * be side-effect-free, since it may be re-applied when attempted
+ * results of applying the given function to the current and given
+ * values, returning the previous value. The function should be
+ * side-effect-free, since it may be re-applied when attempted
* updates fail due to contention among threads. The function is
- * applied with the current value at index {@code i} as its first
- * argument, and the given update as the second argument.
+ * applied with the current value of the element at index {@code i}
+ * as its first argument, and the given update as the second
+ * argument.
*
* @param i the index
* @param x the update value
@@ -306,23 +298,25 @@
*/
public final long getAndAccumulate(int i, long x,
LongBinaryOperator accumulatorFunction) {
- long offset = checkedByteOffset(i);
- long prev, next;
- do {
- prev = getRaw(offset);
- next = accumulatorFunction.applyAsLong(prev, x);
- } while (!compareAndSetRaw(offset, prev, next));
- return prev;
+ long prev = get(i), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsLong(prev, x);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return prev;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
* Atomically updates the element at index {@code i} with the
- * results of applying the given function to the current and
- * given values, returning the updated value. The function should
- * be side-effect-free, since it may be re-applied when attempted
+ * results of applying the given function to the current and given
+ * values, returning the updated value. The function should be
+ * side-effect-free, since it may be re-applied when attempted
* updates fail due to contention among threads. The function is
- * applied with the current value at index {@code i} as its first
- * argument, and the given update as the second argument.
+ * applied with the current value of the element at index {@code i}
+ * as its first argument, and the given update as the second
+ * argument.
*
* @param i the index
* @param x the update value
@@ -332,13 +326,14 @@
*/
public final long accumulateAndGet(int i, long x,
LongBinaryOperator accumulatorFunction) {
- long offset = checkedByteOffset(i);
- long prev, next;
- do {
- prev = getRaw(offset);
- next = accumulatorFunction.applyAsLong(prev, x);
- } while (!compareAndSetRaw(offset, prev, next));
- return next;
+ long prev = get(i), next = 0L;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.applyAsLong(prev, x);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return next;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
@@ -353,11 +348,189 @@
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
- b.append(getRaw(byteOffset(i)));
+ b.append(get(i));
if (i == iMax)
return b.append(']').toString();
b.append(',').append(' ');
}
}
+ // jdk9
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory semantics of reading as if the variable was declared
+ * non-{@code volatile}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final long getPlain(int i) {
+ return (long)AA.get(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory semantics of setting as if the variable was
+ * declared non-{@code volatile} and non-{@code final}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(int i, long newValue) {
+ AA.set(array, i, newValue);
+ }
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final long getOpaque(int i) {
+ return (long)AA.getOpaque(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(int i, long newValue) {
+ AA.setOpaque(array, i, newValue);
+ }
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final long getAcquire(int i) {
+ return (long)AA.getAcquire(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(int i, long newValue) {
+ AA.setRelease(array, i, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final long compareAndExchange(int i, long expectedValue, long newValue) {
+ return (long)AA.compareAndExchange(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final long compareAndExchangeAcquire(int i, long expectedValue, long newValue) {
+ return (long)AA.compareAndExchangeAcquire(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final long compareAndExchangeRelease(int i, long expectedValue, long newValue) {
+ return (long)AA.compareAndExchangeRelease(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(int i, long expectedValue, long newValue) {
+ return AA.weakCompareAndSetVolatile(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(int i, long expectedValue, long newValue) {
+ return AA.weakCompareAndSetAcquire(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(int i, long expectedValue, long newValue) {
+ return AA.weakCompareAndSetRelease(array, i, expectedValue, newValue);
+ }
+
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java Thu Jul 21 17:13:23 2016 +0000
@@ -42,6 +42,7 @@
import java.security.PrivilegedExceptionAction;
import java.util.function.LongBinaryOperator;
import java.util.function.LongUnaryOperator;
+import jdk.internal.misc.Unsafe;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@@ -153,8 +154,8 @@
public abstract void lazySet(T obj, long newValue);
/**
- * Gets the current value held in the field of the given object managed
- * by this updater.
+ * Returns the current value held in the field of the given object
+ * managed by this updater.
*
* @param obj An object whose field to get
* @return the current value
@@ -366,7 +367,7 @@
}
private static final class CASUpdater<T> extends AtomicLongFieldUpdater<T> {
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private final long offset;
/**
* if field is protected, the subclass constructing updater, else
@@ -497,7 +498,7 @@
}
private static final class LockedUpdater<T> extends AtomicLongFieldUpdater<T> {
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private final long offset;
/**
* if field is protected, the subclass constructing updater, else
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,9 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
/**
* An {@code AtomicMarkableReference} maintains an object reference
* along with a mark bit, that can be updated atomically.
@@ -188,20 +191,19 @@
casPair(current, Pair.of(expectedReference, newMark)));
}
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long PAIR;
+ // VarHandle mechanics
+ private static final VarHandle PAIR;
static {
try {
- PAIR = U.objectFieldOffset
- (AtomicMarkableReference.class.getDeclaredField("pair"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ PAIR = l.findVarHandle(AtomicMarkableReference.class, "pair",
+ Pair.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
}
private boolean casPair(Pair<V> cmp, Pair<V> val) {
- return U.compareAndSwapObject(this, PAIR, cmp, val);
+ return PAIR.compareAndSet(this, cmp, val);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,33 +35,32 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.function.BinaryOperator;
import java.util.function.UnaryOperator;
/**
- * An object reference that may be updated atomically. See the {@link
- * java.util.concurrent.atomic} package specification for description
- * of the properties of atomic variables.
+ * An object reference that may be updated atomically. See the {@link
+ * VarHandle} specification for descriptions of the properties of
+ * atomic accesses.
* @since 1.5
* @author Doug Lea
* @param <V> The type of object referred to by this reference
*/
public class AtomicReference<V> implements java.io.Serializable {
private static final long serialVersionUID = -1848883965231344442L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long VALUE;
-
+ private static final VarHandle VALUE;
static {
try {
- VALUE = U.objectFieldOffset
- (AtomicReference.class.getDeclaredField("value"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ VALUE = l.findVarHandle(AtomicReference.class, "value", Object.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
}
- private volatile V value;
+ private volatile Object value;
/**
* Creates a new AtomicReference with the given initial value.
@@ -79,16 +78,19 @@
}
/**
- * Gets the current value.
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @return the current value
*/
+ @SuppressWarnings("unchecked")
public final V get() {
- return value;
+ return (V)value;
}
/**
- * Sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param newValue the new value
*/
@@ -97,52 +99,53 @@
}
/**
- * Eventually sets to the given value.
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(V newValue) {
- U.putObjectRelease(this, VALUE, newValue);
- }
-
- /**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
- * @param expect the expected value
- * @param update the new value
- * @return {@code true} if successful. False return indicates that
- * the actual value was not equal to the expected value.
- */
- public final boolean compareAndSet(V expect, V update) {
- return U.compareAndSwapObject(this, VALUE, expect, update);
+ VALUE.setRelease(this, newValue);
}
/**
- * Atomically sets the value to the given updated value
- * if the current value {@code ==} the expected value.
- *
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
+ * Atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
- * @param expect the expected value
- * @param update the new value
- * @return {@code true} if successful
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful. False return indicates that
+ * the actual value was not equal to the expected value.
*/
- public final boolean weakCompareAndSet(V expect, V update) {
- return U.compareAndSwapObject(this, VALUE, expect, update);
+ public final boolean compareAndSet(V expectedValue, V newValue) {
+ return VALUE.compareAndSet(this, expectedValue, newValue);
}
/**
- * Atomically sets to the given value and returns the old value.
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ */
+ public final boolean weakCompareAndSet(V expectedValue, V newValue) {
+ return VALUE.weakCompareAndSet(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param newValue the new value
* @return the previous value
*/
@SuppressWarnings("unchecked")
public final V getAndSet(V newValue) {
- return (V)U.getAndSetObject(this, VALUE, newValue);
+ return (V)VALUE.getAndSet(this, newValue);
}
/**
@@ -156,12 +159,14 @@
* @since 1.8
*/
public final V getAndUpdate(UnaryOperator<V> updateFunction) {
- V prev, next;
- do {
- prev = get();
- next = updateFunction.apply(prev);
- } while (!compareAndSet(prev, next));
- return prev;
+ V prev = get(), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.apply(prev);
+ if (weakCompareAndSetVolatile(prev, next))
+ return prev;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -175,12 +180,14 @@
* @since 1.8
*/
public final V updateAndGet(UnaryOperator<V> updateFunction) {
- V prev, next;
- do {
- prev = get();
- next = updateFunction.apply(prev);
- } while (!compareAndSet(prev, next));
- return next;
+ V prev = get(), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.apply(prev);
+ if (weakCompareAndSetVolatile(prev, next))
+ return next;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -199,12 +206,14 @@
*/
public final V getAndAccumulate(V x,
BinaryOperator<V> accumulatorFunction) {
- V prev, next;
- do {
- prev = get();
- next = accumulatorFunction.apply(prev, x);
- } while (!compareAndSet(prev, next));
- return prev;
+ V prev = get(), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.apply(prev, x);
+ if (weakCompareAndSetVolatile(prev, next))
+ return prev;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -223,12 +232,14 @@
*/
public final V accumulateAndGet(V x,
BinaryOperator<V> accumulatorFunction) {
- V prev, next;
- do {
- prev = get();
- next = accumulatorFunction.apply(prev, x);
- } while (!compareAndSet(prev, next));
- return next;
+ V prev = get(), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.apply(prev, x);
+ if (weakCompareAndSetVolatile(prev, next))
+ return next;
+ haveNext = (prev == (prev = get()));
+ }
}
/**
@@ -239,4 +250,166 @@
return String.valueOf(get());
}
+ // jdk9
+
+ /**
+ * Returns the current value, with memory semantics of reading as
+ * if the variable was declared non-{@code volatile}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final V getPlain() {
+ return (V)VALUE.get(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue}, with memory semantics
+ * of setting as if the variable was declared non-{@code volatile}
+ * and non-{@code final}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(V newValue) {
+ VALUE.set(this, newValue);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final V getOpaque() {
+ return (V)VALUE.getOpaque(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(V newValue) {
+ VALUE.setOpaque(this, newValue);
+ }
+
+ /**
+ * Returns the current value,
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @return the value
+ * @since 9
+ */
+ public final V getAcquire() {
+ return (V)VALUE.getAcquire(this);
+ }
+
+ /**
+ * Sets the value to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(V newValue) {
+ VALUE.setRelease(this, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final V compareAndExchange(V expectedValue, V newValue) {
+ return (V)VALUE.compareAndExchange(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final V compareAndExchangeAcquire(V expectedValue, V newValue) {
+ return (V)VALUE.compareAndExchangeAcquire(this, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the value to {@code newValue} if the current value,
+ * referred to as the <em>witness value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final V compareAndExchangeRelease(V expectedValue, V newValue) {
+ return (V)VALUE.compareAndExchangeRelease(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(V expectedValue, V newValue) {
+ return VALUE.weakCompareAndSetVolatile(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(V expectedValue, V newValue) {
+ return VALUE.weakCompareAndSetAcquire(this, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the value to {@code newValue}
+ * if the current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(V expectedValue, V newValue) {
+ return VALUE.weakCompareAndSetRelease(this, expectedValue, newValue);
+ }
+
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,54 +35,28 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.lang.reflect.Array;
+import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.function.BinaryOperator;
import java.util.function.UnaryOperator;
/**
* An array of object references in which elements may be updated
- * atomically. See the {@link java.util.concurrent.atomic} package
- * specification for description of the properties of atomic
- * variables.
+ * atomically. See the {@link VarHandle} specification for
+ * descriptions of the properties of atomic accesses.
* @since 1.5
* @author Doug Lea
* @param <E> The base class of elements held in this array
*/
public class AtomicReferenceArray<E> implements java.io.Serializable {
private static final long serialVersionUID = -6209656149925076980L;
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long ARRAY;
- private static final int ABASE;
- private static final int ASHIFT;
+ private static final VarHandle AA
+ = MethodHandles.arrayElementVarHandle(Object[].class);
private final Object[] array; // must have exact type Object[]
- static {
- try {
- ARRAY = U.objectFieldOffset
- (AtomicReferenceArray.class.getDeclaredField("array"));
- ABASE = U.arrayBaseOffset(Object[].class);
- int scale = U.arrayIndexScale(Object[].class);
- if ((scale & (scale - 1)) != 0)
- throw new Error("array index scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
- } catch (ReflectiveOperationException e) {
- throw new Error(e);
- }
- }
-
- private long checkedByteOffset(int i) {
- if (i < 0 || i >= array.length)
- throw new IndexOutOfBoundsException("index " + i);
-
- return byteOffset(i);
- }
-
- private static long byteOffset(int i) {
- return ((long) i << ASHIFT) + ABASE;
- }
-
/**
* Creates a new AtomicReferenceArray of the given length, with all
* elements initially null.
@@ -115,44 +89,44 @@
}
/**
- * Gets the current value at position {@code i}.
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getVolatile}.
*
* @param i the index
* @return the current value
*/
+ @SuppressWarnings("unchecked")
public final E get(int i) {
- return getRaw(checkedByteOffset(i));
- }
-
- @SuppressWarnings("unchecked")
- private E getRaw(long offset) {
- return (E) U.getObjectVolatile(array, offset);
+ return (E)AA.getVolatile(array, i);
}
/**
- * Sets the element at position {@code i} to the given value.
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setVolatile}.
*
* @param i the index
* @param newValue the new value
*/
public final void set(int i, E newValue) {
- U.putObjectVolatile(array, checkedByteOffset(i), newValue);
+ AA.setVolatile(array, i, newValue);
}
/**
- * Eventually sets the element at position {@code i} to the given value.
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
*
* @param i the index
* @param newValue the new value
* @since 1.6
*/
public final void lazySet(int i, E newValue) {
- U.putObjectRelease(array, checkedByteOffset(i), newValue);
+ AA.setRelease(array, i, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * value and returns the old value.
+ * Atomically sets the element at index {@code i} to {@code
+ * newValue} and returns the old value,
+ * with memory effects as specified by {@link VarHandle#getAndSet}.
*
* @param i the index
* @param newValue the new value
@@ -160,42 +134,36 @@
*/
@SuppressWarnings("unchecked")
public final E getAndSet(int i, E newValue) {
- return (E)U.getAndSetObject(array, checkedByteOffset(i), newValue);
+ return (E)AA.getAndSet(array, i, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * updated value if the current value {@code ==} the expected value.
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#compareAndSet}.
*
* @param i the index
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful. False return indicates that
* the actual value was not equal to the expected value.
*/
- public final boolean compareAndSet(int i, E expect, E update) {
- return compareAndSetRaw(checkedByteOffset(i), expect, update);
- }
-
- private boolean compareAndSetRaw(long offset, E expect, E update) {
- return U.compareAndSwapObject(array, offset, expect, update);
+ public final boolean compareAndSet(int i, E expectedValue, E newValue) {
+ return AA.compareAndSet(array, i, expectedValue, newValue);
}
/**
- * Atomically sets the element at position {@code i} to the given
- * updated value if the current value {@code ==} the expected value.
- *
- * <p><a href="package-summary.html#weakCompareAndSet">May fail
- * spuriously and does not provide ordering guarantees</a>, so is
- * only rarely an appropriate alternative to {@code compareAndSet}.
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by {@link VarHandle#weakCompareAndSet}.
*
* @param i the index
- * @param expect the expected value
- * @param update the new value
+ * @param expectedValue the expected value
+ * @param newValue the new value
* @return {@code true} if successful
*/
- public final boolean weakCompareAndSet(int i, E expect, E update) {
- return compareAndSet(i, expect, update);
+ public final boolean weakCompareAndSet(int i, E expectedValue, E newValue) {
+ return AA.weakCompareAndSet(array, i, expectedValue, newValue);
}
/**
@@ -210,13 +178,14 @@
* @since 1.8
*/
public final E getAndUpdate(int i, UnaryOperator<E> updateFunction) {
- long offset = checkedByteOffset(i);
- E prev, next;
- do {
- prev = getRaw(offset);
- next = updateFunction.apply(prev);
- } while (!compareAndSetRaw(offset, prev, next));
- return prev;
+ E prev = get(i), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.apply(prev);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return prev;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
@@ -231,23 +200,25 @@
* @since 1.8
*/
public final E updateAndGet(int i, UnaryOperator<E> updateFunction) {
- long offset = checkedByteOffset(i);
- E prev, next;
- do {
- prev = getRaw(offset);
- next = updateFunction.apply(prev);
- } while (!compareAndSetRaw(offset, prev, next));
- return next;
+ E prev = get(i), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = updateFunction.apply(prev);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return next;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
* Atomically updates the element at index {@code i} with the
- * results of applying the given function to the current and
- * given values, returning the previous value. The function should
- * be side-effect-free, since it may be re-applied when attempted
+ * results of applying the given function to the current and given
+ * values, returning the previous value. The function should be
+ * side-effect-free, since it may be re-applied when attempted
* updates fail due to contention among threads. The function is
- * applied with the current value at index {@code i} as its first
- * argument, and the given update as the second argument.
+ * applied with the current value of the element at index {@code i}
+ * as its first argument, and the given update as the second
+ * argument.
*
* @param i the index
* @param x the update value
@@ -257,23 +228,25 @@
*/
public final E getAndAccumulate(int i, E x,
BinaryOperator<E> accumulatorFunction) {
- long offset = checkedByteOffset(i);
- E prev, next;
- do {
- prev = getRaw(offset);
- next = accumulatorFunction.apply(prev, x);
- } while (!compareAndSetRaw(offset, prev, next));
- return prev;
+ E prev = get(i), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.apply(prev, x);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return prev;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
* Atomically updates the element at index {@code i} with the
- * results of applying the given function to the current and
- * given values, returning the updated value. The function should
- * be side-effect-free, since it may be re-applied when attempted
+ * results of applying the given function to the current and given
+ * values, returning the updated value. The function should be
+ * side-effect-free, since it may be re-applied when attempted
* updates fail due to contention among threads. The function is
- * applied with the current value at index {@code i} as its first
- * argument, and the given update as the second argument.
+ * applied with the current value of the element at index {@code i}
+ * as its first argument, and the given update as the second
+ * argument.
*
* @param i the index
* @param x the update value
@@ -283,13 +256,14 @@
*/
public final E accumulateAndGet(int i, E x,
BinaryOperator<E> accumulatorFunction) {
- long offset = checkedByteOffset(i);
- E prev, next;
- do {
- prev = getRaw(offset);
- next = accumulatorFunction.apply(prev, x);
- } while (!compareAndSetRaw(offset, prev, next));
- return next;
+ E prev = get(i), next = null;
+ for (boolean haveNext = false;;) {
+ if (!haveNext)
+ next = accumulatorFunction.apply(prev, x);
+ if (weakCompareAndSetVolatile(i, prev, next))
+ return next;
+ haveNext = (prev == (prev = get(i)));
+ }
}
/**
@@ -304,7 +278,7 @@
StringBuilder b = new StringBuilder();
b.append('[');
for (int i = 0; ; i++) {
- b.append(getRaw(byteOffset(i)));
+ b.append(get(i));
if (i == iMax)
return b.append(']').toString();
b.append(',').append(' ');
@@ -326,7 +300,199 @@
throw new java.io.InvalidObjectException("Not array type");
if (a.getClass() != Object[].class)
a = Arrays.copyOf((Object[])a, Array.getLength(a), Object[].class);
- U.putObjectVolatile(this, ARRAY, a);
+ Field arrayField = java.security.AccessController.doPrivileged(
+ (java.security.PrivilegedAction<Field>) () -> {
+ try {
+ Field f = AtomicReferenceArray.class
+ .getDeclaredField("array");
+ f.setAccessible(true);
+ return f;
+ } catch (ReflectiveOperationException e) {
+ throw new Error(e);
+ }});
+ try {
+ arrayField.set(this, a);
+ } catch (IllegalAccessException e) {
+ throw new Error(e);
+ }
+ }
+
+ // jdk9
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory semantics of reading as if the variable was declared
+ * non-{@code volatile}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final E getPlain(int i) {
+ return (E)AA.get(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory semantics of setting as if the variable was
+ * declared non-{@code volatile} and non-{@code final}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setPlain(int i, E newValue) {
+ AA.set(array, i, newValue);
+ }
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getOpaque}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final E getOpaque(int i) {
+ return (E)AA.getOpaque(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setOpaque}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setOpaque(int i, E newValue) {
+ AA.setOpaque(array, i, newValue);
+ }
+
+ /**
+ * Returns the current value of the element at index {@code i},
+ * with memory effects as specified by {@link VarHandle#getAcquire}.
+ *
+ * @param i the index
+ * @return the value
+ * @since 9
+ */
+ public final E getAcquire(int i) {
+ return (E)AA.getAcquire(array, i);
+ }
+
+ /**
+ * Sets the element at index {@code i} to {@code newValue},
+ * with memory effects as specified by {@link VarHandle#setRelease}.
+ *
+ * @param i the index
+ * @param newValue the new value
+ * @since 9
+ */
+ public final void setRelease(int i, E newValue) {
+ AA.setRelease(array, i, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchange}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final E compareAndExchange(int i, E expectedValue, E newValue) {
+ return (E)AA.compareAndExchange(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeAcquire}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final E compareAndExchangeAcquire(int i, E expectedValue, E newValue) {
+ return (E)AA.compareAndExchangeAcquire(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Atomically sets the element at index {@code i} to {@code newValue}
+ * if the element's current value, referred to as the <em>witness
+ * value</em>, {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#compareAndExchangeRelease}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return the witness value, which will be the same as the
+ * expected value if successful
+ * @since 9
+ */
+ public final E compareAndExchangeRelease(int i, E expectedValue, E newValue) {
+ return (E)AA.compareAndExchangeRelease(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetVolatile}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetVolatile(int i, E expectedValue, E newValue) {
+ return AA.weakCompareAndSetVolatile(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetAcquire}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetAcquire(int i, E expectedValue, E newValue) {
+ return AA.weakCompareAndSetAcquire(array, i, expectedValue, newValue);
+ }
+
+ /**
+ * Possibly atomically sets the element at index {@code i} to
+ * {@code newValue} if the element's current value {@code == expectedValue},
+ * with memory effects as specified by
+ * {@link VarHandle#weakCompareAndSetRelease}.
+ *
+ * @param i the index
+ * @param expectedValue the expected value
+ * @param newValue the new value
+ * @return {@code true} if successful
+ * @since 9
+ */
+ public final boolean weakCompareAndSetRelease(int i, E expectedValue, E newValue) {
+ return AA.weakCompareAndSetRelease(array, i, expectedValue, newValue);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java Thu Jul 21 17:13:23 2016 +0000
@@ -42,6 +42,7 @@
import java.security.PrivilegedExceptionAction;
import java.util.function.BinaryOperator;
import java.util.function.UnaryOperator;
+import jdk.internal.misc.Unsafe;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@@ -168,8 +169,8 @@
public abstract void lazySet(T obj, V newValue);
/**
- * Gets the current value held in the field of the given object managed
- * by this updater.
+ * Returns the current value held in the field of the given object
+ * managed by this updater.
*
* @param obj An object whose field to get
* @return the current value
@@ -284,7 +285,7 @@
private static final class AtomicReferenceFieldUpdaterImpl<T,V>
extends AtomicReferenceFieldUpdater<T,V> {
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private final long offset;
/**
* if field is protected, the subclass constructing updater, else
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,9 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
/**
* An {@code AtomicStampedReference} maintains an object reference
* along with an integer "stamp", that can be updated atomically.
@@ -188,20 +191,19 @@
casPair(current, Pair.of(expectedReference, newStamp)));
}
- // Unsafe mechanics
-
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long PAIR;
+ // VarHandle mechanics
+ private static final VarHandle PAIR;
static {
try {
- PAIR = U.objectFieldOffset
- (AtomicStampedReference.class.getDeclaredField("pair"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ PAIR = l.findVarHandle(AtomicStampedReference.class, "pair",
+ Pair.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
}
private boolean casPair(Pair<V> cmp, Pair<V> val) {
- return U.compareAndSwapObject(this, PAIR, cmp, val);
+ return PAIR.compareAndSet(this, cmp, val);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java Thu Jul 21 17:13:23 2016 +0000
@@ -68,7 +68,7 @@
* <p>Class {@link LongAdder} provides analogs of the functionality of
* this class for the common special case of maintaining counts and
* sums. The call {@code new LongAdder()} is equivalent to {@code new
- * LongAccumulator((x, y) -> x + y, 0L}.
+ * LongAccumulator((x, y) -> x + y, 0L)}.
*
* <p>This class extends {@link Number}, but does <em>not</em> define
* methods such as {@code equals}, {@code hashCode} and {@code
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,10 +35,13 @@
package java.util.concurrent.atomic;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.Arrays;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.DoubleBinaryOperator;
import java.util.function.LongBinaryOperator;
+import jdk.internal.misc.Unsafe;
/**
* A package-local class holding common representation and mechanics
@@ -123,22 +126,21 @@
volatile long value;
Cell(long x) { value = x; }
final boolean cas(long cmp, long val) {
- return U.compareAndSwapLong(this, VALUE, cmp, val);
+ return VALUE.compareAndSet(this, cmp, val);
}
final void reset() {
- U.putLongVolatile(this, VALUE, 0L);
+ VALUE.setVolatile(this, 0L);
}
final void reset(long identity) {
- U.putLongVolatile(this, VALUE, identity);
+ VALUE.setVolatile(this, identity);
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long VALUE;
+ // VarHandle mechanics
+ private static final VarHandle VALUE;
static {
try {
- VALUE = U.objectFieldOffset
- (Cell.class.getDeclaredField("value"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ VALUE = l.findVarHandle(Cell.class, "value", long.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -174,14 +176,14 @@
* CASes the base field.
*/
final boolean casBase(long cmp, long val) {
- return U.compareAndSwapLong(this, BASE, cmp, val);
+ return BASE.compareAndSet(this, cmp, val);
}
/**
* CASes the cellsBusy field from 0 to 1 to acquire lock.
*/
final boolean casCellsBusy() {
- return U.compareAndSwapInt(this, CELLSBUSY, 0, 1);
+ return CELLSBUSY.compareAndSet(this, 0, 1);
}
/**
@@ -371,18 +373,16 @@
}
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long BASE;
- private static final long CELLSBUSY;
+ // Unsafe and VarHandle mechanics
+ private static final Unsafe U = Unsafe.getUnsafe();
+ private static final VarHandle BASE;
+ private static final VarHandle CELLSBUSY;
private static final long PROBE;
static {
try {
- BASE = U.objectFieldOffset
- (Striped64.class.getDeclaredField("base"));
- CELLSBUSY = U.objectFieldOffset
- (Striped64.class.getDeclaredField("cellsBusy"));
-
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ BASE = l.findVarHandle(Striped64.class, "base", long.class);
+ CELLSBUSY = l.findVarHandle(Striped64.class, "cellsBusy", int.class);
PROBE = U.objectFieldOffset
(Thread.class.getDeclaredField("threadLocalRandomProbe"));
} catch (ReflectiveOperationException e) {
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/package-info.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,26 +35,10 @@
/**
* A small toolkit of classes that support lock-free thread-safe
- * programming on single variables. In essence, the classes in this
- * package extend the notion of {@code volatile} values, fields, and
- * array elements to those that also provide an atomic conditional update
- * operation of the form:
- *
- * <pre> {@code boolean compareAndSet(expectedValue, updateValue);}</pre>
- *
- * <p>This method (which varies in argument types across different
- * classes) atomically sets a variable to the {@code updateValue} if it
- * currently holds the {@code expectedValue}, reporting {@code true} on
- * success. The classes in this package also contain methods to get and
- * unconditionally set values, as well as a weaker conditional atomic
- * update operation {@code weakCompareAndSet} described below.
- *
- * <p>The specifications of these methods enable implementations to
- * employ efficient machine-level atomic instructions that are available
- * on contemporary processors. However on some platforms, support may
- * entail some form of internal locking. Thus the methods are not
- * strictly guaranteed to be non-blocking --
- * a thread may block transiently before performing the operation.
+ * programming on single variables. Instances of Atomic classes
+ * maintain values that are accessed and updated using methods
+ * otherwise available for fields using associated atomic {@link
+ * java.lang.invoke.VarHandle} operations.
*
* <p>Instances of classes
* {@link java.util.concurrent.atomic.AtomicBoolean},
@@ -92,45 +76,26 @@
* return prev; // return next; for transformAndGet
* }}</pre>
*
- * <p>The memory effects for accesses and updates of atomics generally
- * follow the rules for volatiles, as stated in
- * <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-17.html#jls-17.4">
- * Chapter 17 of
- * <cite>The Java™ Language Specification</cite></a>:
- *
- * <ul>
- *
- * <li>{@code get} has the memory effects of reading a
- * {@code volatile} variable.
- *
- * <li>{@code set} has the memory effects of writing (assigning) a
- * {@code volatile} variable.
+ * <p>These classes are not general purpose replacements for {@code
+ * java.lang.Integer} and related classes. They do <em>not</em>
+ * define methods such as {@code equals}, {@code hashCode} and {@code
+ * compareTo}. Because atomic variables are expected to be mutated,
+ * they are poor choices for hash table keys.
*
- * <li>{@code lazySet} has the memory effects of writing (assigning)
- * a {@code volatile} variable except that it permits reorderings with
- * subsequent (but not previous) memory actions that do not themselves
- * impose reordering constraints with ordinary non-{@code volatile}
- * writes. Among other usage contexts, {@code lazySet} may apply when
- * nulling out, for the sake of garbage collection, a reference that is
- * never accessed again.
+ * <p>The
+ * {@link java.util.concurrent.atomic.AtomicIntegerArray},
+ * {@link java.util.concurrent.atomic.AtomicLongArray}, and
+ * {@link java.util.concurrent.atomic.AtomicReferenceArray} classes
+ * further extend atomic operation support to arrays of these types.
+ * These classes are also notable in providing {@code volatile} access
+ * semantics for their array elements.
*
- * <li>{@code weakCompareAndSet} atomically reads and conditionally
- * writes a variable but does <em>not</em>
- * create any happens-before orderings, so provides no guarantees
- * with respect to previous or subsequent reads and writes of any
- * variables other than the target of the {@code weakCompareAndSet}.
- *
- * <li>{@code compareAndSet}
- * and all other read-and-update operations such as {@code getAndIncrement}
- * have the memory effects of both reading and
- * writing {@code volatile} variables.
- * </ul>
- *
- * <p>In addition to classes representing single values, this package
- * contains <em>Updater</em> classes that can be used to obtain
- * {@code compareAndSet} operations on any selected {@code volatile}
- * field of any selected class.
- *
+ * <p>In addition to classes representing single values and arrays,
+ * this package contains <em>Updater</em> classes that can be used to
+ * obtain {@code compareAndSet} and related operations on any selected
+ * {@code volatile} field of any selected class. These classes
+ * predate the introduction of {@link
+ * java.lang.invoke.VarHandle}, and are of more limited use.
* {@link java.util.concurrent.atomic.AtomicReferenceFieldUpdater},
* {@link java.util.concurrent.atomic.AtomicIntegerFieldUpdater}, and
* {@link java.util.concurrent.atomic.AtomicLongFieldUpdater} are
@@ -143,38 +108,6 @@
* reflection-based setup, less convenient usage, and weaker
* guarantees.
*
- * <p>The
- * {@link java.util.concurrent.atomic.AtomicIntegerArray},
- * {@link java.util.concurrent.atomic.AtomicLongArray}, and
- * {@link java.util.concurrent.atomic.AtomicReferenceArray} classes
- * further extend atomic operation support to arrays of these types.
- * These classes are also notable in providing {@code volatile} access
- * semantics for their array elements, which is not supported for
- * ordinary arrays.
- *
- * <p id="weakCompareAndSet">The atomic classes also support method
- * {@code weakCompareAndSet}, which has limited applicability. On some
- * platforms, the weak version may be more efficient than {@code
- * compareAndSet} in the normal case, but differs in that any given
- * invocation of the {@code weakCompareAndSet} method may return {@code
- * false} <em>spuriously</em> (that is, for no apparent reason). A
- * {@code false} return means only that the operation may be retried if
- * desired, relying on the guarantee that repeated invocation when the
- * variable holds {@code expectedValue} and no other thread is also
- * attempting to set the variable will eventually succeed. (Such
- * spurious failures may for example be due to memory contention effects
- * that are unrelated to whether the expected and current values are
- * equal.) Additionally {@code weakCompareAndSet} does not provide
- * ordering guarantees that are usually needed for synchronization
- * control. However, the method may be useful for updating counters and
- * statistics when such updates are unrelated to the other
- * happens-before orderings of a program. When a thread sees an update
- * to an atomic variable caused by a {@code weakCompareAndSet}, it does
- * not necessarily see updates to any <em>other</em> variables that
- * occurred before the {@code weakCompareAndSet}. This may be
- * acceptable when, for example, updating performance statistics, but
- * rarely otherwise.
- *
* <p>The {@link java.util.concurrent.atomic.AtomicMarkableReference}
* class associates a single boolean with a reference. For example, this
* bit might be used inside a data structure to mean that the object
@@ -185,29 +118,6 @@
* used for example, to represent version numbers corresponding to
* series of updates.
*
- * <p>Atomic classes are designed primarily as building blocks for
- * implementing non-blocking data structures and related infrastructure
- * classes. The {@code compareAndSet} method is not a general
- * replacement for locking. It applies only when critical updates for an
- * object are confined to a <em>single</em> variable.
- *
- * <p>Atomic classes are not general purpose replacements for
- * {@code java.lang.Integer} and related classes. They do <em>not</em>
- * define methods such as {@code equals}, {@code hashCode} and
- * {@code compareTo}. (Because atomic variables are expected to be
- * mutated, they are poor choices for hash table keys.) Additionally,
- * classes are provided only for those types that are commonly useful in
- * intended applications. For example, there is no atomic class for
- * representing {@code byte}. In those infrequent cases where you would
- * like to do so, you can use an {@code AtomicInteger} to hold
- * {@code byte} values, and cast appropriately.
- *
- * You can also hold floats using
- * {@link java.lang.Float#floatToRawIntBits} and
- * {@link java.lang.Float#intBitsToFloat} conversions, and doubles using
- * {@link java.lang.Double#doubleToRawLongBits} and
- * {@link java.lang.Double#longBitsToDouble} conversions.
- *
* @since 1.5
*/
package java.util.concurrent.atomic;
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent.locks;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -113,7 +115,7 @@
protected final void setState(long newState) {
// Use putLongVolatile instead of ordinary volatile store when
// using compareAndSwapLong, for sake of some 32bit systems.
- U.putLongVolatile(this, STATE, newState);
+ STATE.setVolatile(this, newState);
}
/**
@@ -128,7 +130,7 @@
* value was not equal to the expected value.
*/
protected final boolean compareAndSetState(long expect, long update) {
- return U.compareAndSwapLong(this, STATE, expect, update);
+ return STATE.compareAndSet(this, expect, update);
}
// Queuing utilities
@@ -149,7 +151,7 @@
for (;;) {
Node oldTail = tail;
if (oldTail != null) {
- U.putObject(node, Node.PREV, oldTail);
+ node.setPrevRelaxed(oldTail);
if (compareAndSetTail(oldTail, node)) {
oldTail.next = node;
return oldTail;
@@ -172,7 +174,7 @@
for (;;) {
Node oldTail = tail;
if (oldTail != null) {
- U.putObject(node, Node.PREV, oldTail);
+ node.setPrevRelaxed(oldTail);
if (compareAndSetTail(oldTail, node)) {
oldTail.next = node;
return node;
@@ -1810,28 +1812,17 @@
}
}
- /**
- * Setup to support compareAndSet. We need to natively implement
- * this here: For the sake of permitting future enhancements, we
- * cannot explicitly subclass AtomicLong, which would be
- * efficient and useful otherwise. So, as the lesser of evils, we
- * natively implement using hotspot intrinsics API. And while we
- * are at it, we do the same for other CASable fields (which could
- * otherwise be done with atomic field updaters).
- */
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long STATE;
- private static final long HEAD;
- private static final long TAIL;
+ // VarHandle mechanics
+ private static final VarHandle STATE;
+ private static final VarHandle HEAD;
+ private static final VarHandle TAIL;
static {
try {
- STATE = U.objectFieldOffset
- (AbstractQueuedLongSynchronizer.class.getDeclaredField("state"));
- HEAD = U.objectFieldOffset
- (AbstractQueuedLongSynchronizer.class.getDeclaredField("head"));
- TAIL = U.objectFieldOffset
- (AbstractQueuedLongSynchronizer.class.getDeclaredField("tail"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ STATE = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "state", long.class);
+ HEAD = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "head", Node.class);
+ TAIL = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "tail", Node.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -1846,7 +1837,7 @@
*/
private final void initializeSyncQueue() {
Node h;
- if (U.compareAndSwapObject(this, HEAD, null, (h = new Node())))
+ if (HEAD.compareAndSet(this, null, (h = new Node())))
tail = h;
}
@@ -1854,6 +1845,6 @@
* CASes tail field.
*/
private final boolean compareAndSetTail(Node expect, Node update) {
- return U.compareAndSwapObject(this, TAIL, expect, update);
+ return TAIL.compareAndSet(this, expect, update);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,11 +35,12 @@
package java.util.concurrent.locks;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.concurrent.TimeUnit;
-import jdk.internal.vm.annotation.ReservedStackAccess;
/**
* Provides a framework for implementing blocking locks and related
@@ -506,40 +507,41 @@
/** Constructor used by addWaiter. */
Node(Node nextWaiter) {
this.nextWaiter = nextWaiter;
- U.putObject(this, THREAD, Thread.currentThread());
+ THREAD.set(this, Thread.currentThread());
}
/** Constructor used by addConditionWaiter. */
Node(int waitStatus) {
- U.putInt(this, WAITSTATUS, waitStatus);
- U.putObject(this, THREAD, Thread.currentThread());
+ WAITSTATUS.set(this, waitStatus);
+ THREAD.set(this, Thread.currentThread());
}
/** CASes waitStatus field. */
final boolean compareAndSetWaitStatus(int expect, int update) {
- return U.compareAndSwapInt(this, WAITSTATUS, expect, update);
+ return WAITSTATUS.compareAndSet(this, expect, update);
}
/** CASes next field. */
final boolean compareAndSetNext(Node expect, Node update) {
- return U.compareAndSwapObject(this, NEXT, expect, update);
+ return NEXT.compareAndSet(this, expect, update);
+ }
+
+ final void setPrevRelaxed(Node p) {
+ PREV.set(this, p);
}
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long NEXT;
- static final long PREV;
- private static final long THREAD;
- private static final long WAITSTATUS;
+ // VarHandle mechanics
+ private static final VarHandle NEXT;
+ private static final VarHandle PREV;
+ private static final VarHandle THREAD;
+ private static final VarHandle WAITSTATUS;
static {
try {
- NEXT = U.objectFieldOffset
- (Node.class.getDeclaredField("next"));
- PREV = U.objectFieldOffset
- (Node.class.getDeclaredField("prev"));
- THREAD = U.objectFieldOffset
- (Node.class.getDeclaredField("thread"));
- WAITSTATUS = U.objectFieldOffset
- (Node.class.getDeclaredField("waitStatus"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ NEXT = l.findVarHandle(Node.class, "next", Node.class);
+ PREV = l.findVarHandle(Node.class, "prev", Node.class);
+ THREAD = l.findVarHandle(Node.class, "thread", Thread.class);
+ WAITSTATUS = l.findVarHandle(Node.class, "waitStatus", int.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -595,7 +597,7 @@
* value was not equal to the expected value.
*/
protected final boolean compareAndSetState(int expect, int update) {
- return U.compareAndSwapInt(this, STATE, expect, update);
+ return STATE.compareAndSet(this, expect, update);
}
// Queuing utilities
@@ -616,7 +618,7 @@
for (;;) {
Node oldTail = tail;
if (oldTail != null) {
- U.putObject(node, Node.PREV, oldTail);
+ node.setPrevRelaxed(oldTail);
if (compareAndSetTail(oldTail, node)) {
oldTail.next = node;
return oldTail;
@@ -639,7 +641,7 @@
for (;;) {
Node oldTail = tail;
if (oldTail != null) {
- U.putObject(node, Node.PREV, oldTail);
+ node.setPrevRelaxed(oldTail);
if (compareAndSetTail(oldTail, node)) {
oldTail.next = node;
return node;
@@ -887,7 +889,6 @@
* @param arg the acquire argument
* @return {@code true} if interrupted while waiting
*/
- @ReservedStackAccess
final boolean acquireQueued(final Node node, int arg) {
try {
boolean interrupted = false;
@@ -1220,7 +1221,6 @@
* {@link #tryAcquire} but is otherwise uninterpreted and
* can represent anything you like.
*/
- @ReservedStackAccess
public final void acquire(int arg) {
if (!tryAcquire(arg) &&
acquireQueued(addWaiter(Node.EXCLUSIVE), arg))
@@ -1284,7 +1284,6 @@
* can represent anything you like.
* @return the value returned from {@link #tryRelease}
*/
- @ReservedStackAccess
public final boolean release(int arg) {
if (tryRelease(arg)) {
Node h = head;
@@ -1365,7 +1364,6 @@
* and can represent anything you like.
* @return the value returned from {@link #tryReleaseShared}
*/
- @ReservedStackAccess
public final boolean releaseShared(int arg) {
if (tryReleaseShared(arg)) {
doReleaseShared();
@@ -2279,28 +2277,17 @@
}
}
- /**
- * Setup to support compareAndSet. We need to natively implement
- * this here: For the sake of permitting future enhancements, we
- * cannot explicitly subclass AtomicInteger, which would be
- * efficient and useful otherwise. So, as the lesser of evils, we
- * natively implement using hotspot intrinsics API. And while we
- * are at it, we do the same for other CASable fields (which could
- * otherwise be done with atomic field updaters).
- */
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long STATE;
- private static final long HEAD;
- private static final long TAIL;
+ // VarHandle mechanics
+ private static final VarHandle STATE;
+ private static final VarHandle HEAD;
+ private static final VarHandle TAIL;
static {
try {
- STATE = U.objectFieldOffset
- (AbstractQueuedSynchronizer.class.getDeclaredField("state"));
- HEAD = U.objectFieldOffset
- (AbstractQueuedSynchronizer.class.getDeclaredField("head"));
- TAIL = U.objectFieldOffset
- (AbstractQueuedSynchronizer.class.getDeclaredField("tail"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ STATE = l.findVarHandle(AbstractQueuedSynchronizer.class, "state", int.class);
+ HEAD = l.findVarHandle(AbstractQueuedSynchronizer.class, "head", Node.class);
+ TAIL = l.findVarHandle(AbstractQueuedSynchronizer.class, "tail", Node.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
@@ -2315,7 +2302,7 @@
*/
private final void initializeSyncQueue() {
Node h;
- if (U.compareAndSwapObject(this, HEAD, null, (h = new Node())))
+ if (HEAD.compareAndSet(this, null, (h = new Node())))
tail = h;
}
@@ -2323,6 +2310,6 @@
* CASes tail field.
*/
private final boolean compareAndSetTail(Node expect, Node update) {
- return U.compareAndSwapObject(this, TAIL, expect, update);
+ return TAIL.compareAndSet(this, expect, update);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/Condition.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/Condition.java Thu Jul 21 17:13:23 2016 +0000
@@ -396,7 +396,6 @@
* re-acquire the lock associated with this condition. When the
* thread returns it is <em>guaranteed</em> to hold this lock.
*
- *
* <p>If the current thread:
* <ul>
* <li>has its interrupted status set on entry to this method; or
@@ -408,7 +407,6 @@
* case, whether or not the test for interruption occurs before the lock
* is released.
*
- *
* <p>The return value indicates whether the deadline has elapsed,
* which can be used as follows:
* <pre> {@code
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,8 @@
package java.util.concurrent.locks;
+import jdk.internal.misc.Unsafe;
+
/**
* Basic thread blocking primitives for creating locks and other
* synchronization classes.
@@ -405,16 +407,30 @@
return r;
}
+ /**
+ * Returns the thread id for the given thread. We must access
+ * this directly rather than via method Thread.getId() because
+ * getId() is not final, and has been known to be overridden in
+ * ways that do not preserve unique mappings.
+ */
+ static final long getThreadId(Thread thread) {
+ return U.getLongVolatile(thread, TID);
+ }
+
// Hotspot implementation via intrinsics API
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
+ private static final Unsafe U = Unsafe.getUnsafe();
private static final long PARKBLOCKER;
private static final long SECONDARY;
+ private static final long TID;
static {
try {
PARKBLOCKER = U.objectFieldOffset
(Thread.class.getDeclaredField("parkBlocker"));
SECONDARY = U.objectFieldOffset
(Thread.class.getDeclaredField("threadLocalRandomSecondarySeed"));
+ TID = U.objectFieldOffset
+ (Thread.class.getDeclaredField("tid"));
+
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java Thu Jul 21 17:13:23 2016 +0000
@@ -79,7 +79,6 @@
* and measurement will establish whether the use of a read-write lock is
* suitable for your application.
*
- *
* <p>Although the basic operation of a read-write lock is straight-forward,
* there are many policy decisions that an implementation must make, which
* may affect the effectiveness of the read-write lock in a given application.
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java Thu Jul 21 17:13:23 2016 +0000
@@ -119,12 +119,6 @@
private static final long serialVersionUID = -5179523762034025860L;
/**
- * Performs {@link Lock#lock}. The main reason for subclassing
- * is to allow fast path for nonfair version.
- */
- abstract void lock();
-
- /**
* Performs non-fair tryLock. tryAcquire is implemented in
* subclasses, but both need nonfair try for trylock method.
*/
@@ -201,19 +195,6 @@
*/
static final class NonfairSync extends Sync {
private static final long serialVersionUID = 7316153563782823691L;
-
- /**
- * Performs lock. Try immediate barge, backing up to normal
- * acquire on failure.
- */
- @ReservedStackAccess
- final void lock() {
- if (compareAndSetState(0, 1))
- setExclusiveOwnerThread(Thread.currentThread());
- else
- acquire(1);
- }
-
protected final boolean tryAcquire(int acquires) {
return nonfairTryAcquire(acquires);
}
@@ -224,11 +205,6 @@
*/
static final class FairSync extends Sync {
private static final long serialVersionUID = -3000897897090466540L;
-
- final void lock() {
- acquire(1);
- }
-
/**
* Fair version of tryAcquire. Don't grant access unless
* recursive call or no waiters or is first.
@@ -288,7 +264,7 @@
* at which time the lock hold count is set to one.
*/
public void lock() {
- sync.lock();
+ sync.acquire(1);
}
/**
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java Thu Jul 21 17:13:23 2016 +0000
@@ -37,6 +37,7 @@
import java.util.Collection;
import java.util.concurrent.TimeUnit;
+import jdk.internal.vm.annotation.ReservedStackAccess;
/**
* An implementation of {@link ReadWriteLock} supporting similar
@@ -278,7 +279,7 @@
static final class HoldCounter {
int count; // initially 0
// Use id, not reference, to avoid garbage retention
- final long tid = getThreadId(Thread.currentThread());
+ final long tid = LockSupport.getThreadId(Thread.currentThread());
}
/**
@@ -367,7 +368,7 @@
* both read and write holds that are all released during a
* condition wait and re-established in tryAcquire.
*/
-
+ @ReservedStackAccess
protected final boolean tryRelease(int releases) {
if (!isHeldExclusively())
throw new IllegalMonitorStateException();
@@ -379,6 +380,7 @@
return free;
}
+ @ReservedStackAccess
protected final boolean tryAcquire(int acquires) {
/*
* Walkthrough:
@@ -411,6 +413,7 @@
return true;
}
+ @ReservedStackAccess
protected final boolean tryReleaseShared(int unused) {
Thread current = Thread.currentThread();
if (firstReader == current) {
@@ -421,7 +424,8 @@
firstReaderHoldCount--;
} else {
HoldCounter rh = cachedHoldCounter;
- if (rh == null || rh.tid != getThreadId(current))
+ if (rh == null ||
+ rh.tid != LockSupport.getThreadId(current))
rh = readHolds.get();
int count = rh.count;
if (count <= 1) {
@@ -447,6 +451,7 @@
"attempt to unlock read lock, not locked by current thread");
}
+ @ReservedStackAccess
protected final int tryAcquireShared(int unused) {
/*
* Walkthrough:
@@ -479,7 +484,8 @@
firstReaderHoldCount++;
} else {
HoldCounter rh = cachedHoldCounter;
- if (rh == null || rh.tid != getThreadId(current))
+ if (rh == null ||
+ rh.tid != LockSupport.getThreadId(current))
cachedHoldCounter = rh = readHolds.get();
else if (rh.count == 0)
readHolds.set(rh);
@@ -516,7 +522,8 @@
} else {
if (rh == null) {
rh = cachedHoldCounter;
- if (rh == null || rh.tid != getThreadId(current)) {
+ if (rh == null ||
+ rh.tid != LockSupport.getThreadId(current)) {
rh = readHolds.get();
if (rh.count == 0)
readHolds.remove();
@@ -537,7 +544,8 @@
} else {
if (rh == null)
rh = cachedHoldCounter;
- if (rh == null || rh.tid != getThreadId(current))
+ if (rh == null ||
+ rh.tid != LockSupport.getThreadId(current))
rh = readHolds.get();
else if (rh.count == 0)
readHolds.set(rh);
@@ -554,6 +562,7 @@
* This is identical in effect to tryAcquire except for lack
* of calls to writerShouldBlock.
*/
+ @ReservedStackAccess
final boolean tryWriteLock() {
Thread current = Thread.currentThread();
int c = getState();
@@ -575,6 +584,7 @@
* This is identical in effect to tryAcquireShared except for
* lack of calls to readerShouldBlock.
*/
+ @ReservedStackAccess
final boolean tryReadLock() {
Thread current = Thread.currentThread();
for (;;) {
@@ -593,7 +603,8 @@
firstReaderHoldCount++;
} else {
HoldCounter rh = cachedHoldCounter;
- if (rh == null || rh.tid != getThreadId(current))
+ if (rh == null ||
+ rh.tid != LockSupport.getThreadId(current))
cachedHoldCounter = rh = readHolds.get();
else if (rh.count == 0)
readHolds.set(rh);
@@ -644,7 +655,7 @@
return firstReaderHoldCount;
HoldCounter rh = cachedHoldCounter;
- if (rh != null && rh.tid == getThreadId(current))
+ if (rh != null && rh.tid == LockSupport.getThreadId(current))
return rh.count;
int count = readHolds.get().count;
@@ -1490,26 +1501,4 @@
"[Write locks = " + w + ", Read locks = " + r + "]";
}
- /**
- * Returns the thread id for the given thread. We must access
- * this directly rather than via method Thread.getId() because
- * getId() is not final, and has been known to be overridden in
- * ways that do not preserve unique mappings.
- */
- static final long getThreadId(Thread thread) {
- return U.getLongVolatile(thread, TID);
- }
-
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long TID;
- static {
- try {
- TID = U.objectFieldOffset
- (Thread.class.getDeclaredField("tid"));
- } catch (ReflectiveOperationException e) {
- throw new Error(e);
- }
- }
-
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,7 +35,10 @@
package java.util.concurrent.locks;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
import java.util.concurrent.TimeUnit;
+import jdk.internal.vm.annotation.ReservedStackAccess;
/**
* A capability-based lock with three modes for controlling read/write
@@ -108,6 +111,10 @@
* into initial unlocked state, so they are not useful for remote
* locking.
*
+ * <p>Like {@link java.util.concurrent.Semaphore Semaphore}, but unlike most
+ * {@link Lock} implementations, StampedLocks have no notion of ownership.
+ * Locks acquired in one thread can be released or converted in another.
+ *
* <p>The scheduling policy of StampedLock does not consistently
* prefer readers over writers or vice versa. All "try" methods are
* best-effort and do not necessarily conform to any scheduling or
@@ -126,7 +133,7 @@
* in a class that maintains simple two-dimensional points. The sample
* code illustrates some try/catch conventions even though they are
* not strictly needed here because no exceptions can occur in their
- * bodies.<br>
+ * bodies.
*
* <pre> {@code
* class Point {
@@ -234,9 +241,7 @@
* used in the acquire methods to reduce (increasingly expensive)
* context switching while also avoiding sustained memory
* thrashing among many threads. We limit spins to the head of
- * queue. A thread spin-waits up to SPINS times (where each
- * iteration decreases spin count with 50% probability) before
- * blocking. If, upon wakening it fails to obtain lock, and is
+ * queue. If, upon wakening, a thread fails to obtain lock, and is
* still (or becomes) the first waiting thread (which indicates
* that some other thread barged and obtained lock), it escalates
* spins (up to MAX_HEAD_SPINS) to reduce the likelihood of
@@ -252,7 +257,7 @@
* to normal volatile reads (of "state"). To force orderings of
* reads before a validation and the validation itself in those
* cases where this is not already forced, we use
- * Unsafe.loadFence.
+ * VarHandle.acquireFence.
*
* The memory layout keeps lock state and queue pointers together
* (normally on the same cache line). This usually works well for
@@ -290,7 +295,20 @@
private static final long ABITS = RBITS | WBIT;
private static final long SBITS = ~RBITS; // note overlap with ABITS
- // Initial value for lock state; avoid failure value zero
+ /*
+ * 3 stamp modes can be distinguished by examining (m = stamp & ABITS):
+ * write mode: m == WBIT
+ * optimistic read mode: m == 0L (even when read lock is held)
+ * read mode: m > 0L && m <= RFULL (the stamp is a copy of state, but the
+ * read hold count in the stamp is unused other than to determine mode)
+ *
+ * This differs slightly from the encoding of state:
+ * (state & ABITS) == 0L indicates the lock is currently unlocked.
+ * (state & ABITS) == RBITS is a special transient value
+ * indicating spin-locked to manipulate reader bits overflow.
+ */
+
+ /** Initial value for lock state; avoids failure value zero. */
private static final long ORIGIN = WBIT << 1;
// Special value from cancelled acquire methods so caller can throw IE
@@ -341,25 +359,27 @@
* Exclusively acquires the lock, blocking if necessary
* until available.
*
- * @return a stamp that can be used to unlock or convert mode
+ * @return a write stamp that can be used to unlock or convert mode
*/
+ @ReservedStackAccess
public long writeLock() {
long s, next; // bypass acquireWrite in fully unlocked case only
return ((((s = state) & ABITS) == 0L &&
- U.compareAndSwapLong(this, STATE, s, next = s + WBIT)) ?
+ STATE.compareAndSet(this, s, next = s + WBIT)) ?
next : acquireWrite(false, 0L));
}
/**
* Exclusively acquires the lock if it is immediately available.
*
- * @return a stamp that can be used to unlock or convert mode,
+ * @return a write stamp that can be used to unlock or convert mode,
* or zero if the lock is not available
*/
+ @ReservedStackAccess
public long tryWriteLock() {
long s, next;
return ((((s = state) & ABITS) == 0L &&
- U.compareAndSwapLong(this, STATE, s, next = s + WBIT)) ?
+ STATE.compareAndSet(this, s, next = s + WBIT)) ?
next : 0L);
}
@@ -371,7 +391,7 @@
*
* @param time the maximum time to wait for the lock
* @param unit the time unit of the {@code time} argument
- * @return a stamp that can be used to unlock or convert mode,
+ * @return a write stamp that can be used to unlock or convert mode,
* or zero if the lock is not available
* @throws InterruptedException if the current thread is interrupted
* before acquiring the lock
@@ -399,10 +419,11 @@
* Behavior under interruption matches that specified
* for method {@link Lock#lockInterruptibly()}.
*
- * @return a stamp that can be used to unlock or convert mode
+ * @return a write stamp that can be used to unlock or convert mode
* @throws InterruptedException if the current thread is interrupted
* before acquiring the lock
*/
+ @ReservedStackAccess
public long writeLockInterruptibly() throws InterruptedException {
long next;
if (!Thread.interrupted() &&
@@ -415,33 +436,34 @@
* Non-exclusively acquires the lock, blocking if necessary
* until available.
*
- * @return a stamp that can be used to unlock or convert mode
+ * @return a read stamp that can be used to unlock or convert mode
*/
+ @ReservedStackAccess
public long readLock() {
long s = state, next; // bypass acquireRead on common uncontended case
return ((whead == wtail && (s & ABITS) < RFULL &&
- U.compareAndSwapLong(this, STATE, s, next = s + RUNIT)) ?
+ STATE.compareAndSet(this, s, next = s + RUNIT)) ?
next : acquireRead(false, 0L));
}
/**
* Non-exclusively acquires the lock if it is immediately available.
*
- * @return a stamp that can be used to unlock or convert mode,
+ * @return a read stamp that can be used to unlock or convert mode,
* or zero if the lock is not available
*/
+ @ReservedStackAccess
public long tryReadLock() {
- for (;;) {
- long s, m, next;
- if ((m = (s = state) & ABITS) == WBIT)
- return 0L;
- else if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, next = s + RUNIT))
+ long s, m, next;
+ while ((m = (s = state) & ABITS) != WBIT) {
+ if (m < RFULL) {
+ if (STATE.compareAndSet(this, s, next = s + RUNIT))
return next;
}
else if ((next = tryIncReaderOverflow(s)) != 0L)
return next;
}
+ return 0L;
}
/**
@@ -452,11 +474,12 @@
*
* @param time the maximum time to wait for the lock
* @param unit the time unit of the {@code time} argument
- * @return a stamp that can be used to unlock or convert mode,
+ * @return a read stamp that can be used to unlock or convert mode,
* or zero if the lock is not available
* @throws InterruptedException if the current thread is interrupted
* before acquiring the lock
*/
+ @ReservedStackAccess
public long tryReadLock(long time, TimeUnit unit)
throws InterruptedException {
long s, m, next, deadline;
@@ -464,7 +487,7 @@
if (!Thread.interrupted()) {
if ((m = (s = state) & ABITS) != WBIT) {
if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, next = s + RUNIT))
+ if (STATE.compareAndSet(this, s, next = s + RUNIT))
return next;
}
else if ((next = tryIncReaderOverflow(s)) != 0L)
@@ -486,10 +509,11 @@
* Behavior under interruption matches that specified
* for method {@link Lock#lockInterruptibly()}.
*
- * @return a stamp that can be used to unlock or convert mode
+ * @return a read stamp that can be used to unlock or convert mode
* @throws InterruptedException if the current thread is interrupted
* before acquiring the lock
*/
+ @ReservedStackAccess
public long readLockInterruptibly() throws InterruptedException {
long next;
if (!Thread.interrupted() &&
@@ -502,7 +526,7 @@
* Returns a stamp that can later be validated, or zero
* if exclusively locked.
*
- * @return a stamp, or zero if exclusively locked
+ * @return a valid optimistic read stamp, or zero if exclusively locked
*/
public long tryOptimisticRead() {
long s;
@@ -522,11 +546,29 @@
* since issuance of the given stamp; else false
*/
public boolean validate(long stamp) {
- U.loadFence();
+ VarHandle.acquireFence();
return (stamp & SBITS) == (state & SBITS);
}
/**
+ * Returns an unlocked state, incrementing the version and
+ * avoiding special failure value 0L.
+ *
+ * @param s a write-locked state (or stamp)
+ */
+ private static long unlockWriteState(long s) {
+ return ((s += WBIT) == 0L) ? ORIGIN : s;
+ }
+
+ private long unlockWriteInternal(long s) {
+ long next; WNode h;
+ STATE.setVolatile(this, next = unlockWriteState(s));
+ if ((h = whead) != null && h.status != 0)
+ release(h);
+ return next;
+ }
+
+ /**
* If the lock state matches the given stamp, releases the
* exclusive lock.
*
@@ -534,13 +576,11 @@
* @throws IllegalMonitorStateException if the stamp does
* not match the current state of this lock
*/
+ @ReservedStackAccess
public void unlockWrite(long stamp) {
- WNode h;
if (state != stamp || (stamp & WBIT) == 0L)
throw new IllegalMonitorStateException();
- U.putLongVolatile(this, STATE, (stamp += WBIT) == 0L ? ORIGIN : stamp);
- if ((h = whead) != null && h.status != 0)
- release(h);
+ unlockWriteInternal(stamp);
}
/**
@@ -551,22 +591,23 @@
* @throws IllegalMonitorStateException if the stamp does
* not match the current state of this lock
*/
+ @ReservedStackAccess
public void unlockRead(long stamp) {
long s, m; WNode h;
- for (;;) {
- if (((s = state) & SBITS) != (stamp & SBITS) ||
- (stamp & ABITS) == 0L || (m = s & ABITS) == 0L || m == WBIT)
- throw new IllegalMonitorStateException();
+ while (((s = state) & SBITS) == (stamp & SBITS)
+ && (stamp & RBITS) > 0L
+ && ((m = s & RBITS) > 0L)) {
if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, s - RUNIT)) {
+ if (STATE.compareAndSet(this, s, s - RUNIT)) {
if (m == RUNIT && (h = whead) != null && h.status != 0)
release(h);
- break;
+ return;
}
}
else if (tryDecReaderOverflow(s) != 0L)
- break;
+ return;
}
+ throw new IllegalMonitorStateException();
}
/**
@@ -577,32 +618,12 @@
* @throws IllegalMonitorStateException if the stamp does
* not match the current state of this lock
*/
+ @ReservedStackAccess
public void unlock(long stamp) {
- long a = stamp & ABITS, m, s; WNode h;
- while (((s = state) & SBITS) == (stamp & SBITS)) {
- if ((m = s & ABITS) == 0L)
- break;
- else if (m == WBIT) {
- if (a != m)
- break;
- U.putLongVolatile(this, STATE, (s += WBIT) == 0L ? ORIGIN : s);
- if ((h = whead) != null && h.status != 0)
- release(h);
- return;
- }
- else if (a == 0L || a >= WBIT)
- break;
- else if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, s - RUNIT)) {
- if (m == RUNIT && (h = whead) != null && h.status != 0)
- release(h);
- return;
- }
- }
- else if (tryDecReaderOverflow(s) != 0L)
- return;
- }
- throw new IllegalMonitorStateException();
+ if ((stamp & WBIT) != 0)
+ unlockWrite(stamp);
+ else
+ unlockRead(stamp);
}
/**
@@ -623,7 +644,7 @@
if ((m = s & ABITS) == 0L) {
if (a != 0L)
break;
- if (U.compareAndSwapLong(this, STATE, s, next = s + WBIT))
+ if (STATE.compareAndSet(this, s, next = s + WBIT))
return next;
}
else if (m == WBIT) {
@@ -632,8 +653,7 @@
return stamp;
}
else if (m == RUNIT && a != 0L) {
- if (U.compareAndSwapLong(this, STATE, s,
- next = s - RUNIT + WBIT))
+ if (STATE.compareAndSet(this, s, next = s - RUNIT + WBIT))
return next;
}
else
@@ -654,30 +674,32 @@
* @return a valid read stamp, or zero on failure
*/
public long tryConvertToReadLock(long stamp) {
- long a = stamp & ABITS, m, s, next; WNode h;
+ long a, s, next; WNode h;
while (((s = state) & SBITS) == (stamp & SBITS)) {
- if ((m = s & ABITS) == 0L) {
- if (a != 0L)
+ if ((a = stamp & ABITS) >= WBIT) {
+ // write stamp
+ if (s != stamp)
break;
- else if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, next = s + RUNIT))
+ STATE.setVolatile(this, next = unlockWriteState(s) + RUNIT);
+ if ((h = whead) != null && h.status != 0)
+ release(h);
+ return next;
+ }
+ else if (a == 0L) {
+ // optimistic read stamp
+ if ((s & ABITS) < RFULL) {
+ if (STATE.compareAndSet(this, s, next = s + RUNIT))
return next;
}
else if ((next = tryIncReaderOverflow(s)) != 0L)
return next;
}
- else if (m == WBIT) {
- if (a != m)
+ else {
+ // already a read stamp
+ if ((s & ABITS) == 0L)
break;
- U.putLongVolatile(this, STATE, next = s + (WBIT + RUNIT));
- if ((h = whead) != null && h.status != 0)
- release(h);
- return next;
+ return stamp;
}
- else if (a != 0L && a < WBIT)
- return stamp;
- else
- break;
}
return 0L;
}
@@ -693,29 +715,22 @@
* @return a valid optimistic read stamp, or zero on failure
*/
public long tryConvertToOptimisticRead(long stamp) {
- long a = stamp & ABITS, m, s, next; WNode h;
- U.loadFence();
- for (;;) {
- if (((s = state) & SBITS) != (stamp & SBITS))
- break;
- if ((m = s & ABITS) == 0L) {
- if (a != 0L)
+ long a, m, s, next; WNode h;
+ VarHandle.acquireFence();
+ while (((s = state) & SBITS) == (stamp & SBITS)) {
+ if ((a = stamp & ABITS) >= WBIT) {
+ // write stamp
+ if (s != stamp)
break;
- return s;
+ return unlockWriteInternal(s);
}
- else if (m == WBIT) {
- if (a != m)
- break;
- U.putLongVolatile(this, STATE,
- next = (s += WBIT) == 0L ? ORIGIN : s);
- if ((h = whead) != null && h.status != 0)
- release(h);
- return next;
- }
- else if (a == 0L || a >= WBIT)
+ else if (a == 0L)
+ // already an optimistic read stamp
+ return stamp;
+ else if ((m = s & ABITS) == 0L) // invalid read stamp
break;
else if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, next = s - RUNIT)) {
+ if (STATE.compareAndSet(this, s, next = s - RUNIT)) {
if (m == RUNIT && (h = whead) != null && h.status != 0)
release(h);
return next & SBITS;
@@ -734,12 +749,11 @@
*
* @return {@code true} if the lock was held, else false
*/
+ @ReservedStackAccess
public boolean tryUnlockWrite() {
- long s; WNode h;
+ long s;
if (((s = state) & WBIT) != 0L) {
- U.putLongVolatile(this, STATE, (s += WBIT) == 0L ? ORIGIN : s);
- if ((h = whead) != null && h.status != 0)
- release(h);
+ unlockWriteInternal(s);
return true;
}
return false;
@@ -752,11 +766,12 @@
*
* @return {@code true} if the read lock was held, else false
*/
+ @ReservedStackAccess
public boolean tryUnlockRead() {
long s, m; WNode h;
while ((m = (s = state) & ABITS) != 0L && m < WBIT) {
if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, s - RUNIT)) {
+ if (STATE.compareAndSet(this, s, s - RUNIT)) {
if (m == RUNIT && (h = whead) != null && h.status != 0)
release(h);
return true;
@@ -832,32 +847,30 @@
* Returns a plain {@link Lock} view of this StampedLock in which
* the {@link Lock#lock} method is mapped to {@link #readLock},
* and similarly for other methods. The returned Lock does not
- * support a {@link Condition}; method {@link
- * Lock#newCondition()} throws {@code
- * UnsupportedOperationException}.
+ * support a {@link Condition}; method {@link Lock#newCondition()}
+ * throws {@code UnsupportedOperationException}.
*
* @return the lock
*/
public Lock asReadLock() {
ReadLockView v;
- return ((v = readLockView) != null ? v :
- (readLockView = new ReadLockView()));
+ if ((v = readLockView) != null) return v;
+ return readLockView = new ReadLockView();
}
/**
* Returns a plain {@link Lock} view of this StampedLock in which
* the {@link Lock#lock} method is mapped to {@link #writeLock},
* and similarly for other methods. The returned Lock does not
- * support a {@link Condition}; method {@link
- * Lock#newCondition()} throws {@code
- * UnsupportedOperationException}.
+ * support a {@link Condition}; method {@link Lock#newCondition()}
+ * throws {@code UnsupportedOperationException}.
*
* @return the lock
*/
public Lock asWriteLock() {
WriteLockView v;
- return ((v = writeLockView) != null ? v :
- (writeLockView = new WriteLockView()));
+ if ((v = writeLockView) != null) return v;
+ return writeLockView = new WriteLockView();
}
/**
@@ -870,8 +883,8 @@
*/
public ReadWriteLock asReadWriteLock() {
ReadWriteLockView v;
- return ((v = readWriteLockView) != null ? v :
- (readWriteLockView = new ReadWriteLockView()));
+ if ((v = readWriteLockView) != null) return v;
+ return readWriteLockView = new ReadWriteLockView();
}
// view classes
@@ -917,35 +930,32 @@
// Needed because view-class lock methods throw away stamps.
final void unstampedUnlockWrite() {
- WNode h; long s;
+ long s;
if (((s = state) & WBIT) == 0L)
throw new IllegalMonitorStateException();
- U.putLongVolatile(this, STATE, (s += WBIT) == 0L ? ORIGIN : s);
- if ((h = whead) != null && h.status != 0)
- release(h);
+ unlockWriteInternal(s);
}
final void unstampedUnlockRead() {
- for (;;) {
- long s, m; WNode h;
- if ((m = (s = state) & ABITS) == 0L || m >= WBIT)
- throw new IllegalMonitorStateException();
- else if (m < RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, s - RUNIT)) {
+ long s, m; WNode h;
+ while ((m = (s = state) & RBITS) > 0L) {
+ if (m < RFULL) {
+ if (STATE.compareAndSet(this, s, s - RUNIT)) {
if (m == RUNIT && (h = whead) != null && h.status != 0)
release(h);
- break;
+ return;
}
}
else if (tryDecReaderOverflow(s) != 0L)
- break;
+ return;
}
+ throw new IllegalMonitorStateException();
}
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
s.defaultReadObject();
- U.putLongVolatile(this, STATE, ORIGIN); // reset to unlocked state
+ STATE.setVolatile(this, ORIGIN); // reset to unlocked state
}
// internals
@@ -961,15 +971,16 @@
private long tryIncReaderOverflow(long s) {
// assert (s & ABITS) >= RFULL;
if ((s & ABITS) == RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, s | RBITS)) {
+ if (STATE.compareAndSet(this, s, s | RBITS)) {
++readerOverflow;
- U.putLongVolatile(this, STATE, s);
+ STATE.setVolatile(this, s);
return s;
}
}
- else if ((LockSupport.nextSecondarySeed() &
- OVERFLOW_YIELD_RATE) == 0)
+ else if ((LockSupport.nextSecondarySeed() & OVERFLOW_YIELD_RATE) == 0)
Thread.yield();
+ else
+ Thread.onSpinWait();
return 0L;
}
@@ -982,7 +993,7 @@
private long tryDecReaderOverflow(long s) {
// assert (s & ABITS) >= RFULL;
if ((s & ABITS) == RFULL) {
- if (U.compareAndSwapLong(this, STATE, s, s | RBITS)) {
+ if (STATE.compareAndSet(this, s, s | RBITS)) {
int r; long next;
if ((r = readerOverflow) > 0) {
readerOverflow = r - 1;
@@ -990,13 +1001,14 @@
}
else
next = s - RUNIT;
- U.putLongVolatile(this, STATE, next);
+ STATE.setVolatile(this, next);
return next;
}
}
- else if ((LockSupport.nextSecondarySeed() &
- OVERFLOW_YIELD_RATE) == 0)
+ else if ((LockSupport.nextSecondarySeed() & OVERFLOW_YIELD_RATE) == 0)
Thread.yield();
+ else
+ Thread.onSpinWait();
return 0L;
}
@@ -1010,14 +1022,14 @@
private void release(WNode h) {
if (h != null) {
WNode q; Thread w;
- U.compareAndSwapInt(h, WSTATUS, WAITING, 0);
+ WSTATUS.compareAndSet(h, WAITING, 0);
if ((q = h.next) == null || q.status == CANCELLED) {
for (WNode t = wtail; t != null && t != h; t = t.prev)
if (t.status <= 0)
q = t;
}
if (q != null && (w = q.thread) != null)
- U.unpark(w);
+ LockSupport.unpark(w);
}
}
@@ -1035,25 +1047,25 @@
for (int spins = -1;;) { // spin while enqueuing
long m, s, ns;
if ((m = (s = state) & ABITS) == 0L) {
- if (U.compareAndSwapLong(this, STATE, s, ns = s + WBIT))
+ if (STATE.compareAndSet(this, s, ns = s + WBIT))
return ns;
}
else if (spins < 0)
spins = (m == WBIT && wtail == whead) ? SPINS : 0;
else if (spins > 0) {
- if (LockSupport.nextSecondarySeed() >= 0)
- --spins;
+ --spins;
+ Thread.onSpinWait();
}
else if ((p = wtail) == null) { // initialize queue
WNode hd = new WNode(WMODE, null);
- if (U.compareAndSwapObject(this, WHEAD, null, hd))
+ if (WHEAD.weakCompareAndSetVolatile(this, null, hd))
wtail = hd;
}
else if (node == null)
node = new WNode(WMODE, p);
else if (node.prev != p)
node.prev = p;
- else if (U.compareAndSwapObject(this, WTAIL, p, node)) {
+ else if (WTAIL.weakCompareAndSetVolatile(this, p, node)) {
p.next = node;
break;
}
@@ -1067,11 +1079,10 @@
spins = HEAD_SPINS;
else if (spins < MAX_HEAD_SPINS)
spins <<= 1;
- for (int k = spins;;) { // spin at head
+ for (int k = spins; k > 0; --k) { // spin at head
long s, ns;
if (((s = state) & ABITS) == 0L) {
- if (U.compareAndSwapLong(this, STATE, s,
- ns = s + WBIT)) {
+ if (STATE.compareAndSet(this, s, ns = s + WBIT)) {
whead = node;
node.prev = null;
if (wasInterrupted)
@@ -1079,17 +1090,16 @@
return ns;
}
}
- else if (LockSupport.nextSecondarySeed() >= 0 &&
- --k <= 0)
- break;
+ else
+ Thread.onSpinWait();
}
}
else if (h != null) { // help release stale waiters
WNode c; Thread w;
while ((c = h.cowait) != null) {
- if (U.compareAndSwapObject(h, WCOWAIT, c, c.cowait) &&
+ if (WCOWAIT.weakCompareAndSetVolatile(h, c, c.cowait) &&
(w = c.thread) != null)
- U.unpark(w);
+ LockSupport.unpark(w);
}
}
if (whead == h) {
@@ -1098,7 +1108,7 @@
(p = np).next = node; // stale
}
else if ((ps = p.status) == 0)
- U.compareAndSwapInt(p, WSTATUS, 0, WAITING);
+ WSTATUS.compareAndSet(p, 0, WAITING);
else if (ps == CANCELLED) {
if ((pp = p.prev) != null) {
node.prev = pp;
@@ -1112,13 +1122,15 @@
else if ((time = deadline - System.nanoTime()) <= 0L)
return cancelWaiter(node, node, false);
Thread wt = Thread.currentThread();
- U.putObject(wt, PARKBLOCKER, this);
node.thread = wt;
if (p.status < 0 && (p != h || (state & ABITS) != 0L) &&
- whead == h && node.prev == p)
- U.park(false, time); // emulate LockSupport.park
+ whead == h && node.prev == p) {
+ if (time == 0L)
+ LockSupport.park(this);
+ else
+ LockSupport.parkNanos(this, time);
+ }
node.thread = null;
- U.putObject(wt, PARKBLOCKER, null);
if (Thread.interrupted()) {
if (interruptible)
return cancelWaiter(node, node, true);
@@ -1146,7 +1158,7 @@
if ((h = whead) == (p = wtail)) {
for (long m, s, ns;;) {
if ((m = (s = state) & ABITS) < RFULL ?
- U.compareAndSwapLong(this, STATE, s, ns = s + RUNIT) :
+ STATE.compareAndSet(this, s, ns = s + RUNIT) :
(m < WBIT && (ns = tryIncReaderOverflow(s)) != 0L)) {
if (wasInterrupted)
Thread.currentThread().interrupt();
@@ -1154,8 +1166,8 @@
}
else if (m >= WBIT) {
if (spins > 0) {
- if (LockSupport.nextSecondarySeed() >= 0)
- --spins;
+ --spins;
+ Thread.onSpinWait();
}
else {
if (spins == 0) {
@@ -1170,7 +1182,7 @@
}
if (p == null) { // initialize queue
WNode hd = new WNode(WMODE, null);
- if (U.compareAndSwapObject(this, WHEAD, null, hd))
+ if (WHEAD.weakCompareAndSetVolatile(this, null, hd))
wtail = hd;
}
else if (node == null)
@@ -1178,27 +1190,25 @@
else if (h == p || p.mode != RMODE) {
if (node.prev != p)
node.prev = p;
- else if (U.compareAndSwapObject(this, WTAIL, p, node)) {
+ else if (WTAIL.weakCompareAndSetVolatile(this, p, node)) {
p.next = node;
break;
}
}
- else if (!U.compareAndSwapObject(p, WCOWAIT,
- node.cowait = p.cowait, node))
+ else if (!WCOWAIT.compareAndSet(p, node.cowait = p.cowait, node))
node.cowait = null;
else {
for (;;) {
WNode pp, c; Thread w;
if ((h = whead) != null && (c = h.cowait) != null &&
- U.compareAndSwapObject(h, WCOWAIT, c, c.cowait) &&
+ WCOWAIT.compareAndSet(h, c, c.cowait) &&
(w = c.thread) != null) // help release
- U.unpark(w);
+ LockSupport.unpark(w);
if (h == (pp = p.prev) || h == p || pp == null) {
long m, s, ns;
do {
if ((m = (s = state) & ABITS) < RFULL ?
- U.compareAndSwapLong(this, STATE, s,
- ns = s + RUNIT) :
+ STATE.compareAndSet(this, s, ns = s + RUNIT) :
(m < WBIT &&
(ns = tryIncReaderOverflow(s)) != 0L)) {
if (wasInterrupted)
@@ -1221,13 +1231,15 @@
return cancelWaiter(node, p, false);
}
Thread wt = Thread.currentThread();
- U.putObject(wt, PARKBLOCKER, this);
node.thread = wt;
if ((h != pp || (state & ABITS) == WBIT) &&
- whead == h && p.prev == pp)
- U.park(false, time);
+ whead == h && p.prev == pp) {
+ if (time == 0L)
+ LockSupport.park(this);
+ else
+ LockSupport.parkNanos(this, time);
+ }
node.thread = null;
- U.putObject(wt, PARKBLOCKER, null);
if (Thread.interrupted()) {
if (interruptible)
return cancelWaiter(node, p, true);
@@ -1248,32 +1260,32 @@
for (int k = spins;;) { // spin at head
long m, s, ns;
if ((m = (s = state) & ABITS) < RFULL ?
- U.compareAndSwapLong(this, STATE, s, ns = s + RUNIT) :
+ STATE.compareAndSet(this, s, ns = s + RUNIT) :
(m < WBIT && (ns = tryIncReaderOverflow(s)) != 0L)) {
WNode c; Thread w;
whead = node;
node.prev = null;
while ((c = node.cowait) != null) {
- if (U.compareAndSwapObject(node, WCOWAIT,
- c, c.cowait) &&
+ if (WCOWAIT.compareAndSet(node, c, c.cowait) &&
(w = c.thread) != null)
- U.unpark(w);
+ LockSupport.unpark(w);
}
if (wasInterrupted)
Thread.currentThread().interrupt();
return ns;
}
- else if (m >= WBIT &&
- LockSupport.nextSecondarySeed() >= 0 && --k <= 0)
+ else if (m >= WBIT && --k <= 0)
break;
+ else
+ Thread.onSpinWait();
}
}
else if (h != null) {
WNode c; Thread w;
while ((c = h.cowait) != null) {
- if (U.compareAndSwapObject(h, WCOWAIT, c, c.cowait) &&
+ if (WCOWAIT.compareAndSet(h, c, c.cowait) &&
(w = c.thread) != null)
- U.unpark(w);
+ LockSupport.unpark(w);
}
}
if (whead == h) {
@@ -1282,7 +1294,7 @@
(p = np).next = node; // stale
}
else if ((ps = p.status) == 0)
- U.compareAndSwapInt(p, WSTATUS, 0, WAITING);
+ WSTATUS.compareAndSet(p, 0, WAITING);
else if (ps == CANCELLED) {
if ((pp = p.prev) != null) {
node.prev = pp;
@@ -1296,14 +1308,16 @@
else if ((time = deadline - System.nanoTime()) <= 0L)
return cancelWaiter(node, node, false);
Thread wt = Thread.currentThread();
- U.putObject(wt, PARKBLOCKER, this);
node.thread = wt;
if (p.status < 0 &&
(p != h || (state & ABITS) == WBIT) &&
- whead == h && node.prev == p)
- U.park(false, time);
+ whead == h && node.prev == p) {
+ if (time == 0L)
+ LockSupport.park(this);
+ else
+ LockSupport.parkNanos(this, time);
+ }
node.thread = null;
- U.putObject(wt, PARKBLOCKER, null);
if (Thread.interrupted()) {
if (interruptible)
return cancelWaiter(node, node, true);
@@ -1325,7 +1339,7 @@
* AbstractQueuedSynchronizer (see its detailed explanation in AQS
* internal documentation).
*
- * @param node if nonnull, the waiter
+ * @param node if non-null, the waiter
* @param group either node or the group node is cowaiting with
* @param interrupted if already interrupted
* @return INTERRUPTED if interrupted or Thread.interrupted, else zero
@@ -1337,7 +1351,7 @@
// unsplice cancelled nodes from group
for (WNode p = group, q; (q = p.cowait) != null;) {
if (q.status == CANCELLED) {
- U.compareAndSwapObject(p, WCOWAIT, q, q.cowait);
+ WCOWAIT.compareAndSet(p, q, q.cowait);
p = group; // restart
}
else
@@ -1346,7 +1360,7 @@
if (group == node) {
for (WNode r = group.cowait; r != null; r = r.cowait) {
if ((w = r.thread) != null)
- U.unpark(w); // wake up uncancelled co-waiters
+ LockSupport.unpark(w); // wake up uncancelled co-waiters
}
for (WNode pred = node.prev; pred != null; ) { // unsplice
WNode succ, pp; // find valid successor
@@ -1357,23 +1371,23 @@
if (t.status != CANCELLED)
q = t; // don't link if succ cancelled
if (succ == q || // ensure accurate successor
- U.compareAndSwapObject(node, WNEXT,
- succ, succ = q)) {
+ WNEXT.compareAndSet(node, succ, succ = q)) {
if (succ == null && node == wtail)
- U.compareAndSwapObject(this, WTAIL, node, pred);
+ WTAIL.compareAndSet(this, node, pred);
break;
}
}
if (pred.next == node) // unsplice pred link
- U.compareAndSwapObject(pred, WNEXT, node, succ);
+ WNEXT.compareAndSet(pred, node, succ);
if (succ != null && (w = succ.thread) != null) {
+ // wake up succ to observe new pred
succ.thread = null;
- U.unpark(w); // wake up succ to observe new pred
+ LockSupport.unpark(w);
}
if (pred.status != CANCELLED || (pp = pred.prev) == null)
break;
node.prev = pp; // repeat if new pred wrong/cancelled
- U.compareAndSwapObject(pp, WNEXT, pred, succ);
+ WNEXT.compareAndSet(pp, pred, succ);
pred = pp;
}
}
@@ -1397,34 +1411,22 @@
return (interrupted || Thread.interrupted()) ? INTERRUPTED : 0L;
}
- // Unsafe mechanics
- private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
- private static final long STATE;
- private static final long WHEAD;
- private static final long WTAIL;
- private static final long WNEXT;
- private static final long WSTATUS;
- private static final long WCOWAIT;
- private static final long PARKBLOCKER;
-
+ // VarHandle mechanics
+ private static final VarHandle STATE;
+ private static final VarHandle WHEAD;
+ private static final VarHandle WTAIL;
+ private static final VarHandle WNEXT;
+ private static final VarHandle WSTATUS;
+ private static final VarHandle WCOWAIT;
static {
try {
- STATE = U.objectFieldOffset
- (StampedLock.class.getDeclaredField("state"));
- WHEAD = U.objectFieldOffset
- (StampedLock.class.getDeclaredField("whead"));
- WTAIL = U.objectFieldOffset
- (StampedLock.class.getDeclaredField("wtail"));
-
- WSTATUS = U.objectFieldOffset
- (WNode.class.getDeclaredField("status"));
- WNEXT = U.objectFieldOffset
- (WNode.class.getDeclaredField("next"));
- WCOWAIT = U.objectFieldOffset
- (WNode.class.getDeclaredField("cowait"));
-
- PARKBLOCKER = U.objectFieldOffset
- (Thread.class.getDeclaredField("parkBlocker"));
+ MethodHandles.Lookup l = MethodHandles.lookup();
+ STATE = l.findVarHandle(StampedLock.class, "state", long.class);
+ WHEAD = l.findVarHandle(StampedLock.class, "whead", WNode.class);
+ WTAIL = l.findVarHandle(StampedLock.class, "wtail", WNode.class);
+ WSTATUS = l.findVarHandle(WNode.class, "status", int.class);
+ WNEXT = l.findVarHandle(WNode.class, "next", WNode.class);
+ WCOWAIT = l.findVarHandle(WNode.class, "cowait", WNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/package-info.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/package-info.java Thu Jul 21 17:13:23 2016 +0000
@@ -262,7 +262,6 @@
*
* </ul>
*
- *
* The methods of all classes in {@code java.util.concurrent} and its
* subpackages extend these guarantees to higher-level
* synchronization. In particular:
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java Thu Jul 21 17:13:23 2016 +0000
@@ -141,7 +141,6 @@
private boolean verify;
private final Runtime.Version version; // current version
private final int versionMajor; // version.major()
- private boolean notVersioned; // legacy constructor called
private boolean isMultiRelease; // is jar multi-release?
// indicates if Class-Path attribute present
@@ -290,7 +289,6 @@
*/
public JarFile(File file, boolean verify, int mode) throws IOException {
this(file, verify, mode, BASE_VERSION);
- this.notVersioned = true;
}
/**
@@ -496,42 +494,14 @@
Iterator<JarEntry>
{
final Enumeration<? extends ZipEntry> e = JarFile.super.entries();
- ZipEntry ze;
public boolean hasNext() {
- if (notVersioned) {
- return e.hasMoreElements();
- }
- if (ze != null) {
- return true;
- }
- return findNext();
- }
-
- private boolean findNext() {
- while (e.hasMoreElements()) {
- ZipEntry ze2 = e.nextElement();
- if (!ze2.getName().startsWith(META_INF_VERSIONS)) {
- ze = ze2;
- return true;
- }
- }
- return false;
+ return e.hasMoreElements();
}
public JarEntry next() {
- ZipEntry ze2;
-
- if (notVersioned) {
- ze2 = e.nextElement();
- return new JarFileEntry(ze2.getName(), ze2);
- }
- if (ze != null || findNext()) {
- ze2 = ze;
- ze = null;
- return new JarFileEntry(ze2);
- }
- throw new NoSuchElementException();
+ ZipEntry ze = e.nextElement();
+ return new JarFileEntry(ze.getName(), ze);
}
public boolean hasMoreElements() {
@@ -548,19 +518,7 @@
}
/**
- * Returns an enumeration of the jar file entries. The set of entries
- * returned depends on whether or not the jar file is a multi-release jar
- * file, and on the constructor used to create the {@code JarFile}. If the
- * jar file is not a multi-release jar file, all entries are returned,
- * regardless of how the {@code JarFile} is created. If the constructor
- * does not take a {@code Release} argument, all entries are returned.
- * If the jar file is a multi-release jar file and the constructor takes a
- * {@code Release} argument, then the set of entries returned is equivalent
- * to the set of entries that would be returned if the set was built by
- * invoking {@link JarFile#getEntry(String)} or
- * {@link JarFile#getJarEntry(String)} with the name of each base entry in
- * the jar file. A base entry is an entry whose path name does not start
- * with "META-INF/versions/".
+ * Returns an enumeration of the jar file entries.
*
* @return an enumeration of the jar file entries
* @throws IllegalStateException
@@ -571,24 +529,26 @@
}
/**
- * Returns an ordered {@code Stream} over all the jar file entries.
+ * Returns an ordered {@code Stream} over the jar file entries.
* Entries appear in the {@code Stream} in the order they appear in
- * the central directory of the jar file. The set of entries
- * returned depends on whether or not the jar file is a multi-release jar
- * file, and on the constructor used to create the {@code JarFile}. If the
- * jar file is not a multi-release jar file, all entries are returned,
- * regardless of how the {@code JarFile} is created. If the constructor
- * does not take a {@code Release} argument, all entries are returned.
- * If the jar file is a multi-release jar file and the constructor takes a
- * {@code Release} argument, then the set of entries returned is equivalent
- * to the set of entries that would be returned if the set was built by
- * invoking {@link JarFile#getEntry(String)} or
- * {@link JarFile#getJarEntry(String)} with the name of each base entry in
- * the jar file. A base entry is an entry whose path name does not start
- * with "META-INF/versions/".
+ * the central directory of the jar file.
+ *
* @return an ordered {@code Stream} of entries in this jar file
* @throws IllegalStateException if the jar file has been closed
* @since 1.8
+ *
+ * @apiNote A versioned view of the stream obtained from a {@code JarFile}
+ * configured to process a multi-release jar file can be created with code
+ * similar to the following:
+ * <pre>
+ * {@code
+ * Stream<JarEntry> versionedStream(JarFile jf) {
+ * return jf.stream().map(JarEntry::getName)
+ * .filter(name -> !name.startsWith("META-INF/versions/"))
+ * .map(jf::getJarEntry);
+ * }
+ * }
+ * </pre>
*/
public Stream<JarEntry> stream() {
return StreamSupport.stream(Spliterators.spliterator(
--- a/jdk/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -110,16 +110,18 @@
* {@code SubjectDomainCombiner}.
*
* <p> A new {@code ProtectionDomain} instance is created
- * for each {@code ProtectionDomain} in the
- * {@code currentDomains} array. Each new {@code ProtectionDomain}
+ * for each non-static {@code ProtectionDomain} (
+ * (staticPermissionsOnly() == false)
+ * in the {@code currentDomains} array. Each new {@code ProtectionDomain}
* instance is created using the {@code CodeSource},
* {@code Permission}s and {@code ClassLoader}
* from the corresponding {@code ProtectionDomain} in
* {@code currentDomains}, as well as with the Principals from
* the {@code Subject} associated with this
- * {@code SubjectDomainCombiner}.
+ * {@code SubjectDomainCombiner}. Static ProtectionDomains are
+ * combined as-is and no new instance is created.
*
- * <p> All of the newly instantiated ProtectionDomains are
+ * <p> All of the ProtectionDomains (static and newly instantiated) are
* combined into a new array. The ProtectionDomains from the
* {@code assignedDomains} array are appended to this new array,
* and the result is returned.
@@ -233,10 +235,15 @@
subjectPd = cachedPDs.getValue(pd);
if (subjectPd == null) {
- subjectPd = new ProtectionDomain(pd.getCodeSource(),
+ if (pd.staticPermissionsOnly()) {
+ // keep static ProtectionDomain objects static
+ subjectPd = pd;
+ } else {
+ subjectPd = new ProtectionDomain(pd.getCodeSource(),
pd.getPermissions(),
pd.getClassLoader(),
principals);
+ }
cachedPDs.putValue(pd, subjectPd);
} else {
allNew = false;
@@ -335,60 +342,62 @@
ProtectionDomain subjectPd = cachedPDs.getValue(pd);
if (subjectPd == null) {
-
- // XXX
- // we must first add the original permissions.
- // that way when we later add the new JAAS permissions,
- // any unresolved JAAS-related permissions will
- // automatically get resolved.
+ if (pd.staticPermissionsOnly()) {
+ // keep static ProtectionDomain objects static
+ subjectPd = pd;
+ } else {
+ // XXX
+ // we must first add the original permissions.
+ // that way when we later add the new JAAS permissions,
+ // any unresolved JAAS-related permissions will
+ // automatically get resolved.
- // get the original perms
- Permissions perms = new Permissions();
- PermissionCollection coll = pd.getPermissions();
- java.util.Enumeration<Permission> e;
- if (coll != null) {
- synchronized (coll) {
- e = coll.elements();
- while (e.hasMoreElements()) {
- Permission newPerm =
+ // get the original perms
+ Permissions perms = new Permissions();
+ PermissionCollection coll = pd.getPermissions();
+ java.util.Enumeration<Permission> e;
+ if (coll != null) {
+ synchronized (coll) {
+ e = coll.elements();
+ while (e.hasMoreElements()) {
+ Permission newPerm =
e.nextElement();
- perms.add(newPerm);
+ perms.add(newPerm);
+ }
}
}
- }
-
- // get perms from the policy
- final java.security.CodeSource finalCs = pd.getCodeSource();
- final Subject finalS = subject;
- PermissionCollection newPerms =
- java.security.AccessController.doPrivileged
- (new PrivilegedAction<PermissionCollection>() {
- @SuppressWarnings("deprecation")
- public PermissionCollection run() {
- return
- javax.security.auth.Policy.getPolicy().getPermissions
- (finalS, finalCs);
- }
- });
+ // get perms from the policy
+ final java.security.CodeSource finalCs = pd.getCodeSource();
+ final Subject finalS = subject;
+ PermissionCollection newPerms =
+ java.security.AccessController.doPrivileged
+ (new PrivilegedAction<PermissionCollection>() {
+ @SuppressWarnings("deprecation")
+ public PermissionCollection run() {
+ return
+ javax.security.auth.Policy.getPolicy().getPermissions
+ (finalS, finalCs);
+ }
+ });
- // add the newly granted perms,
- // avoiding duplicates
- synchronized (newPerms) {
- e = newPerms.elements();
- while (e.hasMoreElements()) {
- Permission newPerm = e.nextElement();
- if (!perms.implies(newPerm)) {
- perms.add(newPerm);
- if (debug != null)
- debug.println (
- "Adding perm " + newPerm + "\n");
+ // add the newly granted perms,
+ // avoiding duplicates
+ synchronized (newPerms) {
+ e = newPerms.elements();
+ while (e.hasMoreElements()) {
+ Permission newPerm = e.nextElement();
+ if (!perms.implies(newPerm)) {
+ perms.add(newPerm);
+ if (debug != null)
+ debug.println (
+ "Adding perm " + newPerm + "\n");
+ }
}
}
+ subjectPd = new ProtectionDomain
+ (finalCs, perms, pd.getClassLoader(), principals);
}
- subjectPd = new ProtectionDomain
- (finalCs, perms, pd.getClassLoader(), principals);
-
if (allowCaching)
cachedPDs.putValue(pd, subjectPd);
}
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java Thu Jul 21 17:13:23 2016 +0000
@@ -21,7 +21,7 @@
* 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 jdk.internal.jimage;
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java Thu Jul 21 17:13:23 2016 +0000
@@ -3,18 +3,18 @@
* 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
--- a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java Thu Jul 21 17:13:23 2016 +0000
@@ -26,8 +26,6 @@
package jdk.internal.misc;
import jdk.internal.HotSpotIntrinsicCandidate;
-import jdk.internal.reflect.CallerSensitive;
-import jdk.internal.reflect.Reflection;
import jdk.internal.vm.annotation.ForceInline;
import java.lang.reflect.Field;
@@ -57,7 +55,6 @@
private static native void registerNatives();
static {
registerNatives();
- Reflection.registerMethodsToFilter(Unsafe.class, "getUnsafe");
}
private Unsafe() {}
@@ -87,16 +84,8 @@
* }}</pre>
*
* (It may assist compilers to make the local variable {@code final}.)
- *
- * @throws SecurityException if the class loader of the caller
- * class is not in the system domain in which all permissions
- * are granted.
*/
- @CallerSensitive
public static Unsafe getUnsafe() {
- Class<?> caller = Reflection.getCallerClass();
- if (!VM.isSystemDomainLoader(caller.getClassLoader()))
- throw new SecurityException("Unsafe");
return theUnsafe;
}
--- a/jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,3 @@
-package jdk.internal.ref;
-
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,6 +23,8 @@
* questions.
*/
+package jdk.internal.ref;
+
import java.lang.ref.Cleaner;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
--- a/jdk/src/java.base/share/classes/module-info.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/module-info.java Thu Jul 21 17:13:23 2016 +0000
@@ -282,15 +282,18 @@
jdk.security.auth;
exports sun.text.resources to
jdk.localedata;
- exports sun.util.resources to
- jdk.localedata;
+ exports sun.util.cldr to
+ jdk.jlink;
exports sun.util.locale.provider to
java.desktop,
+ jdk.jlink,
jdk.localedata;
exports sun.util.logging to
java.desktop,
java.logging,
java.prefs;
+ exports sun.util.resources to
+ jdk.localedata;
// JDK-internal service types
uses jdk.internal.logger.DefaultLoggerFinder;
--- a/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
@@ -1707,7 +1707,7 @@
*/
public InputStream nameList(String path) throws sun.net.ftp.FtpProtocolException, IOException {
Socket s;
- s = openDataConnection("NLST " + path);
+ s = openDataConnection(path == null ? "NLST" : "NLST " + path);
if (s != null) {
return createInputStream(s.getInputStream());
}
--- a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -65,15 +65,7 @@
}
public String toString() {
- Type componentType = getGenericComponentType();
- StringBuilder sb = new StringBuilder();
-
- if (componentType instanceof Class)
- sb.append(((Class)componentType).getName() );
- else
- sb.append(componentType.toString());
- sb.append("[]");
- return sb.toString();
+ return getGenericComponentType().getTypeName() + "[]";
}
@Override
--- a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -33,6 +33,7 @@
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.util.Arrays;
+import java.util.StringJoiner;
import java.util.Objects;
/** Implementing class for ParameterizedType interface. */
@@ -207,12 +208,9 @@
StringBuilder sb = new StringBuilder();
if (ownerType != null) {
- if (ownerType instanceof Class)
- sb.append(((Class)ownerType).getName());
- else
- sb.append(ownerType.toString());
+ sb.append(ownerType.getTypeName());
- sb.append(".");
+ sb.append("$");
if (ownerType instanceof ParameterizedTypeImpl) {
// Find simple name of nested type by removing the
@@ -220,21 +218,17 @@
sb.append(rawType.getName().replace( ((ParameterizedTypeImpl)ownerType).rawType.getName() + "$",
""));
} else
- sb.append(rawType.getName());
+ sb.append(rawType.getSimpleName());
} else
sb.append(rawType.getName());
- if (actualTypeArguments != null &&
- actualTypeArguments.length > 0) {
- sb.append("<");
- boolean first = true;
+ if (actualTypeArguments != null) {
+ StringJoiner sj = new StringJoiner(", ", "<", ">");
+ sj.setEmptyValue("");
for(Type t: actualTypeArguments) {
- if (!first)
- sb.append(", ");
- sb.append(t.getTypeName());
- first = false;
+ sj.add(t.getTypeName());
}
- sb.append(">");
+ sb.append(sj.toString());
}
return sb.toString();
--- a/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -32,6 +32,7 @@
import sun.reflect.generics.tree.FieldTypeSignature;
import sun.reflect.generics.visitor.Reifier;
import java.util.Arrays;
+import java.util.StringJoiner;
/**
@@ -156,14 +157,12 @@
assert bounds.length > 0;
- boolean first = true;
+ StringJoiner sj = new StringJoiner(" & ");
for(Type bound: bounds) {
- if (!first)
- sb.append(" & ");
+ sj.add(bound.getTypeName());
+ }
+ sb.append(sj.toString());
- first = false;
- sb.append(bound.getTypeName());
- }
return sb.toString();
}
--- a/jdk/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/jdk/src/java.base/share/native/include/jvmti.h Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/include/jvmti.h Thu Jul 21 17:13:23 2016 +0000
@@ -1217,8 +1217,11 @@
jmethodID method,
jlocation location);
- /* 40 : RESERVED */
- void *reserved40;
+ /* 40 : Get Named Module */
+ jvmtiError (JNICALL *GetNamedModule) (jvmtiEnv* env,
+ jobject class_loader,
+ const char* package_name,
+ jobject* module_ptr);
/* 41 : Set Field Access Watch */
jvmtiError (JNICALL *SetFieldAccessWatch) (jvmtiEnv* env,
@@ -2146,6 +2149,12 @@
return functions->GetAllModules(this, module_count_ptr, modules_ptr);
}
+ jvmtiError GetNamedModule(jobject class_loader,
+ const char* package_name,
+ jobject* module_ptr) {
+ return functions->GetNamedModule(this, class_loader, package_name, module_ptr);
+ }
+
jvmtiError GetLoadedClasses(jint* class_count_ptr,
jclass** classes_ptr) {
return functions->GetLoadedClasses(this, class_count_ptr, classes_ptr);
--- a/jdk/src/java.base/share/native/libfdlibm/e_acos.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_acos.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_asin.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_asin.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_atan2.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_atan2.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_atanh.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_atanh.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_cosh.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_cosh.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_exp.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_exp.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_fmod.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_fmod.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_log.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_log.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_log10.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_log10.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_remainder.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_remainder.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_scalb.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_scalb.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/e_sinh.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/e_sinh.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/fdlibm.h Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/fdlibm.h Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/k_cos.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/k_cos.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/k_sin.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/k_sin.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/k_standard.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/k_standard.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/k_tan.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/k_tan.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_atan.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_atan.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_ceil.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_ceil.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_copysign.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_copysign.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_cos.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_cos.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_expm1.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_expm1.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_fabs.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_fabs.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_finite.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_finite.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_floor.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_floor.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_frexp.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_frexp.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_ilogb.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_ilogb.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_isnan.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_isnan.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_ldexp.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_ldexp.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_lib_version.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_lib_version.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_log1p.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_log1p.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_logb.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_logb.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_matherr.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_matherr.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_modf.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_modf.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_nextafter.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_nextafter.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_rint.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_rint.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_scalbn.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_scalbn.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_significand.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_significand.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_sin.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_sin.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_tan.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_tan.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libfdlibm/s_tanh.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libfdlibm/s_tanh.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.base/share/native/libjimage/NativeImageBuffer.cpp Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libjimage/NativeImageBuffer.cpp Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/java.base/share/native/libjimage/endian.cpp Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libjimage/endian.cpp Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/java.base/share/native/libjimage/imageFile.cpp Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libjimage/imageFile.cpp Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/java.base/share/native/libjimage/jimage.cpp Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/share/native/libjimage/jimage.cpp Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -85,7 +85,7 @@
* Ex.
* const char* package = (*JImagePackageToModule)(image, "java/lang");
* tty->print_cr(package);
- * —> java.base
+ * -> java.base
*/
extern "C" const char* JIMAGE_PackageToModule(JImageFile* image, const char* package_name) {
return ((ImageFileReader*) image)->get_image_module_data()->package_to_module(package_name);
@@ -137,7 +137,7 @@
}
/*
- * JImageGetResource - Given an open image file (see JImageOpen), a resource’s
+ * JImageGetResource - Given an open image file (see JImageOpen), a resource's
* location information (see JImageFindResource), a buffer of appropriate
* size and the size, retrieve the bytes associated with the
* resource. If the size is less than the resource size then the read is truncated.
@@ -168,7 +168,7 @@
* Ex.
* bool ctw_visitor(JImageFile* jimage, const char* module_name, const char* version,
* const char* package, const char* name, const char* extension, void* arg) {
- * if (strcmp(extension, “class”) == 0) {
+ * if (strcmp(extension, "class") == 0) {
* char path[JIMAGE_MAX_PATH];
* Thread* THREAD = Thread::current();
* jio_snprintf(path, JIMAGE_MAX_PATH - 1, "/%s/%s", package, name);
--- a/jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.lang;
import java.io.File;
--- a/jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007,2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011, 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
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net;
import sun.security.action.GetPropertyAction;
--- a/jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.lang;
import java.io.File;
--- a/jdk/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
@@ -37,6 +37,7 @@
import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
+import java.security.SecureRandom;
import java.util.Random;
@@ -47,24 +48,16 @@
class PipeImpl
extends Pipe
{
+ // Number of bytes in the secret handshake.
+ private static final int NUM_SECRET_BYTES = 16;
+
+ // Random object for handshake values
+ private static final Random RANDOM_NUMBER_GENERATOR = new SecureRandom();
// Source and sink channels
private SourceChannel source;
private SinkChannel sink;
- // Random object for handshake values
- private static final Random rnd;
-
- static {
- byte[] someBytes = new byte[8];
- boolean resultOK = IOUtil.randomBytes(someBytes);
- if (resultOK) {
- rnd = new Random(ByteBuffer.wrap(someBytes).getLong());
- } else {
- rnd = new Random();
- }
- }
-
private class Initializer
implements PrivilegedExceptionAction<Void>
{
@@ -112,6 +105,10 @@
SocketChannel sc2 = null;
try {
+ // Create secret with a backing array.
+ ByteBuffer secret = ByteBuffer.allocate(NUM_SECRET_BYTES);
+ ByteBuffer bb = ByteBuffer.allocate(NUM_SECRET_BYTES);
+
// Loopback address
InetAddress lb = InetAddress.getByName("127.0.0.1");
assert(lb.isLoopbackAddress());
@@ -128,18 +125,22 @@
// Establish connection (assume connections are eagerly
// accepted)
sc1 = SocketChannel.open(sa);
- ByteBuffer bb = ByteBuffer.allocate(8);
- long secret = rnd.nextLong();
- bb.putLong(secret).flip();
- sc1.write(bb);
+ RANDOM_NUMBER_GENERATOR.nextBytes(secret.array());
+ do {
+ sc1.write(secret);
+ } while (secret.hasRemaining());
+ secret.rewind();
// Get a connection and verify it is legitimate
sc2 = ssc.accept();
- bb.clear();
- sc2.read(bb);
+ do {
+ sc2.read(bb);
+ } while (bb.hasRemaining());
bb.rewind();
- if (bb.getLong() == secret)
+
+ if (bb.equals(secret))
break;
+
sc2.close();
sc1.close();
}
--- a/jdk/src/java.base/windows/native/libjava/jni_util_md.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/windows/native/libjava/jni_util_md.c Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2014, 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
--- a/jdk/src/java.base/windows/native/libjli/java_md.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.base/windows/native/libjli/java_md.c Thu Jul 21 17:13:23 2016 +0000
@@ -1006,10 +1006,11 @@
// make a copy of the args which will be expanded in java if required.
nargv = (char **)JLI_MemAlloc(argc * sizeof(char*));
for (i = 0; i < argc; i++) {
+ jboolean arg_expand;
j = appArgIdx[i];
- jboolean arg_expand = (JLI_StrCmp(stdargs[j].arg, strv[i]) == 0)
- ? stdargs[j].has_wildcard
- : JNI_FALSE;
+ arg_expand = (JLI_StrCmp(stdargs[j].arg, strv[i]) == 0)
+ ? stdargs[j].has_wildcard
+ : JNI_FALSE;
if (needs_expansion == JNI_FALSE)
needs_expansion = arg_expand;
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp Thu Jul 21 17:13:23 2016 +0000
@@ -256,7 +256,7 @@
AwtFont* awtFont = NULL;
jobjectArray compFont = NULL;
- int cfnum;
+ int cfnum = 0;
try {
if (env->EnsureLocalCapacity(3) < 0)
@@ -264,7 +264,9 @@
if (IsMultiFont(env, font)) {
compFont = GetComponentFonts(env, font);
- cfnum = env->GetArrayLength(compFont);
+ if (compFont != NULL) {
+ cfnum = env->GetArrayLength(compFont);
+ }
} else {
compFont = NULL;
cfnum = 0;
@@ -647,7 +649,9 @@
if (IsMultiFont(env, font)) {
array = GetComponentFonts(env, font);
- num = env->GetArrayLength(array);
+ if (array != NULL) {
+ num = env->GetArrayLength(array);
+ }
} else {
array = NULL;
num = 0;
@@ -705,14 +709,16 @@
if (IsMultiFont(env, font)) {
jobject peer = env->CallObjectMethod(font, AwtFont::peerMID);
- array = (jobjectArray)(env->CallObjectMethod(
- peer, AwtFont::makeConvertedMultiFontStringMID, str));
- DASSERT(!safe_ExceptionOccurred(env));
+ if (peer != NULL) {
+ array = (jobjectArray)(env->CallObjectMethod(
+ peer, AwtFont::makeConvertedMultiFontStringMID, str));
+ DASSERT(!safe_ExceptionOccurred(env));
- if (array != NULL) {
- arrayLength = env->GetArrayLength(array);
+ if (array != NULL) {
+ arrayLength = env->GetArrayLength(array);
+ }
+ env->DeleteLocalRef(peer);
}
- env->DeleteLocalRef(peer);
} else {
array = NULL;
arrayLength = 0;
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h Thu Jul 21 17:13:23 2016 +0000
@@ -230,11 +230,14 @@
INLINE static jobjectArray GetComponentFonts(JNIEnv *env,
jobject font) {
jobject platformFont = env->CallObjectMethod(font, AwtFont::peerMID);
- jobjectArray result =
- (jobjectArray)(env->GetObjectField(platformFont,
- AwtFont::componentFontsID));
- env->DeleteLocalRef(platformFont);
- return result;
+ if (platformFont != NULL) {
+ jobjectArray result =
+ (jobjectArray)(env->GetObjectField(platformFont,
+ AwtFont::componentFontsID));
+ env->DeleteLocalRef(platformFont);
+ return result;
+ }
+ return NULL;
}
/*
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncEvent.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncEvent.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.Closeable;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/BufferHandler.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/BufferHandler.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferConsumer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferConsumer.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferGenerator.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferGenerator.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ConnectionPool.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ConnectionPool.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.net.InetSocketAddress;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ContinuationFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ContinuationFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/CookieFilter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/CookieFilter.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/DataFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/DataFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ErrorFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ErrorFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Exchange.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Exchange.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ExchangeImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ExchangeImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ExecutorWrapper.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ExecutorWrapper.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.security.AccessControlContext;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/FilterFactory.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/FilterFactory.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/FrameReader.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/FrameReader.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,8 +1,28 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2015, 2016, 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.net.http;
import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/GoAwayFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/GoAwayFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFilter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFilter.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeaderParser.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeaderParser.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.util.Iterator;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeadersFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeadersFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http1Exchange.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http1Exchange.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http1Request.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http1Request.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http1Response.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http1Response.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2ClientImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2ClientImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2Frame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2Frame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientBuilderImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientBuilderImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import javax.net.ssl.SSLContext;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.Closeable;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeadersImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeadersImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.util.Collections;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestBuilderImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestBuilderImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.net.URI;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponse.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponse.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponseImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -178,7 +178,7 @@
*/
RawChannel rawChannel() throws IOException {
if (rawchan == null) {
- rawchan = new RawChannel(request.client(), connection);
+ rawchan = new RawChannelImpl(request.client(), connection);
}
return rawchan;
}
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ImmutableHeaders.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ImmutableHeaders.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Log.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Log.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.util.Locale;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/MultiExchange.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/MultiExchange.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/OutgoingHeaders.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/OutgoingHeaders.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Pair.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Pair.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
/**
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PingFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PingFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PlainHttpConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PlainHttpConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PlainProxyConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PlainProxyConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PlainTunnelingConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PlainTunnelingConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PriorityFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PriorityFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PushPromiseFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PushPromiseFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Queue.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Queue.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,151 +20,43 @@
*
* 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.net.http;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.channels.ByteChannel;
-import java.nio.channels.GatheringByteChannel;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.SocketChannel;
-//
-// Used to implement WebSocket. Each RawChannel corresponds to a TCP connection
-// (SocketChannel) but is connected to a Selector and an ExecutorService for
-// invoking the send and receive callbacks. Also includes SSL processing.
-//
-final class RawChannel implements ByteChannel, GatheringByteChannel {
+/*
+ * I/O abstraction used to implement WebSocket.
+ */
+public interface RawChannel {
- private final HttpClientImpl client;
- private final HttpConnection connection;
+ interface RawEvent {
- private interface RawEvent {
-
- /**
- * must return the selector interest op flags OR'd.
+ /*
+ * Must return the selector interest op flags.
*/
int interestOps();
- /**
- * called when event occurs.
+ /*
+ * Called when event occurs.
*/
void handle();
}
- interface NonBlockingEvent extends RawEvent {
- }
-
- RawChannel(HttpClientImpl client, HttpConnection connection)
- throws IOException {
- this.client = client;
- this.connection = connection;
- SocketChannel chan = connection.channel();
- client.cancelRegistration(chan);
- chan.configureBlocking(false);
- }
-
- SocketChannel socketChannel() {
- return connection.channel();
- }
-
- ByteBuffer getRemaining() {
- return connection.getRemaining();
- }
-
- private class RawAsyncEvent extends AsyncEvent {
-
- private final RawEvent re;
-
- RawAsyncEvent(RawEvent re) {
- super(AsyncEvent.BLOCKING); // BLOCKING & !REPEATING
- this.re = re;
- }
-
- RawAsyncEvent(RawEvent re, int flags) {
- super(flags);
- this.re = re;
- }
-
- @Override
- public SelectableChannel channel() {
- return connection.channel();
- }
-
- // must return the selector interest op flags OR'd
- @Override
- public int interestOps() {
- return re.interestOps();
- }
-
- // called when event occurs
- @Override
- public void handle() {
- re.handle();
- }
-
- @Override
- public void abort() { }
- }
-
- private class NonBlockingRawAsyncEvent extends RawAsyncEvent {
-
- NonBlockingRawAsyncEvent(RawEvent re) {
- super(re, 0); // !BLOCKING & !REPEATING
- }
- }
-
/*
* Register given event whose callback will be called once only.
* (i.e. register new event for each callback)
*/
- public void registerEvent(RawEvent event) throws IOException {
- if (!(event instanceof NonBlockingEvent)) {
- throw new InternalError();
- }
- if ((event.interestOps() & SelectionKey.OP_READ) != 0
- && connection.buffer.hasRemaining()) {
- // FIXME: a hack to deal with leftovers from previous reads into an
- // internal buffer (works in conjunction with change in
- // java.net.http.PlainHttpConnection.readImpl(java.nio.ByteBuffer)
- connection.channel().configureBlocking(false);
- event.handle();
- } else {
- client.registerEvent(new NonBlockingRawAsyncEvent(event));
- }
- }
+ void registerEvent(RawEvent event) throws IOException;
- @Override
- public int read(ByteBuffer dst) throws IOException {
- assert !connection.channel().isBlocking();
- return connection.read(dst);
- }
+ int read(ByteBuffer dst) throws IOException;
- @Override
- public boolean isOpen() {
- return connection.isOpen();
- }
-
- @Override
- public void close() throws IOException {
- connection.close();
- }
+ long write(ByteBuffer[] src, int offset, int len) throws IOException;
- @Override
- public long write(ByteBuffer[] src) throws IOException {
- return connection.write(src, 0, src.length);
- }
+ boolean isOpen();
- @Override
- public long write(ByteBuffer[] src, int offset, int len)
- throws IOException {
- return connection.write(src, offset, len);
- }
-
- @Override
- public int write(ByteBuffer src) throws IOException {
- return (int) connection.write(src);
- }
+ void close() throws IOException;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RawChannelImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2015, 2016, 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.net.http;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.SocketChannel;
+
+/*
+ * Each RawChannel corresponds to a TCP connection (SocketChannel) but is
+ * connected to a Selector and an ExecutorService for invoking the send and
+ * receive callbacks. Also includes SSL processing.
+ */
+final class RawChannelImpl implements RawChannel {
+
+ private final HttpClientImpl client;
+ private final HttpConnection connection;
+
+ RawChannelImpl(HttpClientImpl client, HttpConnection connection)
+ throws IOException {
+ this.client = client;
+ this.connection = connection;
+ SocketChannel chan = connection.channel();
+ client.cancelRegistration(chan);
+ chan.configureBlocking(false);
+ }
+
+ private class NonBlockingRawAsyncEvent extends AsyncEvent {
+
+ private final RawEvent re;
+
+ NonBlockingRawAsyncEvent(RawEvent re) {
+ super(0); // !BLOCKING & !REPEATING
+ this.re = re;
+ }
+
+ @Override
+ public SelectableChannel channel() {
+ return connection.channel();
+ }
+
+ @Override
+ public int interestOps() {
+ return re.interestOps();
+ }
+
+ @Override
+ public void handle() {
+ re.handle();
+ }
+
+ @Override
+ public void abort() { }
+ }
+
+ @Override
+ public void registerEvent(RawEvent event) throws IOException {
+ if ((event.interestOps() & SelectionKey.OP_READ) != 0
+ && connection.buffer.hasRemaining()) {
+ // FIXME: a hack to deal with leftovers from previous reads into an
+ // internal buffer (works in conjunction with change in
+ // java.net.http.PlainHttpConnection.readImpl(java.nio.ByteBuffer)
+ connection.channel().configureBlocking(false);
+ event.handle();
+ } else {
+ client.registerEvent(new NonBlockingRawAsyncEvent(event));
+ }
+ }
+
+ @Override
+ public int read(ByteBuffer dst) throws IOException {
+ assert !connection.channel().isBlocking();
+ return connection.read(dst);
+ }
+
+ @Override
+ public long write(ByteBuffer[] src, int offset, int len) throws IOException {
+ return connection.write(src, offset, len);
+ }
+
+ @Override
+ public boolean isOpen() {
+ return connection.isOpen();
+ }
+
+ @Override
+ public void close() throws IOException {
+ connection.close();
+ }
+}
--- a/jdk/src/java.httpclient/share/classes/java/net/http/RedirectFilter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RedirectFilter.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ResetFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ResetFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ResponseContent.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ResponseContent.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ResponseHeaders.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ResponseHeaders.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SSLConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SSLConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SSLDelegate.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SSLDelegate.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SSLTunnelConnection.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SSLTunnelConnection.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SettingsFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SettingsFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
@@ -466,7 +467,7 @@
public synchronized void take(int amount) throws InterruptedException {
assert permits >= 0;
- while (permits < amount) {
+ while (amount > 0) {
int n = Math.min(amount, permits);
permits -= n;
amount -= n;
@@ -498,7 +499,7 @@
DataFrame getDataFrame() throws IOException, InterruptedException {
userRequestFlowController.take();
- int maxpayloadLen = connection.getMaxSendFrameSize() - 9;
+ int maxpayloadLen = connection.getMaxSendFrameSize();
ByteBuffer buffer = connection.getBuffer();
buffer.limit(maxpayloadLen);
boolean complete = requestProcessor.onRequestBodyChunk(buffer);
--- a/jdk/src/java.httpclient/share/classes/java/net/http/TimeoutEvent.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/TimeoutEvent.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Utils.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Utils.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,7 +20,9 @@
*
* 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.net.http;
import sun.net.NetProperties;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WS.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WS.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSBuilder.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSBuilder.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.net.URI;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSCharsetToolkit.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSCharsetToolkit.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -20,7 +20,9 @@
*
* 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.net.http;
import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSDisposable.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSDisposable.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
interface WSDisposable {
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSFrameConsumer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSFrameConsumer.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.net.http.WSFrame.Opcode;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageConsumer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageConsumer.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.net.http.WebSocket.CloseCode;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageSender.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageSender.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.net.http.WSFrame.HeaderBuilder;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.UncheckedIOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSOutgoingMessage.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSOutgoingMessage.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSProtocolException.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSProtocolException.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2015, 2016, 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.net.http;
import java.net.http.WebSocket.CloseCode;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSReceiver.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSReceiver.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.IOException;
@@ -53,7 +54,7 @@
private final Supplier<WSShared<ByteBuffer>> buffersSupplier =
new WSSharedPool<>(() -> ByteBuffer.allocateDirect(32768), 2);
private final RawChannel channel;
- private final RawChannel.NonBlockingEvent channelEvent;
+ private final RawChannel.RawEvent channelEvent;
private final WSSignalHandler handler;
private final AtomicLong demand = new AtomicLong();
private final AtomicBoolean readable = new AtomicBoolean();
@@ -251,8 +252,8 @@
assert newDemand >= 0 : newDemand;
}
- private RawChannel.NonBlockingEvent createChannelEvent() {
- return new RawChannel.NonBlockingEvent() {
+ private RawChannel.RawEvent createChannelEvent() {
+ return new RawChannel.RawEvent() {
@Override
public int interestOps() {
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSShared.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSShared.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.nio.Buffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java Thu Jul 21 17:13:23 2016 +0000
@@ -3,18 +3,18 @@
* 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.nio.Buffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSSignalHandler.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSSignalHandler.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.util.concurrent.Executor;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSTransmitter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSTransmitter.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.net.http.WSOutgoingMessage.Binary;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSUtils.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSUtils.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.net.URI;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSWriter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSWriter.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,20 +1,20 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 License version 2 only, as
+ * 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 License
+ * 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 License version
+ * 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.
*
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.IOException;
@@ -60,7 +61,7 @@
final class WSWriter {
private final RawChannel channel;
- private final RawChannel.NonBlockingEvent writeReadinessHandler;
+ private final RawChannel.RawEvent writeReadinessHandler;
private final Consumer<Throwable> completionCallback;
private ByteBuffer[] buffers;
private int offset;
@@ -110,8 +111,8 @@
return -1;
}
- private RawChannel.NonBlockingEvent createHandler() {
- return new RawChannel.NonBlockingEvent() {
+ private RawChannel.RawEvent createHandler() {
+ return new RawChannel.RawEvent() {
@Override
public int interestOps() {
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WebSocket.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WebSocket.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WebSocketHandshakeException.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WebSocketHandshakeException.java Thu Jul 21 17:13:23 2016 +0000
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package java.net.http;
/**
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WindowUpdateFrame.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WindowUpdateFrame.java Thu Jul 21 17:13:23 2016 +0000
@@ -20,6 +20,7 @@
*
* 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.net.http;
--- a/jdk/src/java.httpclient/share/classes/module-info.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.httpclient/share/classes/module-info.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/jdk/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java Thu Jul 21 17:13:23 2016 +0000
@@ -38,7 +38,7 @@
* A transformer of class files. An agent registers an implementation of this
* interface using the {@link Instrumentation#addTransformer addTransformer}
* method so that the transformer's {@link
- * ClassFileTransformer#transform(Module,String,Class,ProtectionDomain,byte[])
+ * ClassFileTransformer#transform(Module,ClassLoader,String,Class,ProtectionDomain,byte[])
* transform} method is invoked when classes are loaded,
* {@link Instrumentation#redefineClasses redefined}, or
* {@link Instrumentation#retransformClasses retransformed}. The implementation
@@ -170,13 +170,13 @@
/**
* Transforms the given class file and returns a new replacement class file.
* This method is invoked when the {@link Module Module} bearing {@link
- * ClassFileTransformer#transform(Module,String,Class,ProtectionDomain,byte[])
+ * ClassFileTransformer#transform(Module,ClassLoader,String,Class,ProtectionDomain,byte[])
* transform} is not overridden.
*
* @implSpec The default implementation returns null.
*
* @param loader the defining loader of the class to be transformed,
- * may be <code>null</code> if the bootstrap loader
+ * may be {@code null} if the bootstrap loader
* @param className the name of the class in the internal form of fully
* qualified class and interface names as defined in
* <i>The Java Virtual Machine Specification</i>.
@@ -208,9 +208,11 @@
*
* @implSpec The default implementation of this method invokes the
* {@link #transform(ClassLoader,String,Class,ProtectionDomain,byte[]) transform}
- * method with the {@link Module#getClassLoader() ClassLoader} for the module.
+ * method.
*
* @param module the module of the class to be transformed
+ * @param loader the defining loader of the class to be transformed,
+ * may be {@code null} if the bootstrap loader
* @param className the name of the class in the internal form of fully
* qualified class and interface names as defined in
* <i>The Java Virtual Machine Specification</i>.
@@ -230,15 +232,13 @@
*/
default byte[]
transform( Module module,
+ ClassLoader loader,
String className,
Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer)
throws IllegalClassFormatException {
- PrivilegedAction<ClassLoader> pa = module::getClassLoader;
- ClassLoader loader = AccessController.doPrivileged(pa);
-
// invoke the legacy transform method
return transform(loader,
className,
--- a/jdk/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java Thu Jul 21 17:13:23 2016 +0000
@@ -162,7 +162,7 @@
* </li>
* <li>for each transformer that was added with <code>canRetransform</code>
* false, the bytes returned by
- * {@link ClassFileTransformer#transform(Module,String,Class,ProtectionDomain,byte[])
+ * {@link ClassFileTransformer#transform(Module,ClassLoader,String,Class,ProtectionDomain,byte[])
* transform} during the last class load or redefine are
* reused as the output of the transformation; note that this is
* equivalent to reapplying the previous transformation, unaltered;
@@ -170,7 +170,7 @@
* </li>
* <li>for each transformer that was added with <code>canRetransform</code>
* true, the
- * {@link ClassFileTransformer#transform(Module,String,Class,ProtectionDomain,byte[])
+ * {@link ClassFileTransformer#transform(Module,ClassLoader,String,Class,ProtectionDomain,byte[])
* transform} method is called in these transformers
* </li>
* <li>the transformed class file bytes are installed as the new
--- a/jdk/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java Thu Jul 21 17:13:23 2016 +0000
@@ -420,8 +420,8 @@
// WARNING: the native code knows the name & signature of this method
private byte[]
- transform( ClassLoader loader,
- Module module,
+ transform( Module module,
+ ClassLoader loader,
String classname,
Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
@@ -444,6 +444,7 @@
return null; // no manager, no transform
} else {
return mgr.transform( module,
+ loader,
classname,
classBeingRedefined,
protectionDomain,
--- a/jdk/src/java.instrument/share/classes/sun/instrument/TransformerManager.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.instrument/share/classes/sun/instrument/TransformerManager.java Thu Jul 21 17:13:23 2016 +0000
@@ -169,6 +169,7 @@
public byte[]
transform( Module module,
+ ClassLoader loader,
String classname,
Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
@@ -187,6 +188,7 @@
try {
transformedBytes = transformer.transform( module,
+ loader,
classname,
classBeingRedefined,
protectionDomain,
--- a/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c Thu Jul 21 17:13:23 2016 +0000
@@ -771,12 +771,11 @@
}
static jobject
-getModuleObject(JNIEnv * jnienv,
+getModuleObject(jvmtiEnv* jvmti,
jobject loaderObject,
const char* cname) {
- jboolean errorOutstanding = JNI_FALSE;
+ jvmtiError err = JVMTI_ERROR_NONE;
jobject moduleObject = NULL;
- jstring package = NULL;
/* find last slash in the class name */
char* last_slash = (cname == NULL) ? NULL : strrchr(cname, '/');
@@ -789,14 +788,9 @@
}
pkg_name_buf[len] = '\0';
- package = (*jnienv)->NewStringUTF(jnienv, pkg_name_buf);
- jplis_assert_msg(package != NULL, "OOM error in NewStringUTF");
+ err = (*jvmti)->GetNamedModule(jvmti, loaderObject, pkg_name_buf, &moduleObject);
+ jplis_assert_msg(err == JVMTI_ERROR_NONE, "error in the JVMTI GetNamedModule");
- moduleObject = JVM_GetModuleByPackageName(jnienv, loaderObject, package);
-
- errorOutstanding = checkForAndClearThrowable(jnienv);
- jplis_assert_msg(!errorOutstanding,
- "error in lookup of a module of the class being instrumented");
free((void*)pkg_name_buf);
return moduleObject;
}
@@ -862,7 +856,7 @@
jobject moduleObject = NULL;
if (classBeingRedefined == NULL) {
- moduleObject = getModuleObject(jnienv, loaderObject, name);
+ moduleObject = getModuleObject(jvmti(agent), loaderObject, name);
} else {
// Redefine or retransform, InstrumentationImpl.transform() will use
// classBeingRedefined.getModule() to get the module.
@@ -873,8 +867,8 @@
jnienv,
agent->mInstrumentationImpl,
agent->mTransform,
+ moduleObject,
loaderObject,
- moduleObject,
classNameStringObject,
classBeingRedefined,
protectionDomain,
--- a/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h Thu Jul 21 17:13:23 2016 +0000
@@ -66,7 +66,7 @@
#define JPLIS_INSTRUMENTIMPL_AGENTMAININVOKER_METHODSIGNATURE "(Ljava/lang/String;Ljava/lang/String;)V"
#define JPLIS_INSTRUMENTIMPL_TRANSFORM_METHODNAME "transform"
#define JPLIS_INSTRUMENTIMPL_TRANSFORM_METHODSIGNATURE \
- "(Ljava/lang/ClassLoader;Ljava/lang/reflect/Module;Ljava/lang/String;Ljava/lang/Class;Ljava/security/ProtectionDomain;[BZ)[B"
+ "(Ljava/lang/reflect/Module;Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/Class;Ljava/security/ProtectionDomain;[BZ)[B"
/*
--- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java Thu Jul 21 17:13:23 2016 +0000
@@ -81,7 +81,7 @@
* A ProtectionDomain with a null CodeSource and an empty permission set.
*/
private static final ProtectionDomain pdNoPerms =
- new ProtectionDomain(nullCodeSource, new Permissions());
+ new ProtectionDomain(nullCodeSource, new Permissions(), null, null);
/**
* Get the current AccessControlContext combined with the supplied subject.
--- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.management/share/classes/javax/management/ConstructorParameters.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/java.management/share/classes/javax/management/ConstructorParameters.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -57,12 +57,18 @@
private static final int DEFAULT_TAG_LEN = 128; // same as SunJCE provider
+ // same as SunJCE provider, see GaloisCounterMode.java for details
+ private static final int MAX_BUF_SIZE = Integer.MAX_VALUE;
+
// buffer for storing AAD data; if null, meaning buffer content has been
// supplied to native context
- private ByteArrayOutputStream aadBuffer = new ByteArrayOutputStream();
+ private ByteArrayOutputStream aadBuffer;
// buffer for storing input in decryption, not used for encryption
- private ByteArrayOutputStream ibuffer = null;
+ private ByteArrayOutputStream ibuffer;
+
+ // needed for checking against MAX_BUF_SIZE
+ private int processed;
private int tagLen = DEFAULT_TAG_LEN;
@@ -75,10 +81,22 @@
* key + iv values used in previous encryption.
* For decryption operations, no checking is necessary.
*/
- private boolean requireReinit = false;
+ private boolean requireReinit;
private byte[] lastEncKey = null;
private byte[] lastEncIv = null;
+ private void checkAndUpdateProcessed(int len) {
+ // Currently, cipher text and tag are packed in one byte array, so
+ // the impl-specific limit for input data size is (MAX_BUF_SIZE - tagLen)
+ int inputDataLimit = MAX_BUF_SIZE - tagLen;
+
+ if (processed > inputDataLimit - len) {
+ throw new ProviderException("OracleUcrypto provider only supports " +
+ "input size up to " + inputDataLimit + " bytes");
+ }
+ processed += len;
+ }
+
NativeGCMCipher(int fixedKeySize) throws NoSuchAlgorithmException {
super(UcryptoMech.CRYPTO_AES_GCM, fixedKeySize);
}
@@ -86,12 +104,14 @@
@Override
protected void ensureInitialized() {
if (!initialized) {
- if (aadBuffer != null && aadBuffer.size() > 0) {
- init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
- aadBuffer = null;
- } else {
- init(encrypt, keyValue, iv, tagLen, null);
+ byte[] aad = null;
+ if (aadBuffer != null) {
+ if (aadBuffer.size() > 0) {
+ aad = aadBuffer.toByteArray();
+ }
}
+ init(encrypt, keyValue, iv, tagLen, aad);
+ aadBuffer = null;
if (!initialized) {
throw new UcryptoException("Cannot initialize Cipher");
}
@@ -136,6 +156,7 @@
ibuffer.reset();
}
if (!encrypt) requireReinit = false;
+ processed = 0;
}
// actual init() implementation - caller should clone key and iv if needed
@@ -185,6 +206,7 @@
throw new InvalidAlgorithmParameterException
("Unsupported mode: " + opmode);
}
+ aadBuffer = new ByteArrayOutputStream();
boolean doEncrypt = (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE);
byte[] keyBytes = key.getEncoded().clone();
byte[] ivBytes = null;
@@ -219,6 +241,7 @@
}
lastEncIv = ivBytes;
lastEncKey = keyBytes;
+ ibuffer = null;
} else {
requireReinit = false;
ibuffer = new ByteArrayOutputStream();
@@ -246,15 +269,18 @@
// see JCE spec
@Override
protected synchronized byte[] engineUpdate(byte[] in, int inOfs, int inLen) {
- if (aadBuffer != null && aadBuffer.size() > 0) {
- // init again with AAD data
- init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
+ if (aadBuffer != null) {
+ if (aadBuffer.size() > 0) {
+ // init again with AAD data
+ init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
+ }
aadBuffer = null;
}
if (requireReinit) {
throw new IllegalStateException
("Must use either different key or iv for GCM encryption");
}
+ checkAndUpdateProcessed(inLen);
if (inLen > 0) {
if (!encrypt) {
ibuffer.write(in, inOfs, inLen);
@@ -274,15 +300,18 @@
"(at least) " + len + " bytes long. Got: " +
(out.length - outOfs));
}
- if (aadBuffer != null && aadBuffer.size() > 0) {
- // init again with AAD data
- init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
+ if (aadBuffer != null) {
+ if (aadBuffer.size() > 0) {
+ // init again with AAD data
+ init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
+ }
aadBuffer = null;
}
if (requireReinit) {
throw new IllegalStateException
("Must use either different key or iv for GCM encryption");
}
+ checkAndUpdateProcessed(inLen);
if (inLen > 0) {
if (!encrypt) {
ibuffer.write(in, inOfs, inLen);
@@ -374,15 +403,19 @@
+ "(at least) " + len + " bytes long. Got: " +
(out.length - outOfs));
}
- if (aadBuffer != null && aadBuffer.size() > 0) {
- // init again with AAD data
- init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
+ if (aadBuffer != null) {
+ if (aadBuffer.size() > 0) {
+ // init again with AAD data
+ init(encrypt, keyValue, iv, tagLen, aadBuffer.toByteArray());
+ }
aadBuffer = null;
}
if (requireReinit) {
throw new IllegalStateException
("Must use either different key or iv for GCM encryption");
}
+
+ checkAndUpdateProcessed(inLen);
if (!encrypt) {
if (inLen > 0) {
ibuffer.write(in, inOfs, inLen);
--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java Thu Jul 21 17:13:23 2016 +0000
@@ -39,6 +39,8 @@
import jdk.internal.jimage.BasicImageReader;
import jdk.internal.jimage.ImageHeader;
import jdk.internal.jimage.ImageLocation;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.tree.ClassNode;
import jdk.tools.jlink.internal.ImageResourcesTree;
import jdk.tools.jlink.internal.TaskHelper;
import jdk.tools.jlink.internal.TaskHelper.BadArgs;
@@ -354,16 +356,14 @@
}
void verify(BasicImageReader reader, String name, ImageLocation location) {
- if (name.endsWith(".class")) {
- byte[] bytes = reader.getResource(location);
-
- if (bytes == null || bytes.length <= 4 ||
- (bytes[0] & 0xFF) != 0xCA ||
- (bytes[1] & 0xFF) != 0xFE ||
- (bytes[2] & 0xFF) != 0xBA ||
- (bytes[3] & 0xFF) != 0xBE) {
- log.print(" NOT A CLASS: ");
- print(reader, name);
+ if (name.endsWith(".class") && !name.endsWith("module-info.class")) {
+ try {
+ byte[] bytes = reader.getResource(location);
+ ClassReader cr =new ClassReader(bytes);
+ ClassNode cn = new ClassNode();
+ cr.accept(cn, ClassReader.EXPAND_FRAMES);
+ } catch (Exception ex) {
+ log.println("Error(s) in Class: " + name);
}
}
}
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties Thu Jul 21 17:13:23 2016 +0000
@@ -63,7 +63,7 @@
\ --dir Target directory for extract directive
main.opt.include=\
-\ --include <pattern-list> Pattern list for filtering list or extract entries.
+\ --include <pattern-list> Pattern list for filtering entries.
main.opt.footer=\
\n\
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -23,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package jdk.tools.jlink.builder;
import java.io.BufferedOutputStream;
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java Thu Jul 21 17:13:23 2016 +0000
@@ -21,7 +21,7 @@
* 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 jdk.tools.jlink.internal;
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java Thu Jul 21 17:13:23 2016 +0000
@@ -21,7 +21,7 @@
* 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 jdk.tools.jlink.internal;
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java Thu Jul 21 17:13:23 2016 +0000
@@ -24,6 +24,7 @@
*/
package jdk.tools.jlink.internal.plugins;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.IllformedLocaleException;
@@ -31,6 +32,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import static java.util.ResourceBundle.Control;
import java.util.Set;
import java.util.function.Predicate;
import java.util.regex.Pattern;
@@ -45,6 +47,10 @@
import jdk.tools.jlink.plugin.PluginException;
import jdk.tools.jlink.plugin.ModulePool;
import jdk.tools.jlink.plugin.Plugin;
+import sun.util.cldr.CLDRBaseLocaleDataMetaInfo;
+import sun.util.locale.provider.LocaleProviderAdapter;
+import sun.util.locale.provider.LocaleProviderAdapter.Type;
+import sun.util.locale.provider.ResourceBundleBasedAdapter;
/**
* Plugin to explicitly specify the locale data included in jdk.localedata
@@ -95,6 +101,42 @@
private List<Locale> available;
private List<String> filtered;
+ private static final ResourceBundleBasedAdapter CLDR_ADAPTER =
+ (ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(Type.CLDR);
+ private static final Map<Locale, String[]> CLDR_PARENT_LOCALES =
+ new CLDRBaseLocaleDataMetaInfo().parentLocales();
+
+ // Equivalent map
+ private static final Map<String, List<String>> EQUIV_MAP =
+ Stream.concat(
+ // COMPAT equivalence
+ Map.of(
+ "zh-Hans", List.of("zh-Hans", "zh-CN", "zh-SG"),
+ "zh-Hant", List.of("zh-Hant", "zh-HK", "zh-MO", "zh-TW"))
+ .entrySet()
+ .stream(),
+
+ // CLDR parent locales
+ CLDR_PARENT_LOCALES.entrySet().stream()
+ .map(entry -> {
+ String parent = entry.getKey().toLanguageTag();
+ List<String> children = new ArrayList<>();
+ children.add(parent);
+
+ Arrays.stream(entry.getValue())
+ .filter(child -> !child.isEmpty())
+ .flatMap(child ->
+ Stream.concat(
+ Arrays.stream(CLDR_PARENT_LOCALES.getOrDefault(
+ Locale.forLanguageTag(child), new String[0]))
+ .filter(grandchild -> !grandchild.isEmpty()),
+ List.of(child).stream()))
+ .distinct()
+ .forEach(children::add);
+ return new AbstractMap.SimpleEntry<String, List<String>>(parent, children);
+ })
+ ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
// Special COMPAT provider locales
private static final String jaJPJPTag = "ja-JP-JP";
private static final String noNONYTag = "no-NO-NY";
@@ -152,16 +194,14 @@
@Override
public void configure(Map<String, String> config) {
userParam = config.get(NAME);
- priorityList = Arrays.stream(userParam.split(","))
- .map(s -> {
- try {
- return new Locale.LanguageRange(s);
- } catch (IllegalArgumentException iae) {
- throw new IllegalArgumentException(String.format(
- PluginsResourceBundle.getMessage(NAME + ".invalidtag"), s));
- }
- })
- .collect(Collectors.toList());
+
+ try {
+ priorityList = Locale.LanguageRange.parse(userParam, EQUIV_MAP);
+ } catch (IllegalArgumentException iae) {
+ throw new IllegalArgumentException(String.format(
+ PluginsResourceBundle.getMessage(NAME + ".invalidtag"),
+ iae.getMessage().replaceFirst("^range=", "")));
+ }
}
@Override
@@ -193,6 +233,7 @@
// jdk.localedata is not added.
throw new PluginException(PluginsResourceBundle.getMessage(NAME + ".localedatanotfound"));
}
+
filtered = filterLocales(available);
if (filtered.isEmpty()) {
@@ -205,56 +246,26 @@
filtered.stream().flatMap(s -> includeLocaleFilePatterns(s).stream()))
.map(s -> "regex:" + s)
.collect(Collectors.toList());
+
predicate = ResourceFilter.includeFilter(value);
}
private List<String> includeLocaleFilePatterns(String tag) {
- List<String> files = new ArrayList<>();
- String pTag = tag.replaceAll("-", "_");
- int lastDelimiter = tag.length();
- String isoSpecial = pTag.matches("^(he|yi|id).*") ?
- pTag.replaceFirst("he", "iw")
- .replaceFirst("yi", "ji")
- .replaceFirst("id", "in") : "";
-
- // Add tag patterns including parents
- while (true) {
- pTag = pTag.substring(0, lastDelimiter);
- files.addAll(includeLocaleFiles(pTag));
-
- if (!isoSpecial.isEmpty()) {
- isoSpecial = isoSpecial.substring(0, lastDelimiter);
- files.addAll(includeLocaleFiles(isoSpecial));
- }
-
- lastDelimiter = pTag.lastIndexOf('_');
- if (lastDelimiter == -1) {
- break;
- }
+ // Ignore extension variations
+ if (tag.matches(".+-[a-z]-.+")) {
+ return List.of();
}
- final String lang = pTag;
-
- // Add possible special locales of the COMPAT provider
- Set.of(jaJPJPTag, noNONYTag, thTHTHTag).stream()
- .filter(stag -> lang.equals(stag.substring(0,2)))
- .map(t -> includeLocaleFiles(t.replaceAll("-", "_")))
- .forEach(files::addAll);
-
- // Add possible UN.M49 files (unconditional for now) for each language
- files.addAll(includeLocaleFiles(lang + "_[0-9]{3}"));
- if (!isoSpecial.isEmpty()) {
- files.addAll(includeLocaleFiles(isoSpecial + "_[0-9]{3}"));
- }
+ List<String> files = new ArrayList<>(includeLocaleFiles(tag.replaceAll("-", "_")));
// Add Thai BreakIterator related data files
- if (lang.equals("th")) {
+ if (tag.equals("th")) {
files.add(".+sun/text/resources/thai_dict");
files.add(".+sun/text/resources/[^_]+BreakIteratorData_th");
}
// Add Taiwan resource bundles for Hong Kong
- if (tag.startsWith("zh-HK")) {
+ if (tag.equals("zh-HK")) {
files.addAll(includeLocaleFiles("zh_TW"));
}
@@ -306,6 +317,11 @@
byte[] filteredBytes = filterLocales(locales).stream()
.collect(Collectors.joining(" "))
.getBytes();
+
+ if (filteredBytes.length > b.length) {
+ throw new InternalError("Size of filtered locales is bigger than the original one");
+ }
+
System.arraycopy(filteredBytes, 0, b, 0, filteredBytes.length);
Arrays.fill(b, filteredBytes.length, b.length, (byte)' ');
return true;
@@ -314,6 +330,9 @@
private List<String> filterLocales(List<Locale> locales) {
List<String> ret =
Locale.filter(priorityList, locales, Locale.FilteringMode.EXTENDED_FILTERING).stream()
+ .flatMap(loc -> Stream.concat(Control.getNoFallbackControl(Control.FORMAT_DEFAULT)
+ .getCandidateLocales("", loc).stream(),
+ CLDR_ADAPTER.getCandidateLocales("", loc).stream()))
.map(loc ->
// Locale.filter() does not preserve the case, which is
// significant for "variant" equality. Retrieve the original
@@ -321,15 +340,12 @@
locales.stream()
.filter(l -> l.toString().equalsIgnoreCase(loc.toString()))
.findAny()
- .orElse(Locale.ROOT)
- .toLanguageTag())
+ .orElse(Locale.ROOT))
+ .filter(loc -> !loc.equals(Locale.ROOT))
+ .flatMap(IncludeLocalesPlugin::localeToTags)
+ .distinct()
.collect(Collectors.toList());
- // no-NO-NY.toLanguageTag() returns "nn-NO", so specially handle it here
- if (ret.contains("no-NO")) {
- ret.add(noNONYTag);
- }
-
return ret;
}
@@ -338,6 +354,7 @@
// ISO3166 compatibility
tag = tag.replaceFirst("^iw", "he").replaceFirst("^ji", "yi").replaceFirst("^in", "id");
+ // Special COMPAT provider locales
switch (tag) {
case jaJPJPTag:
return jaJPJP;
@@ -351,4 +368,42 @@
return LOCALE_BUILDER.build();
}
}
+
+ private static Stream<String> localeToTags(Locale loc) {
+ String tag = loc.toLanguageTag();
+ Stream<String> ret = null;
+
+ switch (loc.getLanguage()) {
+ // ISO3166 compatibility
+ case "iw":
+ ret = List.of(tag, tag.replaceFirst("^he", "iw")).stream();
+ break;
+ case "in":
+ ret = List.of(tag, tag.replaceFirst("^id", "in")).stream();
+ break;
+ case "ji":
+ ret = List.of(tag, tag.replaceFirst("^yi", "ji")).stream();
+ break;
+
+ // Special COMPAT provider locales
+ case "ja":
+ if (loc.getCountry() == "JP") {
+ ret = List.of(tag, jaJPJPTag).stream();
+ }
+ break;
+ case "no":
+ case "nn":
+ if (loc.getCountry() == "NO") {
+ ret = List.of(tag, noNONYTag).stream();
+ }
+ break;
+ case "th":
+ if (loc.getCountry() == "TH") {
+ ret = List.of(tag, thTHTHTag).stream();
+ }
+ break;
+ }
+
+ return ret == null ? List.of(tag).stream() : ret;
+ }
}
--- a/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Device.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Device.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,3 @@
-package checker;
-
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
*
@@ -31,6 +29,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+package checker;
+
/*
* This source code is provided to illustrate the usage of a given feature
* or technique and has been deliberately simplified. Additional steps
--- a/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Module.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Module.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,3 @@
-package checker;
-
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
*
@@ -31,6 +29,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+package checker;
+
/*
* This source code is provided to illustrate the usage of a given feature
* or technique and has been deliberately simplified. Additional steps
--- a/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,3 @@
-package checker;
-
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
*
@@ -31,6 +29,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+package checker;
+
/*
* This source code is provided to illustrate the usage of a given feature
* or technique and has been deliberately simplified. Additional steps
--- a/jdk/src/sample/share/nio/chatserver/ChatServer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/nio/chatserver/ChatServer.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/sample/share/nio/chatserver/Client.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/nio/chatserver/Client.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/sample/share/nio/chatserver/ClientReader.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/nio/chatserver/ClientReader.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/sample/share/nio/chatserver/DataReader.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/nio/chatserver/DataReader.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/sample/share/nio/chatserver/MessageReader.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/nio/chatserver/MessageReader.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/src/sample/share/nio/chatserver/NameReader.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/src/sample/share/nio/chatserver/NameReader.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
--- a/jdk/test/ProblemList.txt Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/ProblemList.txt Thu Jul 21 17:13:23 2016 +0000
@@ -138,6 +138,8 @@
java/lang/instrument/BootClassPath/BootClassPathTest.sh 8072130 macosx-all
+java/lang/instrument/DaemonThread/TestDaemonThread.java 8161225 generic-all
+
java/lang/management/MemoryMXBean/LowMemoryTest.java 8130339 generic-all
java/lang/management/MemoryMXBean/Pending.java 8158837 generic-all
@@ -171,6 +173,8 @@
java/net/DatagramSocket/SendDatagramToBadAddress.java 7143960 macosx-all
+java/net/httpclient/SplitResponse.java 8157533 generic-all
+
java/net/httpclient/http2/BasicTest.java 8157408 linux-all
java/net/httpclient/http2/ErrorTest.java 8158127 solaris-all,windows-all
java/net/httpclient/http2/TLSConnection.java 8157482 macosx-all
--- a/jdk/test/java/lang/Class/GenericStringTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/Class/GenericStringTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 6298888 6992705
+ * @bug 6298888 6992705 8161500
* @summary Check Class.toGenericString()
* @author Joseph D. Darcy
*/
@@ -58,15 +58,11 @@
f = GenericStringTest.class.getDeclaredField("mixed2");
failures += checkToGenericString(f.getType(), "java.util.Map<K,V>[][]");
- Class<?>[] types = {
- GenericStringTest.class,
- AnInterface.class,
- LocalMap.class,
- AnEnum.class,
- AnotherEnum.class,
- };
-
- for(Class<?> clazz : types) {
+ for(Class<?> clazz : List.of(GenericStringTest.class,
+ AnInterface.class,
+ LocalMap.class,
+ AnEnum.class,
+ AnotherEnum.class)) {
failures += checkToGenericString(clazz, clazz.getAnnotation(ExpectedGenericString.class).value());
}
--- a/jdk/test/java/lang/ProcessBuilder/Zombies.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/ProcessBuilder/Zombies.java Thu Jul 21 17:13:23 2016 +0000
@@ -24,6 +24,7 @@
/*
* @test
* @bug 6474073
+ * @key intermittent
* @summary Make sure zombies don't get created on Unix
* @author Martin Buchholz
*/
--- a/jdk/test/java/lang/instrument/ATransformerManagementTestCase.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/instrument/ATransformerManagementTestCase.java Thu Jul 21 17:13:23 2016 +0000
@@ -302,6 +302,7 @@
public byte[]
transform(
Module module,
+ ClassLoader loader,
String className,
Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
@@ -311,6 +312,7 @@
if (classBeingRedefined != null) checkInTransformer(MyClassFileTransformer.this);
return super.transform( module,
+ loader,
className,
classBeingRedefined,
protectionDomain,
--- a/jdk/test/java/lang/instrument/RetransformAgent.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/instrument/RetransformAgent.java Thu Jul 21 17:13:23 2016 +0000
@@ -69,6 +69,7 @@
}
public byte[] transform(Module module,
+ ClassLoader loader,
String className,
Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
--- a/jdk/test/java/lang/instrument/SimpleIdentityTransformer.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/instrument/SimpleIdentityTransformer.java Thu Jul 21 17:13:23 2016 +0000
@@ -63,6 +63,7 @@
public byte[]
transform(
Module module,
+ ClassLoader loader,
String className,
Class<?> classBeingRedefined,
ProtectionDomain protectionDomain,
--- a/jdk/test/java/lang/invoke/LoopCombinatorLongSignatureTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/invoke/LoopCombinatorLongSignatureTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -39,6 +39,11 @@
* If a loop with an excessive amount of clauses is created, so that the number of parameters to the resulting loop
* handle exceeds the allowed maximum, an IAE must be signalled. The test is run first in LambdaForm interpretation mode
* and then in default mode, wherein bytecode generation falls back to LFI mode due to excessively long methods.
+ * <p>
+ * By default, the test run only checks whether loop handle construction succeeds and fails. If executing the generated
+ * loops is desired, this should be indicated by setting the {@code java.lang.invoke.LoopCombinatorLongSignatureTest.RUN}
+ * environment variable to {@code true}. This is disabled by default as it considerably increases the time needed to run
+ * the test.
*/
public class LoopCombinatorLongSignatureTest {
@@ -51,13 +56,15 @@
static final int ARG_LIMIT = 254; // for internal reasons, this is the maximum allowed number of arguments
public static void main(String[] args) {
+ boolean run = Boolean.parseBoolean(
+ System.getProperty("java.lang.invoke.LoopCombinatorLongSignatureTest.RUN", "false"));
for (int loopArgs = 0; loopArgs < 2; ++loopArgs) {
- testLongSignature(loopArgs, false);
- testLongSignature(loopArgs, true);
+ testLongSignature(loopArgs, false, run);
+ testLongSignature(loopArgs, true, run);
}
}
- static void testLongSignature(int loopArgs, boolean excessive) {
+ static void testLongSignature(int loopArgs, boolean excessive, boolean run) {
int nClauses = ARG_LIMIT - loopArgs + (excessive ? 1 : 0);
System.out.print((excessive ? "(EXCESSIVE)" : "(LONG )") + " arguments: " + loopArgs + ", clauses: " + nClauses + " -> ");
@@ -78,7 +85,7 @@
MethodHandle loop = MethodHandles.loop(clauses);
if (excessive) {
throw new AssertionError("loop construction should have failed");
- } else {
+ } else if (run) {
int r;
if (loopArgs == 0) {
r = (int) loop.invoke();
@@ -88,6 +95,8 @@
r = (int) loop.invokeWithArguments(args);
}
System.out.println("SUCCEEDED (OK) -> " + r);
+ } else {
+ System.out.println("SUCCEEDED (OK)");
}
} catch (IllegalArgumentException iae) {
if (excessive) {
--- a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 5033583 6316717 6470106
+ * @bug 5033583 6316717 6470106 8161500
* @summary Check toGenericString() and toString() methods
* @author Joseph D. Darcy
*/
@@ -35,12 +35,8 @@
public class GenericStringTest {
public static void main(String argv[]) throws Exception{
int failures = 0;
- List<Class<?>> classList = new LinkedList<Class<?>>();
- classList.add(TestClass1.class);
- classList.add(TestClass2.class);
-
- for(Class<?> clazz: classList)
+ for(Class<?> clazz: List.of(TestClass1.class, TestClass2.class))
for(Constructor<?> ctor: clazz.getDeclaredConstructors()) {
ExpectedGenericString egs = ctor.getAnnotation(ExpectedGenericString.class);
String actual = ctor.toGenericString();
--- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 5033583
+ * @bug 5033583 8161500
* @summary Check toGenericString() method
* @author Joseph D. Darcy
*/
@@ -35,12 +35,8 @@
public class GenericStringTest {
public static void main(String argv[]) throws Exception {
int failures = 0;
- List<Class> classList = new LinkedList<Class>();
- classList.add(TestClass1.class);
- classList.add(TestClass2.class);
-
- for(Class clazz: classList)
+ for(Class clazz: List.of(TestClass1.class, TestClass2.class))
for(Field field: clazz.getDeclaredFields()) {
ExpectedString es = field.getAnnotation(ExpectedString.class);
String genericString = field.toGenericString();
@@ -61,15 +57,15 @@
class TestClass1 {
@ExpectedString("int TestClass1.field1")
- int field1;
+ int field1;
@ExpectedString("private static java.lang.String TestClass1.field2")
- private static String field2;
+ private static String field2;
}
class TestClass2<E> {
@ExpectedString("public E TestClass2.field1")
- public E field1;
+ public E field1;
}
@Retention(RetentionPolicy.RUNTIME)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/reflect/Generics/TestGenericReturnTypeToString.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+/*
+ * @test
+ * @bug 8054213
+ * @summary Check that toString method works properly for generic return type
+ * obtained via reflection
+ * @run main TestGenericReturnTypeToString
+ */
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class TestGenericReturnTypeToString {
+
+ public static void main(String[] args) {
+ boolean hasFailures = false;
+ for (Method method : TestGenericReturnTypeToString.class.getMethods()) {
+ if (method.isAnnotationPresent(ExpectedGenericString.class)) {
+ ExpectedGenericString es = method.getAnnotation
+ (ExpectedGenericString.class);
+ String result = method.getGenericReturnType().toString();
+ if (!es.value().equals(result)) {
+ hasFailures = true;
+ System.err.println("Unexpected result of " +
+ "getGenericReturnType().toString() " +
+ " for " + method.getName()
+ + " expected: " + es.value() + " actual: " + result);
+ }
+ }
+ if (hasFailures) {
+ throw new RuntimeException("Test failed");
+ }
+ }
+ }
+
+ @ExpectedGenericString("TestGenericReturnTypeToString$" +
+ "FirstInnerClassGeneric<Dummy>$SecondInnerClassGeneric<Dummy>")
+ public FirstInnerClassGeneric<Dummy>.SecondInnerClassGeneric<Dummy> foo1() {
+ return null;
+ }
+
+ @ExpectedGenericString("TestGenericReturnTypeToString$" +
+ "FirstInnerClassGeneric<Dummy>$SecondInnerClass")
+ public FirstInnerClassGeneric<Dummy>.SecondInnerClass foo2() {
+ return null;
+ }
+
+ @ExpectedGenericString("TestGenericReturnTypeToString$" +
+ "FirstInnerClass$SecondInnerClassGeneric<Dummy>")
+ public FirstInnerClass.SecondInnerClassGeneric<Dummy> foo3() {
+ return null;
+ }
+
+ @ExpectedGenericString("class TestGenericReturnTypeToString$" +
+ "FirstInnerClass$SecondInnerClass")
+ public FirstInnerClass.SecondInnerClass foo4() {
+ return null;
+ }
+
+ @ExpectedGenericString(
+ "java.util.List<java.lang.String>")
+ public java.util.List<java.lang.String> foo5() {
+ return null;
+ }
+
+ @ExpectedGenericString("interface TestGenericReturnTypeToString$" +
+ "FirstInnerClass$Interface")
+ public FirstInnerClass.Interface foo6() {
+ return null;
+ }
+
+ @ExpectedGenericString("TestGenericReturnTypeToString$" +
+ "FirstInnerClass$InterfaceGeneric<Dummy>")
+ public FirstInnerClass.InterfaceGeneric<Dummy> foo7() {
+ return null;
+ }
+
+ public static class FirstInnerClass {
+
+ public class SecondInnerClassGeneric<T> {
+ }
+
+ public class SecondInnerClass {
+ }
+
+ interface Interface {
+ }
+
+ interface InterfaceGeneric<T> {
+ }
+ }
+
+ public class FirstInnerClassGeneric<T> {
+
+ public class SecondInnerClassGeneric<T> {
+ }
+
+ public class SecondInnerClass {
+ }
+ }
+}
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface ExpectedGenericString {
+ String value();
+}
+
+class Dummy {
+}
--- a/jdk/test/java/lang/reflect/Method/GenericStringTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/lang/reflect/Method/GenericStringTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 5033583 6316717 6470106 8004979
+ * @bug 5033583 6316717 6470106 8004979 8161500
* @summary Check toGenericString() and toString() methods
* @author Joseph D. Darcy
*/
@@ -35,14 +35,9 @@
public class GenericStringTest {
public static void main(String argv[]) throws Exception {
int failures = 0;
- List<Class<?>> classList = new LinkedList<Class<?>>();
- classList.add(TestClass1.class);
- classList.add(TestClass2.class);
- classList.add(Roebling.class);
- classList.add(TestInterface1.class);
-
- for(Class<?> clazz: classList)
+ for(Class<?> clazz: List.of(TestClass1.class, TestClass2.class,
+ Roebling.class, TestInterface1.class))
for(Method method: clazz.getDeclaredMethods()) {
ExpectedGenericString egs = method.getAnnotation(ExpectedGenericString.class);
if (egs != null) {
@@ -121,6 +116,30 @@
@ExpectedGenericString(
"public void TestClass2.method2() throws F")
public void method2() throws F {return;}
+
+ @ExpectedGenericString(
+ "public E[] TestClass2.method3()")
+ public E[] method3() {return null;}
+
+ @ExpectedGenericString(
+ "public E[][] TestClass2.method4()")
+ public E[][] method4() {return null;}
+
+ @ExpectedGenericString(
+ "public java.util.List<E[]> TestClass2.method5()")
+ public List<E[]> method5() {return null;}
+
+ @ExpectedGenericString(
+ "public java.util.List<?> TestClass2.method6()")
+ public List<?> method6() {return null;}
+
+ @ExpectedGenericString(
+ "public java.util.List<?>[] TestClass2.method7()")
+ public List<?>[] method7() {return null;}
+
+ @ExpectedGenericString(
+ "public <K,V> java.util.Map<K, V> TestClass2.method8()")
+ public <K, V> Map<K, V> method8() {return null;}
}
class Roebling implements Comparable<Roebling> {
@@ -157,7 +176,6 @@
@ExpectedGenericString(
"public default strictfp double TestInterface1.quux()")
strictfp default double quux(){return 1.0;}
-
}
@Retention(RetentionPolicy.RUNTIME)
--- a/jdk/test/java/net/httpclient/whitebox/java.httpclient/java/net/http/SelectorTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/net/httpclient/whitebox/java.httpclient/java/net/http/SelectorTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -78,7 +78,7 @@
final RawChannel chan = getARawChannel(port);
- chan.registerEvent(new RawChannel.NonBlockingEvent() {
+ chan.registerEvent(new RawChannel.RawEvent() {
@Override
public int interestOps() {
return SelectionKey.OP_READ;
@@ -95,7 +95,7 @@
}
});
- chan.registerEvent(new RawChannel.NonBlockingEvent() {
+ chan.registerEvent(new RawChannel.RawEvent() {
@Override
public int interestOps() {
return SelectionKey.OP_WRITE;
@@ -111,7 +111,7 @@
ByteBuffer bb = ByteBuffer.wrap(TestServer.INPUT);
counter.incrementAndGet();
try {
- chan.write(bb);
+ chan.write(new ByteBuffer[]{bb}, 0, 1);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
--- a/jdk/test/java/nio/file/WatchService/DeleteInterference.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/nio/file/WatchService/DeleteInterference.java Thu Jul 21 17:13:23 2016 +0000
@@ -32,6 +32,7 @@
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.nio.file.WatchService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -49,7 +50,8 @@
* directory.
*/
public static void main(String[] args) throws Exception {
- Path dir = Files.createTempDirectory("DeleteInterference");
+ Path testDir = Paths.get(System.getProperty("test.dir", "."));
+ Path dir = Files.createTempDirectory(testDir, "DeleteInterference");
ExecutorService pool = Executors.newCachedThreadPool();
try {
Future<?> task1 = pool.submit(() -> openAndCloseWatcher(dir));
@@ -58,7 +60,6 @@
task2.get();
} finally {
pool.shutdown();
- deleteFileTree(dir);
}
}
--- a/jdk/test/java/nio/file/WatchService/LotsOfCancels.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/nio/file/WatchService/LotsOfCancels.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -27,11 +27,11 @@
* an outstanding I/O operation on directory completes after the
* directory has been closed
*/
-
import java.nio.file.ClosedWatchServiceException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
import static java.nio.file.StandardWatchEventKinds.*;
@@ -50,8 +50,8 @@
// one to bash on cancel, the other to poll the events
ExecutorService pool = Executors.newCachedThreadPool();
try {
- Path top = Files.createTempDirectory("LotsOfCancels");
- top.toFile().deleteOnExit();
+ Path testDir = Paths.get(System.getProperty("test.dir", "."));
+ Path top = Files.createTempDirectory(testDir, "LotsOfCancels");
for (int i=1; i<=16; i++) {
Path dir = Files.createDirectory(top.resolve("dir-" + i));
WatchService watcher = FileSystems.getDefault().newWatchService();
@@ -114,6 +114,4 @@
failed = true;
}
}
-
}
-
--- a/jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java Thu Jul 21 17:13:23 2016 +0000
@@ -35,6 +35,7 @@
* @test
* @author Doug Lea
* @bug 8004138
+ * @key intermittent
* @summary Check if ForkJoinPool table leaks thrown exceptions.
* @run main/othervm -Xmx8m -Djava.util.concurrent.ForkJoinPool.common.parallelism=4 FJExceptionTableLeak
*/
--- a/jdk/test/java/util/concurrent/tck/Atomic8Test.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/tck/Atomic8Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -179,7 +179,7 @@
* result of supplied function
*/
public void testReferenceGetAndUpdate() {
- AtomicReference<Integer> a = new AtomicReference<Integer>(one);
+ AtomicReference<Integer> a = new AtomicReference<>(one);
assertEquals(new Integer(1), a.getAndUpdate(Atomic8Test::addInteger17));
assertEquals(new Integer(18), a.getAndUpdate(Atomic8Test::addInteger17));
assertEquals(new Integer(35), a.get());
@@ -190,7 +190,7 @@
* returns result.
*/
public void testReferenceUpdateAndGet() {
- AtomicReference<Integer> a = new AtomicReference<Integer>(one);
+ AtomicReference<Integer> a = new AtomicReference<>(one);
assertEquals(new Integer(18), a.updateAndGet(Atomic8Test::addInteger17));
assertEquals(new Integer(35), a.updateAndGet(Atomic8Test::addInteger17));
assertEquals(new Integer(35), a.get());
@@ -201,7 +201,7 @@
* with supplied function.
*/
public void testReferenceGetAndAccumulate() {
- AtomicReference<Integer> a = new AtomicReference<Integer>(one);
+ AtomicReference<Integer> a = new AtomicReference<>(one);
assertEquals(new Integer(1), a.getAndAccumulate(2, Atomic8Test::sumInteger));
assertEquals(new Integer(3), a.getAndAccumulate(3, Atomic8Test::sumInteger));
assertEquals(new Integer(6), a.get());
@@ -212,7 +212,7 @@
* returns result.
*/
public void testReferenceAccumulateAndGet() {
- AtomicReference<Integer> a = new AtomicReference<Integer>(one);
+ AtomicReference<Integer> a = new AtomicReference<>(one);
assertEquals(new Integer(7), a.accumulateAndGet(6, Atomic8Test::sumInteger));
assertEquals(new Integer(10), a.accumulateAndGet(3, Atomic8Test::sumInteger));
assertEquals(new Integer(10), a.get());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicBoolean9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicBoolean9Test extends JSR166TestCase {
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicBoolean9Test.class);
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.getPlain());
+ ai.set(false);
+ assertEquals(false, ai.getPlain());
+ ai.set(true);
+ assertEquals(true, ai.getPlain());
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.getOpaque());
+ ai.set(false);
+ assertEquals(false, ai.getOpaque());
+ ai.set(true);
+ assertEquals(true, ai.getOpaque());
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.getAcquire());
+ ai.set(false);
+ assertEquals(false, ai.getAcquire());
+ ai.set(true);
+ assertEquals(true, ai.getAcquire());
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.get());
+ ai.setPlain(false);
+ assertEquals(false, ai.get());
+ ai.setPlain(true);
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.get());
+ ai.setOpaque(false);
+ assertEquals(false, ai.get());
+ ai.setOpaque(true);
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.get());
+ ai.setRelease(false);
+ assertEquals(false, ai.get());
+ ai.setRelease(true);
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.compareAndExchange(true, false));
+ assertEquals(false, ai.compareAndExchange(false, false));
+ assertEquals(false, ai.get());
+ assertEquals(false, ai.compareAndExchange(true, true));
+ assertEquals(false, ai.get());
+ assertEquals(false, ai.compareAndExchange(false, true));
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.compareAndExchangeAcquire(true, false));
+ assertEquals(false, ai.compareAndExchangeAcquire(false, false));
+ assertEquals(false, ai.get());
+ assertEquals(false, ai.compareAndExchangeAcquire(true, true));
+ assertEquals(false, ai.get());
+ assertEquals(false, ai.compareAndExchangeAcquire(false, true));
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ assertEquals(true, ai.compareAndExchangeRelease(true, false));
+ assertEquals(false, ai.compareAndExchangeRelease(false, false));
+ assertEquals(false, ai.get());
+ assertEquals(false, ai.compareAndExchangeRelease(true, true));
+ assertEquals(false, ai.get());
+ assertEquals(false, ai.compareAndExchangeRelease(false, true));
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ do {} while (!ai.weakCompareAndSetVolatile(true, false));
+ do {} while (!ai.weakCompareAndSetVolatile(false, false));
+ assertEquals(false, ai.get());
+ do {} while (!ai.weakCompareAndSetVolatile(false, true));
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ do {} while (!ai.weakCompareAndSetAcquire(true, false));
+ do {} while (!ai.weakCompareAndSetAcquire(false, false));
+ assertEquals(false, ai.get());
+ do {} while (!ai.weakCompareAndSetAcquire(false, true));
+ assertEquals(true, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicBoolean ai = new AtomicBoolean(true);
+ do {} while (!ai.weakCompareAndSetRelease(true, false));
+ do {} while (!ai.weakCompareAndSetRelease(false, false));
+ assertEquals(false, ai.get());
+ do {} while (!ai.weakCompareAndSetRelease(false, true));
+ assertEquals(true, ai.get());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicInteger9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicInteger9Test extends JSR166TestCase {
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicInteger9Test.class);
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.getPlain());
+ ai.set(2);
+ assertEquals(2, ai.getPlain());
+ ai.set(-3);
+ assertEquals(-3, ai.getPlain());
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.getOpaque());
+ ai.set(2);
+ assertEquals(2, ai.getOpaque());
+ ai.set(-3);
+ assertEquals(-3, ai.getOpaque());
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.getAcquire());
+ ai.set(2);
+ assertEquals(2, ai.getAcquire());
+ ai.set(-3);
+ assertEquals(-3, ai.getAcquire());
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.get());
+ ai.setPlain(2);
+ assertEquals(2, ai.get());
+ ai.setPlain(-3);
+ assertEquals(-3, ai.get());
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.get());
+ ai.setOpaque(2);
+ assertEquals(2, ai.get());
+ ai.setOpaque(-3);
+ assertEquals(-3, ai.get());
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.get());
+ ai.setRelease(2);
+ assertEquals(2, ai.get());
+ ai.setRelease(-3);
+ assertEquals(-3, ai.get());
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.compareAndExchange(1, 2));
+ assertEquals(2, ai.compareAndExchange(2, -4));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchange(-5, 7));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchange(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.compareAndExchangeAcquire(1, 2));
+ assertEquals(2, ai.compareAndExchangeAcquire(2, -4));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeAcquire(-5, 7));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeAcquire(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicInteger ai = new AtomicInteger(1);
+ assertEquals(1, ai.compareAndExchangeRelease(1, 2));
+ assertEquals(2, ai.compareAndExchangeRelease(2, -4));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeRelease(-5, 7));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeRelease(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicInteger ai = new AtomicInteger(1);
+ do {} while (!ai.weakCompareAndSetVolatile(1, 2));
+ do {} while (!ai.weakCompareAndSetVolatile(2, -4));
+ assertEquals(-4, ai.get());
+ do {} while (!ai.weakCompareAndSetVolatile(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicInteger ai = new AtomicInteger(1);
+ do {} while (!ai.weakCompareAndSetAcquire(1, 2));
+ do {} while (!ai.weakCompareAndSetAcquire(2, -4));
+ assertEquals(-4, ai.get());
+ do {} while (!ai.weakCompareAndSetAcquire(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicInteger ai = new AtomicInteger(1);
+ do {} while (!ai.weakCompareAndSetRelease(1, 2));
+ do {} while (!ai.weakCompareAndSetRelease(2, -4));
+ assertEquals(-4, ai.get());
+ do {} while (!ai.weakCompareAndSetRelease(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicIntegerArray9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,267 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicIntegerArray9Test extends JSR166TestCase {
+
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicIntegerArray9Test.class);
+ }
+
+ /**
+ * get and set for out of bound indices throw IndexOutOfBoundsException
+ */
+ public void testIndexing() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int index : new int[] { -1, SIZE }) {
+ final int j = index;
+ final Runnable[] tasks = {
+ () -> aa.getPlain(j),
+ () -> aa.getOpaque(j),
+ () -> aa.getAcquire(j),
+ () -> aa.setPlain(j, 1),
+ () -> aa.setOpaque(j, 1),
+ () -> aa.setRelease(j, 1),
+ () -> aa.compareAndExchange(j, 1, 2),
+ () -> aa.compareAndExchangeAcquire(j, 1, 2),
+ () -> aa.compareAndExchangeRelease(j, 1, 2),
+ () -> aa.weakCompareAndSetVolatile(j, 1, 2),
+ () -> aa.weakCompareAndSetAcquire(j, 1, 2),
+ () -> aa.weakCompareAndSetRelease(j, 1, 2),
+ };
+
+ assertThrows(IndexOutOfBoundsException.class, tasks);
+ }
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.getPlain(i));
+ aa.set(i, 2);
+ assertEquals(2, aa.getPlain(i));
+ aa.set(i, -3);
+ assertEquals(-3, aa.getPlain(i));
+ }
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.getOpaque(i));
+ aa.set(i, 2);
+ assertEquals(2, aa.getOpaque(i));
+ aa.set(i, -3);
+ assertEquals(-3, aa.getOpaque(i));
+ }
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.getAcquire(i));
+ aa.set(i, 2);
+ assertEquals(2, aa.getAcquire(i));
+ aa.set(i, -3);
+ assertEquals(-3, aa.getAcquire(i));
+ }
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setPlain(i, 1);
+ assertEquals(1, aa.get(i));
+ aa.setPlain(i, 2);
+ assertEquals(2, aa.get(i));
+ aa.setPlain(i, -3);
+ assertEquals(-3, aa.get(i));
+ }
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setOpaque(i, 1);
+ assertEquals(1, aa.get(i));
+ aa.setOpaque(i, 2);
+ assertEquals(2, aa.get(i));
+ aa.setOpaque(i, -3);
+ assertEquals(-3, aa.get(i));
+ }
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setRelease(i, 1);
+ assertEquals(1, aa.get(i));
+ aa.setRelease(i, 2);
+ assertEquals(2, aa.get(i));
+ aa.setRelease(i, -3);
+ assertEquals(-3, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.compareAndExchange(i, 1, 2));
+ assertEquals(2, aa.compareAndExchange(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchange(i,-5, 7));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchange(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.compareAndExchangeAcquire(i, 1, 2));
+ assertEquals(2, aa.compareAndExchangeAcquire(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeAcquire(i,-5, 7));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeAcquire(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.compareAndExchangeRelease(i, 1, 2));
+ assertEquals(2, aa.compareAndExchangeRelease(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeRelease(i,-5, 7));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeRelease(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ do {} while (!aa.weakCompareAndSetVolatile(i, 1, 2));
+ do {} while (!aa.weakCompareAndSetVolatile(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetVolatile(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ do {} while (!aa.weakCompareAndSetAcquire(i, 1, 2));
+ do {} while (!aa.weakCompareAndSetAcquire(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetAcquire(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicIntegerArray aa = new AtomicIntegerArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ do {} while (!aa.weakCompareAndSetRelease(i, 1, 2));
+ do {} while (!aa.weakCompareAndSetRelease(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetRelease(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicLong9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicLong9Test extends JSR166TestCase {
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicLong9Test.class);
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.getPlain());
+ ai.set(2);
+ assertEquals(2, ai.getPlain());
+ ai.set(-3);
+ assertEquals(-3, ai.getPlain());
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.getOpaque());
+ ai.set(2);
+ assertEquals(2, ai.getOpaque());
+ ai.set(-3);
+ assertEquals(-3, ai.getOpaque());
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.getAcquire());
+ ai.set(2);
+ assertEquals(2, ai.getAcquire());
+ ai.set(-3);
+ assertEquals(-3, ai.getAcquire());
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.get());
+ ai.setPlain(2);
+ assertEquals(2, ai.get());
+ ai.setPlain(-3);
+ assertEquals(-3, ai.get());
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.get());
+ ai.setOpaque(2);
+ assertEquals(2, ai.get());
+ ai.setOpaque(-3);
+ assertEquals(-3, ai.get());
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.get());
+ ai.setRelease(2);
+ assertEquals(2, ai.get());
+ ai.setRelease(-3);
+ assertEquals(-3, ai.get());
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.compareAndExchange(1, 2));
+ assertEquals(2, ai.compareAndExchange(2, -4));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchange(-5, 7));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchange(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.compareAndExchangeAcquire(1, 2));
+ assertEquals(2, ai.compareAndExchangeAcquire(2, -4));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeAcquire(-5, 7));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeAcquire(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicLong ai = new AtomicLong(1);
+ assertEquals(1, ai.compareAndExchangeRelease(1, 2));
+ assertEquals(2, ai.compareAndExchangeRelease(2, -4));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeRelease(-5, 7));
+ assertEquals(-4, ai.get());
+ assertEquals(-4, ai.compareAndExchangeRelease(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicLong ai = new AtomicLong(1);
+ do {} while (!ai.weakCompareAndSetVolatile(1, 2));
+ do {} while (!ai.weakCompareAndSetVolatile(2, -4));
+ assertEquals(-4, ai.get());
+ do {} while (!ai.weakCompareAndSetVolatile(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicLong ai = new AtomicLong(1);
+ do {} while (!ai.weakCompareAndSetAcquire(1, 2));
+ do {} while (!ai.weakCompareAndSetAcquire(2, -4));
+ assertEquals(-4, ai.get());
+ do {} while (!ai.weakCompareAndSetAcquire(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicLong ai = new AtomicLong(1);
+ do {} while (!ai.weakCompareAndSetRelease(1, 2));
+ do {} while (!ai.weakCompareAndSetRelease(2, -4));
+ assertEquals(-4, ai.get());
+ do {} while (!ai.weakCompareAndSetRelease(-4, 7));
+ assertEquals(7, ai.get());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicLongArray9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,266 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicLongArray;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicLongArray9Test extends JSR166TestCase {
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicLongArray9Test.class);
+ }
+
+ /**
+ * get and set for out of bound indices throw IndexOutOfBoundsException
+ */
+ public void testIndexing() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int index : new int[] { -1, SIZE }) {
+ final int j = index;
+ final Runnable[] tasks = {
+ () -> aa.getPlain(j),
+ () -> aa.getOpaque(j),
+ () -> aa.getAcquire(j),
+ () -> aa.setPlain(j, 1),
+ () -> aa.setOpaque(j, 1),
+ () -> aa.setRelease(j, 1),
+ () -> aa.compareAndExchange(j, 1, 2),
+ () -> aa.compareAndExchangeAcquire(j, 1, 2),
+ () -> aa.compareAndExchangeRelease(j, 1, 2),
+ () -> aa.weakCompareAndSetVolatile(j, 1, 2),
+ () -> aa.weakCompareAndSetAcquire(j, 1, 2),
+ () -> aa.weakCompareAndSetRelease(j, 1, 2),
+ };
+
+ assertThrows(IndexOutOfBoundsException.class, tasks);
+ }
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.getPlain(i));
+ aa.set(i, 2);
+ assertEquals(2, aa.getPlain(i));
+ aa.set(i, -3);
+ assertEquals(-3, aa.getPlain(i));
+ }
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.getOpaque(i));
+ aa.set(i, 2);
+ assertEquals(2, aa.getOpaque(i));
+ aa.set(i, -3);
+ assertEquals(-3, aa.getOpaque(i));
+ }
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.getAcquire(i));
+ aa.set(i, 2);
+ assertEquals(2, aa.getAcquire(i));
+ aa.set(i, -3);
+ assertEquals(-3, aa.getAcquire(i));
+ }
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setPlain(i, 1);
+ assertEquals(1, aa.get(i));
+ aa.setPlain(i, 2);
+ assertEquals(2, aa.get(i));
+ aa.setPlain(i, -3);
+ assertEquals(-3, aa.get(i));
+ }
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setOpaque(i, 1);
+ assertEquals(1, aa.get(i));
+ aa.setOpaque(i, 2);
+ assertEquals(2, aa.get(i));
+ aa.setOpaque(i, -3);
+ assertEquals(-3, aa.get(i));
+ }
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setRelease(i, 1);
+ assertEquals(1, aa.get(i));
+ aa.setRelease(i, 2);
+ assertEquals(2, aa.get(i));
+ aa.setRelease(i, -3);
+ assertEquals(-3, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.compareAndExchange(i, 1, 2));
+ assertEquals(2, aa.compareAndExchange(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchange(i,-5, 7));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchange(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.compareAndExchangeAcquire(i, 1, 2));
+ assertEquals(2, aa.compareAndExchangeAcquire(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeAcquire(i,-5, 7));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeAcquire(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ assertEquals(1, aa.compareAndExchangeRelease(i, 1, 2));
+ assertEquals(2, aa.compareAndExchangeRelease(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeRelease(i,-5, 7));
+ assertEquals(-4, aa.get(i));
+ assertEquals(-4, aa.compareAndExchangeRelease(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ do {} while (!aa.weakCompareAndSetVolatile(i, 1, 2));
+ do {} while (!aa.weakCompareAndSetVolatile(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetVolatile(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ do {} while (!aa.weakCompareAndSetAcquire(i, 1, 2));
+ do {} while (!aa.weakCompareAndSetAcquire(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetAcquire(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicLongArray aa = new AtomicLongArray(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, 1);
+ do {} while (!aa.weakCompareAndSetRelease(i, 1, 2));
+ do {} while (!aa.weakCompareAndSetRelease(i, 2, -4));
+ assertEquals(-4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetRelease(i, -4, 7));
+ assertEquals(7, aa.get(i));
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicReference9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicReference9Test extends JSR166TestCase {
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicReference9Test.class);
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.getPlain());
+ ai.set(two);
+ assertEquals(two, ai.getPlain());
+ ai.set(m3);
+ assertEquals(m3, ai.getPlain());
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.getOpaque());
+ ai.set(two);
+ assertEquals(two, ai.getOpaque());
+ ai.set(m3);
+ assertEquals(m3, ai.getOpaque());
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.getAcquire());
+ ai.set(two);
+ assertEquals(two, ai.getAcquire());
+ ai.set(m3);
+ assertEquals(m3, ai.getAcquire());
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.get());
+ ai.setPlain(two);
+ assertEquals(two, ai.get());
+ ai.setPlain(m3);
+ assertEquals(m3, ai.get());
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.get());
+ ai.setOpaque(two);
+ assertEquals(two, ai.get());
+ ai.setOpaque(m3);
+ assertEquals(m3, ai.get());
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.get());
+ ai.setRelease(two);
+ assertEquals(two, ai.get());
+ ai.setRelease(m3);
+ assertEquals(m3, ai.get());
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.compareAndExchange(one, two));
+ assertEquals(two, ai.compareAndExchange(two, m4));
+ assertEquals(m4, ai.get());
+ assertEquals(m4, ai.compareAndExchange(m5, seven));
+ assertEquals(m4, ai.get());
+ assertEquals(m4, ai.compareAndExchange(m4, seven));
+ assertEquals(seven, ai.get());
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.compareAndExchangeAcquire(one, two));
+ assertEquals(two, ai.compareAndExchangeAcquire(two, m4));
+ assertEquals(m4, ai.get());
+ assertEquals(m4, ai.compareAndExchangeAcquire(m5, seven));
+ assertEquals(m4, ai.get());
+ assertEquals(m4, ai.compareAndExchangeAcquire(m4, seven));
+ assertEquals(seven, ai.get());
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ assertEquals(one, ai.compareAndExchangeRelease(one, two));
+ assertEquals(two, ai.compareAndExchangeRelease(two, m4));
+ assertEquals(m4, ai.get());
+ assertEquals(m4, ai.compareAndExchangeRelease(m5, seven));
+ assertEquals(m4, ai.get());
+ assertEquals(m4, ai.compareAndExchangeRelease(m4, seven));
+ assertEquals(seven, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ do {} while (!ai.weakCompareAndSetVolatile(one, two));
+ do {} while (!ai.weakCompareAndSetVolatile(two, m4));
+ assertEquals(m4, ai.get());
+ do {} while (!ai.weakCompareAndSetVolatile(m4, seven));
+ assertEquals(seven, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ do {} while (!ai.weakCompareAndSetAcquire(one, two));
+ do {} while (!ai.weakCompareAndSetAcquire(two, m4));
+ assertEquals(m4, ai.get());
+ do {} while (!ai.weakCompareAndSetAcquire(m4, seven));
+ assertEquals(seven, ai.get());
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
+ do {} while (!ai.weakCompareAndSetRelease(one, two));
+ do {} while (!ai.weakCompareAndSetRelease(two, m4));
+ assertEquals(m4, ai.get());
+ do {} while (!ai.weakCompareAndSetRelease(m4, seven));
+ assertEquals(seven, ai.get());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicReferenceArray9Test.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,266 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AtomicReferenceArray9Test extends JSR166TestCase {
+ public static void main(String[] args) {
+ main(suite(), args);
+ }
+ public static Test suite() {
+ return new TestSuite(AtomicReferenceArray9Test.class);
+ }
+
+ /**
+ * get and set for out of bound indices throw IndexOutOfBoundsException
+ */
+ public void testIndexing() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int index : new int[] { -1, SIZE }) {
+ final int j = index;
+ final Runnable[] tasks = {
+ () -> aa.getPlain(j),
+ () -> aa.getOpaque(j),
+ () -> aa.getAcquire(j),
+ () -> aa.setPlain(j, null),
+ () -> aa.setOpaque(j, null),
+ () -> aa.setRelease(j, null),
+ () -> aa.compareAndExchange(j, null, null),
+ () -> aa.compareAndExchangeAcquire(j, null, null),
+ () -> aa.compareAndExchangeRelease(j, null, null),
+ () -> aa.weakCompareAndSetVolatile(j, null, null),
+ () -> aa.weakCompareAndSetAcquire(j, null, null),
+ () -> aa.weakCompareAndSetRelease(j, null, null),
+ };
+
+ assertThrows(IndexOutOfBoundsException.class, tasks);
+ }
+ }
+
+ /**
+ * getPlain returns the last value set
+ */
+ public void testGetPlainSet() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ assertEquals(one, aa.getPlain(i));
+ aa.set(i, two);
+ assertEquals(two, aa.getPlain(i));
+ aa.set(i, m3);
+ assertEquals(m3, aa.getPlain(i));
+ }
+ }
+
+ /**
+ * getOpaque returns the last value set
+ */
+ public void testGetOpaqueSet() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ assertEquals(one, aa.getOpaque(i));
+ aa.set(i, two);
+ assertEquals(two, aa.getOpaque(i));
+ aa.set(i, m3);
+ assertEquals(m3, aa.getOpaque(i));
+ }
+ }
+
+ /**
+ * getAcquire returns the last value set
+ */
+ public void testGetAcquireSet() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ assertEquals(one, aa.getAcquire(i));
+ aa.set(i, two);
+ assertEquals(two, aa.getAcquire(i));
+ aa.set(i, m3);
+ assertEquals(m3, aa.getAcquire(i));
+ }
+ }
+
+ /**
+ * get returns the last value setPlain
+ */
+ public void testGetSetPlain() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setPlain(i, one);
+ assertEquals(one, aa.get(i));
+ aa.setPlain(i, two);
+ assertEquals(two, aa.get(i));
+ aa.setPlain(i, m3);
+ assertEquals(m3, aa.get(i));
+ }
+ }
+
+ /**
+ * get returns the last value setOpaque
+ */
+ public void testGetSetOpaque() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setOpaque(i, one);
+ assertEquals(one, aa.get(i));
+ aa.setOpaque(i, two);
+ assertEquals(two, aa.get(i));
+ aa.setOpaque(i, m3);
+ assertEquals(m3, aa.get(i));
+ }
+ }
+
+ /**
+ * get returns the last value setRelease
+ */
+ public void testGetSetRelease() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.setRelease(i, one);
+ assertEquals(one, aa.get(i));
+ aa.setRelease(i, two);
+ assertEquals(two, aa.get(i));
+ aa.setRelease(i, m3);
+ assertEquals(m3, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchange succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchange() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ assertEquals(one, aa.compareAndExchange(i, one, two));
+ assertEquals(two, aa.compareAndExchange(i, two, m4));
+ assertEquals(m4, aa.get(i));
+ assertEquals(m4, aa.compareAndExchange(i,m5, seven));
+ assertEquals(m4, aa.get(i));
+ assertEquals(m4, aa.compareAndExchange(i, m4, seven));
+ assertEquals(seven, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchangeAcquire succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeAcquire() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ assertEquals(one, aa.compareAndExchangeAcquire(i, one, two));
+ assertEquals(two, aa.compareAndExchangeAcquire(i, two, m4));
+ assertEquals(m4, aa.get(i));
+ assertEquals(m4, aa.compareAndExchangeAcquire(i,m5, seven));
+ assertEquals(m4, aa.get(i));
+ assertEquals(m4, aa.compareAndExchangeAcquire(i, m4, seven));
+ assertEquals(seven, aa.get(i));
+ }
+ }
+
+ /**
+ * compareAndExchangeRelease succeeds in changing value if equal to
+ * expected else fails
+ */
+ public void testCompareAndExchangeRelease() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ assertEquals(one, aa.compareAndExchangeRelease(i, one, two));
+ assertEquals(two, aa.compareAndExchangeRelease(i, two, m4));
+ assertEquals(m4, aa.get(i));
+ assertEquals(m4, aa.compareAndExchangeRelease(i,m5, seven));
+ assertEquals(m4, aa.get(i));
+ assertEquals(m4, aa.compareAndExchangeRelease(i, m4, seven));
+ assertEquals(seven, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetVolatile succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetVolatile() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ do {} while (!aa.weakCompareAndSetVolatile(i, one, two));
+ do {} while (!aa.weakCompareAndSetVolatile(i, two, m4));
+ assertEquals(m4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetVolatile(i, m4, seven));
+ assertEquals(seven, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetAcquire succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetAcquire() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ do {} while (!aa.weakCompareAndSetAcquire(i, one, two));
+ do {} while (!aa.weakCompareAndSetAcquire(i, two, m4));
+ assertEquals(m4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetAcquire(i, m4, seven));
+ assertEquals(seven, aa.get(i));
+ }
+ }
+
+ /**
+ * repeated weakCompareAndSetRelease succeeds in changing value when equal
+ * to expected
+ */
+ public void testWeakCompareAndSetRelease() {
+ AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
+ for (int i = 0; i < SIZE; i++) {
+ aa.set(i, one);
+ do {} while (!aa.weakCompareAndSetRelease(i, one, two));
+ do {} while (!aa.weakCompareAndSetRelease(i, two, m4));
+ assertEquals(m4, aa.get(i));
+ do {} while (!aa.weakCompareAndSetRelease(i, m4, seven));
+ assertEquals(seven, aa.get(i));
+ }
+ }
+
+}
--- a/jdk/test/java/util/concurrent/tck/AtomicReferenceArrayTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicReferenceArrayTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -243,4 +243,5 @@
AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<Integer>(a);
assertEquals(Arrays.toString(a), aa.toString());
}
+
}
--- a/jdk/test/java/util/concurrent/tck/AtomicReferenceTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/tck/AtomicReferenceTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -161,7 +161,7 @@
* toString returns current value.
*/
public void testToString() {
- AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
+ AtomicReference<Integer> ai = new AtomicReference<>(one);
assertEquals(one.toString(), ai.toString());
ai.set(two);
assertEquals(two.toString(), ai.toString());
--- a/jdk/test/java/util/concurrent/tck/CompletableFutureTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/tck/CompletableFutureTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -57,6 +57,7 @@
import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -486,62 +487,68 @@
class FailingSupplier extends CheckedAction
implements Supplier<Integer>
{
- FailingSupplier(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
public Integer get() {
invoked();
- throw new CFException();
+ throw ex;
}
}
class FailingConsumer extends CheckedIntegerAction
implements Consumer<Integer>
{
- FailingConsumer(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
public void accept(Integer x) {
invoked();
value = x;
- throw new CFException();
+ throw ex;
}
}
class FailingBiConsumer extends CheckedIntegerAction
implements BiConsumer<Integer, Integer>
{
- FailingBiConsumer(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
public void accept(Integer x, Integer y) {
invoked();
value = subtract(x, y);
- throw new CFException();
+ throw ex;
}
}
class FailingFunction extends CheckedIntegerAction
implements Function<Integer, Integer>
{
- FailingFunction(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
public Integer apply(Integer x) {
invoked();
value = x;
- throw new CFException();
+ throw ex;
}
}
class FailingBiFunction extends CheckedIntegerAction
implements BiFunction<Integer, Integer, Integer>
{
- FailingBiFunction(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
public Integer apply(Integer x, Integer y) {
invoked();
value = subtract(x, y);
- throw new CFException();
+ throw ex;
}
}
class FailingRunnable extends CheckedAction implements Runnable {
- FailingRunnable(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
public void run() {
invoked();
- throw new CFException();
+ throw ex;
}
}
@@ -561,11 +568,21 @@
class FailingCompletableFutureFunction extends CheckedIntegerAction
implements Function<Integer, CompletableFuture<Integer>>
{
- FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
+ final CFException ex;
+ FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
public CompletableFuture<Integer> apply(Integer x) {
invoked();
value = x;
- throw new CFException();
+ throw ex;
+ }
+ }
+
+ static class CountingRejectingExecutor implements Executor {
+ final RejectedExecutionException ex = new RejectedExecutionException();
+ final AtomicInteger count = new AtomicInteger(0);
+ public void execute(Runnable r) {
+ count.getAndIncrement();
+ throw ex;
}
}
@@ -1249,10 +1266,22 @@
{
final FailingRunnable r = new FailingRunnable(m);
final CompletableFuture<Void> f = m.runAsync(r);
- checkCompletedWithWrappedCFException(f);
+ checkCompletedWithWrappedException(f, r.ex);
r.assertInvoked();
}}
+ public void testRunAsync_rejectingExecutor() {
+ CountingRejectingExecutor e = new CountingRejectingExecutor();
+ try {
+ CompletableFuture.runAsync(() -> {}, e);
+ shouldThrow();
+ } catch (Throwable t) {
+ assertSame(e.ex, t);
+ }
+
+ assertEquals(1, e.count.get());
+ }
+
/**
* supplyAsync completes with result of supplier
*/
@@ -1283,10 +1312,22 @@
{
FailingSupplier r = new FailingSupplier(m);
CompletableFuture<Integer> f = m.supplyAsync(r);
- checkCompletedWithWrappedCFException(f);
+ checkCompletedWithWrappedException(f, r.ex);
r.assertInvoked();
}}
+ public void testSupplyAsync_rejectingExecutor() {
+ CountingRejectingExecutor e = new CountingRejectingExecutor();
+ try {
+ CompletableFuture.supplyAsync(() -> null, e);
+ shouldThrow();
+ } catch (Throwable t) {
+ assertSame(e.ex, t);
+ }
+
+ assertEquals(1, e.count.get());
+ }
+
// seq completion methods
/**
@@ -1405,12 +1446,12 @@
final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
- checkCompletedWithWrappedCFException(h0);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
- checkCompletedWithWrappedCFException(h4);
- checkCompletedWithWrappedCFException(h5);
+ checkCompletedWithWrappedException(h0, rs[0].ex);
+ checkCompletedWithWrappedException(h1, rs[1].ex);
+ checkCompletedWithWrappedException(h2, rs[2].ex);
+ checkCompletedWithWrappedException(h3, rs[3].ex);
+ checkCompletedWithWrappedException(h4, rs[4].ex);
+ checkCompletedWithWrappedException(h5, rs[5].ex);
checkCompletedNormally(f, v1);
}}
@@ -1509,10 +1550,10 @@
final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
- checkCompletedWithWrappedCFException(h0);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h0, rs[0].ex);
+ checkCompletedWithWrappedException(h1, rs[1].ex);
+ checkCompletedWithWrappedException(h2, rs[2].ex);
+ checkCompletedWithWrappedException(h3, rs[3].ex);
checkCompletedNormally(f, v1);
}}
@@ -1611,10 +1652,10 @@
final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
- checkCompletedWithWrappedCFException(h0);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h0, rs[0].ex);
+ checkCompletedWithWrappedException(h1, rs[1].ex);
+ checkCompletedWithWrappedException(h2, rs[2].ex);
+ checkCompletedWithWrappedException(h3, rs[3].ex);
checkCompletedNormally(f, v1);
}}
@@ -1776,9 +1817,9 @@
assertTrue(snd.complete(w2));
final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h1, r1.ex);
+ checkCompletedWithWrappedException(h2, r2.ex);
+ checkCompletedWithWrappedException(h3, r3.ex);
r1.assertInvoked();
r2.assertInvoked();
r3.assertInvoked();
@@ -1940,9 +1981,9 @@
assertTrue(snd.complete(w2));
final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h1, r1.ex);
+ checkCompletedWithWrappedException(h2, r2.ex);
+ checkCompletedWithWrappedException(h3, r3.ex);
r1.assertInvoked();
r2.assertInvoked();
r3.assertInvoked();
@@ -2104,9 +2145,9 @@
assertTrue(snd.complete(w2));
final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h1, r1.ex);
+ checkCompletedWithWrappedException(h2, r2.ex);
+ checkCompletedWithWrappedException(h3, r3.ex);
r1.assertInvoked();
r2.assertInvoked();
r3.assertInvoked();
@@ -2396,10 +2437,10 @@
f.complete(v1);
final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
- checkCompletedWithWrappedCFException(h0);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h0, rs[0].ex);
+ checkCompletedWithWrappedException(h1, rs[1].ex);
+ checkCompletedWithWrappedException(h2, rs[2].ex);
+ checkCompletedWithWrappedException(h3, rs[3].ex);
for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
g.complete(v2);
@@ -2408,10 +2449,10 @@
final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
- checkCompletedWithWrappedCFException(h4);
+ checkCompletedWithWrappedException(h4, rs[4].ex);
assertTrue(Objects.equals(v1, rs[4].value) ||
Objects.equals(v2, rs[4].value));
- checkCompletedWithWrappedCFException(h5);
+ checkCompletedWithWrappedException(h5, rs[5].ex);
assertTrue(Objects.equals(v1, rs[5].value) ||
Objects.equals(v2, rs[5].value));
@@ -2655,10 +2696,10 @@
f.complete(v1);
final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
- checkCompletedWithWrappedCFException(h0);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h0, rs[0].ex);
+ checkCompletedWithWrappedException(h1, rs[1].ex);
+ checkCompletedWithWrappedException(h2, rs[2].ex);
+ checkCompletedWithWrappedException(h3, rs[3].ex);
for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
g.complete(v2);
@@ -2667,10 +2708,10 @@
final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
- checkCompletedWithWrappedCFException(h4);
+ checkCompletedWithWrappedException(h4, rs[4].ex);
assertTrue(Objects.equals(v1, rs[4].value) ||
Objects.equals(v2, rs[4].value));
- checkCompletedWithWrappedCFException(h5);
+ checkCompletedWithWrappedException(h5, rs[5].ex);
assertTrue(Objects.equals(v1, rs[5].value) ||
Objects.equals(v2, rs[5].value));
@@ -2686,6 +2727,7 @@
for (ExecutionMode m : ExecutionMode.values())
for (Integer v1 : new Integer[] { 1, null })
for (Integer v2 : new Integer[] { 2, null })
+ for (boolean pushNop : new boolean[] { true, false })
{
final CompletableFuture<Integer> f = new CompletableFuture<>();
final CompletableFuture<Integer> g = new CompletableFuture<>();
@@ -2698,6 +2740,10 @@
checkIncomplete(h1);
rs[0].assertNotInvoked();
rs[1].assertNotInvoked();
+ if (pushNop) { // ad hoc test of intra-completion interference
+ m.thenRun(f, () -> {});
+ m.thenRun(g, () -> {});
+ }
f.complete(v1);
checkCompletedNormally(h0, null);
checkCompletedNormally(h1, null);
@@ -2910,16 +2956,16 @@
assertTrue(f.complete(v1));
final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
- checkCompletedWithWrappedCFException(h0);
- checkCompletedWithWrappedCFException(h1);
- checkCompletedWithWrappedCFException(h2);
- checkCompletedWithWrappedCFException(h3);
+ checkCompletedWithWrappedException(h0, rs[0].ex);
+ checkCompletedWithWrappedException(h1, rs[1].ex);
+ checkCompletedWithWrappedException(h2, rs[2].ex);
+ checkCompletedWithWrappedException(h3, rs[3].ex);
for (int i = 0; i < 4; i++) rs[i].assertInvoked();
assertTrue(g.complete(v2));
final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
- checkCompletedWithWrappedCFException(h4);
- checkCompletedWithWrappedCFException(h5);
+ checkCompletedWithWrappedException(h4, rs[4].ex);
+ checkCompletedWithWrappedException(h5, rs[5].ex);
checkCompletedNormally(f, v1);
checkCompletedNormally(g, v2);
@@ -2980,7 +3026,7 @@
final CompletableFuture<Integer> g = m.thenCompose(f, r);
if (createIncomplete) assertTrue(f.complete(v1));
- checkCompletedWithWrappedCFException(g);
+ checkCompletedWithWrappedException(g, r.ex);
checkCompletedNormally(f, v1);
}}
@@ -3089,7 +3135,7 @@
}
}
- public void testAllOf_backwards() throws Exception {
+ public void testAllOf_normal_backwards() throws Exception {
for (int k = 1; k < 10; k++) {
CompletableFuture<Integer>[] fs
= (CompletableFuture<Integer>[]) new CompletableFuture[k];
@@ -3337,6 +3383,151 @@
}
/**
+ * Test submissions to an executor that rejects all tasks.
+ */
+ public void testRejectingExecutor() {
+ for (Integer v : new Integer[] { 1, null })
+ {
+ final CountingRejectingExecutor e = new CountingRejectingExecutor();
+
+ final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
+ final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+
+ List<CompletableFuture<?>> futures = new ArrayList<>();
+
+ List<CompletableFuture<Integer>> srcs = new ArrayList<>();
+ srcs.add(complete);
+ srcs.add(incomplete);
+
+ for (CompletableFuture<Integer> src : srcs) {
+ List<CompletableFuture<?>> fs = new ArrayList<>();
+ fs.add(src.thenRunAsync(() -> {}, e));
+ fs.add(src.thenAcceptAsync((z) -> {}, e));
+ fs.add(src.thenApplyAsync((z) -> z, e));
+
+ fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
+ fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
+ fs.add(src.runAfterBothAsync(src, () -> {}, e));
+
+ fs.add(src.applyToEitherAsync(src, (z) -> z, e));
+ fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
+ fs.add(src.runAfterEitherAsync(src, () -> {}, e));
+
+ fs.add(src.thenComposeAsync((z) -> null, e));
+ fs.add(src.whenCompleteAsync((z, t) -> {}, e));
+ fs.add(src.handleAsync((z, t) -> null, e));
+
+ for (CompletableFuture<?> future : fs) {
+ if (src.isDone())
+ checkCompletedWithWrappedException(future, e.ex);
+ else
+ checkIncomplete(future);
+ }
+ futures.addAll(fs);
+ }
+
+ {
+ List<CompletableFuture<?>> fs = new ArrayList<>();
+
+ fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
+ fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
+
+ fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
+ fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
+
+ fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
+ fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
+
+ for (CompletableFuture<?> future : fs)
+ checkIncomplete(future);
+ futures.addAll(fs);
+ }
+
+ {
+ List<CompletableFuture<?>> fs = new ArrayList<>();
+
+ fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
+ fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
+
+ fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
+ fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
+
+ fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
+ fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
+
+ for (CompletableFuture<?> future : fs)
+ checkCompletedWithWrappedException(future, e.ex);
+ futures.addAll(fs);
+ }
+
+ incomplete.complete(v);
+
+ for (CompletableFuture<?> future : futures)
+ checkCompletedWithWrappedException(future, e.ex);
+
+ assertEquals(futures.size(), e.count.get());
+ }}
+
+ /**
+ * Test submissions to an executor that rejects all tasks, but
+ * should never be invoked because the dependent future is
+ * explicitly completed.
+ */
+ public void testRejectingExecutorNeverInvoked() {
+ for (Integer v : new Integer[] { 1, null })
+ {
+ final CountingRejectingExecutor e = new CountingRejectingExecutor();
+
+ final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
+ final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+
+ List<CompletableFuture<?>> futures = new ArrayList<>();
+
+ List<CompletableFuture<Integer>> srcs = new ArrayList<>();
+ srcs.add(complete);
+ srcs.add(incomplete);
+
+ List<CompletableFuture<?>> fs = new ArrayList<>();
+ fs.add(incomplete.thenRunAsync(() -> {}, e));
+ fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
+ fs.add(incomplete.thenApplyAsync((z) -> z, e));
+
+ fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
+ fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
+ fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
+
+ fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
+ fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
+ fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
+
+ fs.add(incomplete.thenComposeAsync((z) -> null, e));
+ fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
+ fs.add(incomplete.handleAsync((z, t) -> null, e));
+
+ fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
+ fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
+
+ fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
+ fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
+
+ fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
+ fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
+
+ for (CompletableFuture<?> future : fs)
+ checkIncomplete(future);
+
+ for (CompletableFuture<?> future : fs)
+ future.complete(null);
+
+ incomplete.complete(v);
+
+ for (CompletableFuture<?> future : fs)
+ checkCompletedNormally(future, null);
+
+ assertEquals(0, e.count.get());
+ }}
+
+ /**
* toCompletableFuture returns this CompletableFuture.
*/
public void testToCompletableFuture() {
@@ -3659,12 +3850,25 @@
//--- tests of implementation details; not part of official tck ---
Object resultOf(CompletableFuture<?> f) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ try {
+ System.setSecurityManager(null);
+ } catch (SecurityException giveUp) {
+ return "Reflection not available";
+ }
+ }
+
try {
java.lang.reflect.Field resultField
= CompletableFuture.class.getDeclaredField("result");
resultField.setAccessible(true);
return resultField.get(f);
- } catch (Throwable t) { throw new AssertionError(t); }
+ } catch (Throwable t) {
+ throw new AssertionError(t);
+ } finally {
+ if (sm != null) System.setSecurityManager(sm);
+ }
}
public void testExceptionPropagationReusesResultObject() {
@@ -3675,33 +3879,44 @@
final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+ final Runnable noopRunnable = new Noop(m);
+ final Consumer<Integer> noopConsumer = new NoopConsumer(m);
+ final Function<Integer, Integer> incFunction = new IncFunction(m);
+
List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
= new ArrayList<>();
- funs.add((y) -> m.thenRun(y, new Noop(m)));
- funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
- funs.add((y) -> m.thenApply(y, new IncFunction(m)));
-
- funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
- funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
- funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
-
- funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
+ funs.add((y) -> m.thenRun(y, noopRunnable));
+ funs.add((y) -> m.thenAccept(y, noopConsumer));
+ funs.add((y) -> m.thenApply(y, incFunction));
+
+ funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
+ funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
+ funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
+
+ funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
+ funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
+ funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
+ funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
- funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
- funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
+ funs.add((y) -> CompletableFuture.allOf(y));
+ funs.add((y) -> CompletableFuture.allOf(y, v42));
+ funs.add((y) -> CompletableFuture.allOf(v42, y));
+ funs.add((y) -> CompletableFuture.anyOf(y));
+ funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
+ funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
fun : funs) {
CompletableFuture<Integer> f = new CompletableFuture<>();
f.completeExceptionally(ex);
- CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+ CompletableFuture<Integer> src = m.thenApply(f, incFunction);
checkCompletedWithWrappedException(src, ex);
CompletableFuture<?> dep = fun.apply(src);
checkCompletedWithWrappedException(dep, ex);
@@ -3711,7 +3926,7 @@
for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
fun : funs) {
CompletableFuture<Integer> f = new CompletableFuture<>();
- CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+ CompletableFuture<Integer> src = m.thenApply(f, incFunction);
CompletableFuture<?> dep = fun.apply(src);
f.completeExceptionally(ex);
checkCompletedWithWrappedException(src, ex);
@@ -3725,7 +3940,7 @@
CompletableFuture<Integer> f = new CompletableFuture<>();
f.cancel(mayInterruptIfRunning);
checkCancelled(f);
- CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+ CompletableFuture<Integer> src = m.thenApply(f, incFunction);
checkCompletedWithWrappedCancellationException(src);
CompletableFuture<?> dep = fun.apply(src);
checkCompletedWithWrappedCancellationException(dep);
@@ -3736,7 +3951,7 @@
for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
fun : funs) {
CompletableFuture<Integer> f = new CompletableFuture<>();
- CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+ CompletableFuture<Integer> src = m.thenApply(f, incFunction);
CompletableFuture<?> dep = fun.apply(src);
f.cancel(mayInterruptIfRunning);
checkCancelled(f);
@@ -3747,7 +3962,7 @@
}}
/**
- * Minimal completion stages throw UOE for all non-CompletionStage methods
+ * Minimal completion stages throw UOE for most non-CompletionStage methods
*/
public void testMinimalCompletionStage_minimality() {
if (!testImplementationDetails) return;
@@ -3776,8 +3991,10 @@
.filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
.collect(Collectors.toList());
- CompletionStage<Integer> minimalStage =
- new CompletableFuture<Integer>().minimalCompletionStage();
+ List<CompletionStage<Integer>> stages = new ArrayList<>();
+ stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
+ stages.add(CompletableFuture.completedStage(1));
+ stages.add(CompletableFuture.failedStage(new CFException()));
List<Method> bugs = new ArrayList<>();
for (Method method : allMethods) {
@@ -3793,20 +4010,22 @@
else if (parameterTypes[i] == long.class)
args[i] = 0L;
}
- try {
- method.invoke(minimalStage, args);
- bugs.add(method);
+ for (CompletionStage<Integer> stage : stages) {
+ try {
+ method.invoke(stage, args);
+ bugs.add(method);
+ }
+ catch (java.lang.reflect.InvocationTargetException expected) {
+ if (! (expected.getCause() instanceof UnsupportedOperationException)) {
+ bugs.add(method);
+ // expected.getCause().printStackTrace();
+ }
+ }
+ catch (ReflectiveOperationException bad) { throw new Error(bad); }
}
- catch (java.lang.reflect.InvocationTargetException expected) {
- if (! (expected.getCause() instanceof UnsupportedOperationException)) {
- bugs.add(method);
- // expected.getCause().printStackTrace();
- }
- }
- catch (ReflectiveOperationException bad) { throw new Error(bad); }
}
if (!bugs.isEmpty())
- throw new Error("Methods did not throw UOE: " + bugs.toString());
+ throw new Error("Methods did not throw UOE: " + bugs);
}
static class Monad {
@@ -3955,12 +4174,33 @@
Monad.plus(godot, Monad.unit(5L)));
}
+ /** Test long recursive chains of CompletableFutures with cascading completions */
+ public void testRecursiveChains() throws Throwable {
+ for (ExecutionMode m : ExecutionMode.values())
+ for (boolean addDeadEnds : new boolean[] { true, false })
+ {
+ final int val = 42;
+ final int n = expensiveTests ? 1_000 : 2;
+ CompletableFuture<Integer> head = new CompletableFuture<>();
+ CompletableFuture<Integer> tail = head;
+ for (int i = 0; i < n; i++) {
+ if (addDeadEnds) m.thenApply(tail, v -> v + 1);
+ tail = m.thenApply(tail, v -> v + 1);
+ if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
+ tail = m.applyToEither(tail, tail, v -> v + 1);
+ if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
+ tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
+ }
+ head.complete(val);
+ assertEquals(val + 3 * n, (int) tail.join());
+ }}
+
/**
* A single CompletableFuture with many dependents.
* A demo of scalability - runtime is O(n).
*/
public void testManyDependents() throws Throwable {
- final int n = 1_000;
+ final int n = expensiveTests ? 1_000_000 : 10;
final CompletableFuture<Void> head = new CompletableFuture<>();
final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
final AtomicInteger count = new AtomicInteger(0);
@@ -3987,6 +4227,78 @@
assertEquals(5 * 3 * n, count.get());
}
+ /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
+ public void testCoCompletionGarbageRetention() throws Throwable {
+ final int n = expensiveTests ? 1_000_000 : 10;
+ final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+ CompletableFuture<Integer> f;
+ for (int i = 0; i < n; i++) {
+ f = new CompletableFuture<>();
+ f.runAfterEither(incomplete, () -> {});
+ f.complete(null);
+
+ f = new CompletableFuture<>();
+ f.acceptEither(incomplete, (x) -> {});
+ f.complete(null);
+
+ f = new CompletableFuture<>();
+ f.applyToEither(incomplete, (x) -> x);
+ f.complete(null);
+
+ f = new CompletableFuture<>();
+ CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
+ f.complete(null);
+ }
+
+ for (int i = 0; i < n; i++) {
+ f = new CompletableFuture<>();
+ incomplete.runAfterEither(f, () -> {});
+ f.complete(null);
+
+ f = new CompletableFuture<>();
+ incomplete.acceptEither(f, (x) -> {});
+ f.complete(null);
+
+ f = new CompletableFuture<>();
+ incomplete.applyToEither(f, (x) -> x);
+ f.complete(null);
+
+ f = new CompletableFuture<>();
+ CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
+ f.complete(null);
+ }
+ }
+
+ /*
+ * Tests below currently fail in stress mode due to memory retention.
+ * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
+ */
+
+ /** Checks for garbage retention with anyOf. */
+ public void testAnyOfGarbageRetention() throws Throwable {
+ for (Integer v : new Integer[] { 1, null })
+ {
+ final int n = expensiveTests ? 100_000 : 10;
+ CompletableFuture<Integer>[] fs
+ = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
+ for (int i = 0; i < fs.length; i++)
+ fs[i] = new CompletableFuture<>();
+ fs[fs.length - 1].complete(v);
+ for (int i = 0; i < n; i++)
+ checkCompletedNormally(CompletableFuture.anyOf(fs), v);
+ }}
+
+ /** Checks for garbage retention with allOf. */
+ public void testCancelledAllOfGarbageRetention() throws Throwable {
+ final int n = expensiveTests ? 100_000 : 10;
+ CompletableFuture<Integer>[] fs
+ = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
+ for (int i = 0; i < fs.length; i++)
+ fs[i] = new CompletableFuture<>();
+ for (int i = 0; i < n; i++)
+ assertTrue(CompletableFuture.allOf(fs).cancel(false));
+ }
+
// static <U> U join(CompletionStage<U> stage) {
// CompletableFuture<U> f = new CompletableFuture<>();
// stage.whenComplete((v, ex) -> {
--- a/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Thu Jul 21 17:13:23 2016 +0000
@@ -548,6 +548,13 @@
// Java9+ test classes
if (atLeastJava9()) {
String[] java9TestClassNames = {
+ "AtomicBoolean9Test",
+ "AtomicInteger9Test",
+ "AtomicIntegerArray9Test",
+ "AtomicLong9Test",
+ "AtomicLongArray9Test",
+ "AtomicReference9Test",
+ "AtomicReferenceArray9Test",
"ExecutorCompletionService9Test",
};
addNamedTestClasses(suite, java9TestClassNames);
@@ -975,7 +982,11 @@
}
}
- /** Like Runnable, but with the freedom to throw anything */
+ /**
+ * Like Runnable, but with the freedom to throw anything.
+ * junit folks had the same idea:
+ * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
+ */
interface Action { public void run() throws Throwable; }
/**
@@ -1006,6 +1017,15 @@
* Uninteresting threads are filtered out.
*/
static void dumpTestThreads() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ try {
+ System.setSecurityManager(null);
+ } catch (SecurityException giveUp) {
+ return;
+ }
+ }
+
ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
System.err.println("------ stacktrace dump start ------");
for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
@@ -1023,6 +1043,8 @@
System.err.print(info);
}
System.err.println("------ stacktrace dump end ------");
+
+ if (sm != null) System.setSecurityManager(sm);
}
/**
--- a/jdk/test/java/util/concurrent/tck/StampedLockTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/concurrent/tck/StampedLockTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -745,28 +745,41 @@
public void testTryConvertToOptimisticRead() throws InterruptedException {
StampedLock lock = new StampedLock();
long s, p;
- s = 0L;
- assertFalse((p = lock.tryConvertToOptimisticRead(s)) != 0L);
+ assertEquals(0L, lock.tryConvertToOptimisticRead(0L));
+
assertTrue((s = lock.tryOptimisticRead()) != 0L);
- assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
+ assertEquals(s, lock.tryConvertToOptimisticRead(s));
+ assertTrue(lock.validate(s));
+
+ assertTrue((p = lock.readLock()) != 0L);
+ assertTrue((s = lock.tryOptimisticRead()) != 0L);
+ assertEquals(s, lock.tryConvertToOptimisticRead(s));
+ assertTrue(lock.validate(s));
+ lock.unlockRead(p);
+
assertTrue((s = lock.writeLock()) != 0L);
assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
assertTrue(lock.validate(p));
+
assertTrue((s = lock.readLock()) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
assertTrue(lock.validate(p));
+
assertTrue((s = lock.tryWriteLock()) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
assertTrue(lock.validate(p));
+
assertTrue((s = lock.tryReadLock()) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
assertTrue(lock.validate(p));
+
assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
assertTrue(lock.validate(p));
+
assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
@@ -780,39 +793,67 @@
public void testTryConvertToReadLock() throws InterruptedException {
StampedLock lock = new StampedLock();
long s, p;
- s = 0L;
- assertFalse((p = lock.tryConvertToReadLock(s)) != 0L);
+
+ assertFalse((p = lock.tryConvertToReadLock(0L)) != 0L);
+
assertTrue((s = lock.tryOptimisticRead()) != 0L);
assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
+ assertTrue(lock.isReadLocked());
+ assertEquals(1, lock.getReadLockCount());
lock.unlockRead(p);
+
+ assertTrue((s = lock.tryOptimisticRead()) != 0L);
+ lock.readLock();
+ assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
+ assertTrue(lock.isReadLocked());
+ assertEquals(2, lock.getReadLockCount());
+ lock.unlockRead(p);
+ lock.unlockRead(p);
+
assertTrue((s = lock.writeLock()) != 0L);
assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertTrue(lock.isReadLocked());
+ assertEquals(1, lock.getReadLockCount());
lock.unlockRead(p);
+
assertTrue((s = lock.readLock()) != 0L);
assertTrue(lock.validate(s));
- assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
- assertTrue(lock.validate(p));
- lock.unlockRead(p);
+ assertEquals(s, lock.tryConvertToReadLock(s));
+ assertTrue(lock.validate(s));
+ assertTrue(lock.isReadLocked());
+ assertEquals(1, lock.getReadLockCount());
+ lock.unlockRead(s);
+
assertTrue((s = lock.tryWriteLock()) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertEquals(1, lock.getReadLockCount());
lock.unlockRead(p);
+
assertTrue((s = lock.tryReadLock()) != 0L);
assertTrue(lock.validate(s));
- assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
- assertTrue(lock.validate(p));
- lock.unlockRead(p);
+ assertEquals(s, lock.tryConvertToReadLock(s));
+ assertTrue(lock.validate(s));
+ assertTrue(lock.isReadLocked());
+ assertEquals(1, lock.getReadLockCount());
+ lock.unlockRead(s);
+
assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertTrue(lock.isReadLocked());
+ assertEquals(1, lock.getReadLockCount());
lock.unlockRead(p);
+
assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
assertTrue(lock.validate(s));
- assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
- assertTrue(lock.validate(p));
- lock.unlockRead(p);
+ assertEquals(s, lock.tryConvertToReadLock(s));
+ assertTrue(lock.validate(s));
+ assertTrue(lock.isReadLocked());
+ assertEquals(1, lock.getReadLockCount());
+ lock.unlockRead(s);
}
/**
@@ -822,38 +863,52 @@
public void testTryConvertToWriteLock() throws InterruptedException {
StampedLock lock = new StampedLock();
long s, p;
- s = 0L;
- assertFalse((p = lock.tryConvertToWriteLock(s)) != 0L);
+
+ assertFalse((p = lock.tryConvertToWriteLock(0L)) != 0L);
+
assertTrue((s = lock.tryOptimisticRead()) != 0L);
assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
+ assertTrue(lock.isWriteLocked());
lock.unlockWrite(p);
+
assertTrue((s = lock.writeLock()) != 0L);
- assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
- assertTrue(lock.validate(p));
- lock.unlockWrite(p);
+ assertEquals(s, lock.tryConvertToWriteLock(s));
+ assertTrue(lock.validate(s));
+ assertTrue(lock.isWriteLocked());
+ lock.unlockWrite(s);
+
assertTrue((s = lock.readLock()) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertTrue(lock.isWriteLocked());
lock.unlockWrite(p);
+
assertTrue((s = lock.tryWriteLock()) != 0L);
assertTrue(lock.validate(s));
- assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
- assertTrue(lock.validate(p));
- lock.unlockWrite(p);
+ assertEquals(s, lock.tryConvertToWriteLock(s));
+ assertTrue(lock.validate(s));
+ assertTrue(lock.isWriteLocked());
+ lock.unlockWrite(s);
+
assertTrue((s = lock.tryReadLock()) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertTrue(lock.isWriteLocked());
lock.unlockWrite(p);
+
assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertTrue(lock.isWriteLocked());
lock.unlockWrite(p);
+
assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
assertTrue(lock.validate(s));
assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
assertTrue(lock.validate(p));
+ assertTrue(lock.isWriteLocked());
lock.unlockWrite(p);
}
@@ -903,4 +958,124 @@
assertTrue(lock.tryLock());
}
+ /**
+ * Lock.newCondition throws UnsupportedOperationException
+ */
+ public void testLockViewsDoNotSupportConditions() {
+ StampedLock sl = new StampedLock();
+ assertThrows(UnsupportedOperationException.class,
+ () -> sl.asWriteLock().newCondition(),
+ () -> sl.asReadLock().newCondition(),
+ () -> sl.asReadWriteLock().writeLock().newCondition(),
+ () -> sl.asReadWriteLock().readLock().newCondition());
+ }
+
+ /**
+ * Passing optimistic read stamps to unlock operations result in
+ * IllegalMonitorStateException
+ */
+ public void testCannotUnlockOptimisticReadStamps() {
+ Runnable[] actions = {
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryOptimisticRead();
+ assertTrue(stamp != 0);
+ sl.unlockRead(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryOptimisticRead();
+ sl.unlock(stamp);
+ },
+
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryOptimisticRead();
+ sl.writeLock();
+ sl.unlock(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryOptimisticRead();
+ sl.readLock();
+ sl.unlockRead(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryOptimisticRead();
+ sl.readLock();
+ sl.unlock(stamp);
+ },
+
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.writeLock());
+ assertTrue(stamp != 0);
+ sl.writeLock();
+ sl.unlockWrite(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.writeLock());
+ sl.writeLock();
+ sl.unlock(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.writeLock());
+ sl.readLock();
+ sl.unlockRead(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.writeLock());
+ sl.readLock();
+ sl.unlock(stamp);
+ },
+
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
+ assertTrue(stamp != 0);
+ sl.writeLock();
+ sl.unlockWrite(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
+ sl.writeLock();
+ sl.unlock(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
+ sl.readLock();
+ sl.unlockRead(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ sl.readLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
+ assertTrue(stamp != 0);
+ sl.readLock();
+ sl.unlockRead(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
+ sl.readLock();
+ sl.unlock(stamp);
+ },
+ () -> {
+ StampedLock sl = new StampedLock();
+ sl.readLock();
+ long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
+ sl.readLock();
+ sl.unlock(stamp);
+ },
+ };
+
+ assertThrows(IllegalMonitorStateException.class, actions);
+ }
+
}
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java Thu Jul 21 16:42:58 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, 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
- * @bug 8132734 8144062
- * @summary Test the extended API and the aliasing additions in JarFile that
- * support multi-release jar files
- * @library /lib/testlibrary/java/util/jar
- * @build Compiler JarBuilder CreateMultiReleaseTestJars
- * @run testng MultiReleaseJarIterators
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.stream.Collectors;
-import java.util.zip.ZipFile;
-
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-public class MultiReleaseJarIterators {
-
- static final int MAJOR_VERSION = Runtime.version().major();
-
- String userdir = System.getProperty("user.dir", ".");
- File unversioned = new File(userdir, "unversioned.jar");
- File multirelease = new File(userdir, "multi-release.jar");
- Map<String,JarEntry> uvEntries = new HashMap<>();
- Map<String,JarEntry> mrEntries = new HashMap<>();
- Map<String,JarEntry> baseEntries = new HashMap<>();
- Map<String,JarEntry> v9Entries = new HashMap<>();
- Map<String, JarEntry> v10Entries = new HashMap<>();
-
- @BeforeClass
- public void initialize() throws Exception {
- CreateMultiReleaseTestJars creator = new CreateMultiReleaseTestJars();
- creator.compileEntries();
- creator.buildUnversionedJar();
- creator.buildMultiReleaseJar();
-
- try (JarFile jf = new JarFile(multirelease)) {
- for (Enumeration<JarEntry> e = jf.entries(); e.hasMoreElements(); ) {
- JarEntry je = e.nextElement();
- String name = je.getName();
- mrEntries.put(name, je);
- if (name.startsWith("META-INF/versions/")) {
- if (name.startsWith("META-INF/versions/9/")) {
- v9Entries.put(name.substring(20), je);
- } else if (name.startsWith("META-INF/versions/10/")) {
- v10Entries.put(name.substring(21), je);
- }
- } else {
- baseEntries.put(name, je);
- }
- }
- }
- Assert.assertEquals(mrEntries.size(), 14);
- Assert.assertEquals(baseEntries.size(), 6);
- Assert.assertEquals(v9Entries.size(), 5);
- Assert.assertEquals(v10Entries.size(), 3);
-
- try (JarFile jf = new JarFile(unversioned)) {
- jf.entries().asIterator().forEachRemaining(je -> uvEntries.put(je.getName(), je));
- }
- Assert.assertEquals(uvEntries.size(), 6);
- }
-
- @AfterClass
- public void close() throws IOException {
- Files.delete(unversioned.toPath());
- Files.delete(multirelease.toPath());
- }
-
- @Test
- public void testMultiReleaseJar() throws IOException {
- try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ)) {
- testEnumeration(jf, mrEntries);
- testStream(jf, mrEntries);
- }
-
- try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, JarFile.baseVersion())) {
- testEnumeration(jf, baseEntries);
- testStream(jf, baseEntries);
- }
-
- try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.Version.parse("9"))) {
- testEnumeration(jf, v9Entries);
- testStream(jf, v9Entries);
- }
-
- try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.version())) {
- Map<String,JarEntry> expectedEntries;
- switch (MAJOR_VERSION) {
- case 9:
- expectedEntries = v9Entries;
- break;
- case 10: // won't get here until JDK 10
- expectedEntries = v10Entries;
- break;
- default:
- expectedEntries = baseEntries;
- break;
- }
-
- testEnumeration(jf, expectedEntries);
- testStream(jf, expectedEntries);
- }
- }
-
- @Test
- public void testUnversionedJar() throws IOException {
- try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ)) {
- testEnumeration(jf, uvEntries);
- testStream(jf, uvEntries);
- }
-
- try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, JarFile.baseVersion())) {
- testEnumeration(jf, uvEntries);
- testStream(jf, uvEntries);
- }
-
- try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Runtime.Version.parse("9"))) {
- testEnumeration(jf, uvEntries);
- testStream(jf, uvEntries);
- }
-
- try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Runtime.version())) {
- testEnumeration(jf, uvEntries);
- testStream(jf, uvEntries);
- }
- }
-
- private void testEnumeration(JarFile jf, Map<String,JarEntry> expectedEntries) {
- Map<String, JarEntry> actualEntries = new HashMap<>();
- for (Enumeration<JarEntry> e = jf.entries(); e.hasMoreElements(); ) {
- JarEntry je = e.nextElement();
- actualEntries.put(je.getName(), je);
- }
-
- testEntries(jf, actualEntries, expectedEntries);
- }
-
-
- private void testStream(JarFile jf, Map<String,JarEntry> expectedEntries) {
- Map<String,JarEntry> actualEntries = jf.stream().collect(Collectors.toMap(je -> je.getName(), je -> je));
-
- testEntries(jf, actualEntries, expectedEntries);
- }
-
- private void testEntries(JarFile jf, Map<String,JarEntry> actualEntries, Map<String,JarEntry> expectedEntries) {
- /* For multi-release jar files constructed with a Release object,
- * actualEntries contain versionedEntries that are considered part of the
- * public API. They have a 1-1 correspondence with baseEntries,
- * so entries that are not part of the public API won't be present,
- * i.e. those entries with a name that starts with version/PackagePrivate
- * in this particular jar file (multi-release.jar)
- */
-
- Map<String,JarEntry> entries;
- if (expectedEntries == mrEntries) {
- Assert.assertEquals(actualEntries.size(), mrEntries.size());
- entries = mrEntries;
- } else if (expectedEntries == uvEntries) {
- Assert.assertEquals(actualEntries.size(), uvEntries.size());
- entries = uvEntries;
- } else {
- Assert.assertEquals(actualEntries.size(), baseEntries.size()); // this is correct
- entries = baseEntries;
- }
-
- entries.keySet().forEach(name -> {
- JarEntry ee = expectedEntries.get(name);
- if (ee == null) ee = entries.get(name);
- JarEntry ae = actualEntries.get(name);
- try {
- compare(jf, ae, ee);
- } catch (IOException x) {
- throw new RuntimeException(x);
- }
- });
- }
-
- private void compare(JarFile jf, JarEntry actual, JarEntry expected) throws IOException {
- byte[] abytes;
- byte[] ebytes;
-
- try (InputStream is = jf.getInputStream(actual)) {
- abytes = is.readAllBytes();
- }
-
- try (InputStream is = jf.getInputStream(expected)) {
- ebytes = is.readAllBytes();
- }
-
- Assert.assertEquals(abytes, ebytes);
- }
-}
--- a/jdk/test/java/util/zip/TestLocalTime.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/java/util/zip/TestLocalTime.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8075526 8135108
+ * @bug 8075526 8135108 8155616
* @summary Test timestamp via ZipEntry.get/setTimeLocal()
*/
@@ -39,14 +39,13 @@
public static void main(String[] args) throws Throwable{
try {
LocalDateTime ldt = LocalDateTime.now();
- test(getBytes(ldt), ldt); // now
-
- ldt = ldt.withYear(1968); test(getBytes(ldt), ldt);
- ldt = ldt.withYear(1970); test(getBytes(ldt), ldt);
- ldt = ldt.withYear(1982); test(getBytes(ldt), ldt);
- ldt = ldt.withYear(2037); test(getBytes(ldt), ldt);
- ldt = ldt.withYear(2100); test(getBytes(ldt), ldt);
- ldt = ldt.withYear(2106); test(getBytes(ldt), ldt);
+ test(ldt); // now
+ test(ldt.withYear(1968));
+ test(ldt.withYear(1970));
+ test(ldt.withYear(1982));
+ test(ldt.withYear(2037));
+ test(ldt.withYear(2100));
+ test(ldt.withYear(2106));
TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
// dos time does not support < 1980, have to use
@@ -57,10 +56,14 @@
testWithTZ(tz, ldt.withYear(2106));
// for #8135108
- ldt = LocalDateTime.of(2100, 12, 06, 12, 34, 34, 973);
- test(getBytes(ldt), ldt);
- ldt = LocalDateTime.of(2106, 12, 06, 12, 34, 34, 973);
- test(getBytes(ldt), ldt);
+ test(LocalDateTime.of(2100, 12, 06, 12, 34, 34, 973));
+ test(LocalDateTime.of(2106, 12, 06, 12, 34, 34, 973));
+
+ // for #8155616
+ test(LocalDateTime.of(2016, 03, 13, 2, 50, 00)); // gap
+ test(LocalDateTime.of(2015, 11, 1, 1, 30, 00)); // overlap
+ test(LocalDateTime.of(1968, 04, 28, 2, 51, 25));
+ test(LocalDateTime.of(1970, 04, 26, 2, 31, 52));
} finally {
TimeZone.setDefault(tz0);
@@ -73,7 +76,6 @@
ZipEntry ze = new ZipEntry("TestLocalTime.java");
ze.setTimeLocal(mtime);
check(ze, mtime);
-
zos.putNextEntry(ze);
zos.write(new byte[] { 1, 2, 3, 4});
zos.close();
@@ -87,6 +89,10 @@
test(zbytes, ldt);
}
+ static void test(LocalDateTime ldt) throws Throwable {
+ test(getBytes(ldt), ldt);
+ }
+
static void test(byte[] zbytes, LocalDateTime expected) throws Throwable {
System.out.printf("--------------------%nTesting: [%s]%n", expected);
// ZipInputStream
@@ -113,6 +119,23 @@
LocalDateTime ldt = ze.getTimeLocal();
if (ldt.atOffset(ZoneOffset.UTC).toEpochSecond() >> 1
!= expected.atOffset(ZoneOffset.UTC).toEpochSecond() >> 1) {
+ // if the LDT is out of the range of the standard ms-dos date-time
+ // format ( < 1980 ) AND the date-time is within the daylight saving
+ // time gap (which means the LDT is actually "invalid"), the LDT will
+ // be adjusted accordingly when ZipEntry.setTimeLocal() converts the
+ // date-time via ldt -> zdt -> Instant -> FileTime.
+ // See ZonedDateTime.of(LocalDateTime, ZoneId) for more details.
+ if (ldt.getYear() < 1980 || ldt.getYear() > (1980 + 0x7f)) {
+ System.out.println(" Non-MSDOS ldt : " + ldt);
+ System.out.println(" expected : " + expected);
+ // try to adjust the "expected", assume daylight saving gap
+ expected = ZonedDateTime.of(expected, ZoneId.systemDefault())
+ .toLocalDateTime();
+ if (ldt.atOffset(ZoneOffset.UTC).toEpochSecond() >> 1
+ == expected.atOffset(ZoneOffset.UTC).toEpochSecond() >> 1) {
+ return;
+ }
+ }
throw new RuntimeException("Timestamp: storing mtime failed!");
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/net/ftp/TestFtpClientNameListWithNull.java Thu Jul 21 17:13:23 2016 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016, 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
+ * @bug 8022580
+ * @summary "null" should be treated as "current directory" in nameList()
+ * method of FtpClient
+ * @modules java.base/sun.net.ftp
+ * @run main TestFtpClientNameListWithNull
+*/
+
+
+import sun.net.ftp.FtpClient;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+
+
+public class TestFtpClientNameListWithNull {
+
+ private static volatile boolean commandHasArgs;
+
+ public static void main(String[] args) throws Exception {
+ try (FtpServer server = new FtpServer();
+ FtpClient client = FtpClient.create()) {
+ (new Thread(server)).start();
+ int port = server.getPort();
+ client.connect(new InetSocketAddress("localhost", port));
+ client.nameList(null);
+ } finally {
+ if (commandHasArgs) {
+ throw new RuntimeException("Test failed. NLST shouldn't have " +
+ "args if nameList parameter is null");
+ }
+ }
+ }
+
+ private static class FtpServer implements AutoCloseable, Runnable {
+ private final ServerSocket serverSocket;
+
+ FtpServer() throws IOException {
+ serverSocket = new ServerSocket(0);
+ }
+
+ public void handleClient(Socket client) throws IOException {
+ boolean done = false;
+ String str;
+
+ client.setSoTimeout(2000);
+ BufferedReader in = new BufferedReader(new InputStreamReader(client.
+ getInputStream()));
+ PrintWriter out = new PrintWriter(client.getOutputStream(), true);
+ out.println("220 FTP serverSocket is ready.");
+ while (!done) {
+ try {
+ str = in.readLine();
+ } catch (SocketException e) {
+ done = true;
+ continue;
+ }
+ String cmd = str.substring(0, str.indexOf(" ") > 0 ?
+ str.indexOf(" ") : str.length());
+ String args = (cmd.equals(str)) ?
+ "" : str.substring(str.indexOf(" "));
+ switch (cmd) {
+ case "QUIT":
+ out.println("221 Goodbye.");
+ out.flush();
+ done = true;
+ break;
+ case "EPSV":
+ if ("all".equalsIgnoreCase(args)) {
+ out.println("200 EPSV ALL command successful.");
+ continue;
+ }
+ out.println("229 Entering Extended Passive Mode " +
+ "(|||" + getPort() + "|)");
+ break;
+ case "NLST":
+ if (args.trim().length() != 0) {
+ commandHasArgs = true;
+ }
+ out.println("200 Command okay.");
+ break;
+ default:
+ out.println("500 unsupported command: " + str);
+ }
+ }
+ }
+
+ public int getPort() {
+ if (serverSocket != null) {
+ return serverSocket.getLocalPort();
+ }
+ return 0;
+ }
+
+ public void close() throws IOException {
+ if (serverSocket != null && !serverSocket.isClosed()) {
+ serverSocket.close();
+ }
+ }
+
+ @Override
+ public void run() {
+ try {
+ try (Socket client = serverSocket.accept()) {
+ handleClient(client);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Problem in test execution", e);
+ }
+ }
+ }
+}
--- a/jdk/test/sun/tools/jps/JpsBase.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/sun/tools/jps/JpsBase.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -59,7 +59,17 @@
return JpsBase.class.getName();
}
+ private static boolean userDirSanityCheck(String fullProcessName) {
+ String userDir = System.getProperty("user.dir");
+ if (!fullProcessName.startsWith(userDir)) {
+ System.err.printf("Test skipped. user.dir '%s' is not a prefix of '%s'\n", userDir, fullProcessName);
+ return false;
+ }
+ return true;
+ }
+
public static void main(String[] args) throws Exception {
+ System.out.printf("INFO: user.dir: '%s''\n", System.getProperty("user.dir"));
long pid = ProcessTools.getProcessId();
List<List<JpsHelper.JpsArg>> combinations = JpsHelper.JpsArg.generateCombinations();
@@ -85,8 +95,12 @@
// 30673 /tmp/jtreg/jtreg-workdir/scratch/JpsBase.jar ...
isFull = true;
String fullProcessName = getFullProcessName();
- pattern = "^" + pid + "\\s+" + replaceSpecialChars(fullProcessName) + ".*";
- output.shouldMatch(pattern);
+ // Skip the test if user.dir is not a prefix of the current path
+ // It's possible if the test is run from symlinked dir or windows alias drive
+ if (userDirSanityCheck(fullProcessName)) {
+ pattern = "^" + pid + "\\s+" + replaceSpecialChars(fullProcessName) + ".*";
+ output.shouldMatch(pattern);
+ }
break;
case m:
// If '-m' is specified output should contain the arguments passed to the main method:
--- a/jdk/test/sun/tools/jps/TestJpsJar.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/sun/tools/jps/TestJpsJar.java Thu Jul 21 17:13:23 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -52,6 +52,7 @@
cmd.addAll(JpsHelper.getVmArgs());
cmd.add("-Dtest.jdk=" + testJdk);
cmd.add("-Dtest.src=" + testSrc);
+ cmd.add("-Duser.dir=" + System.getProperty("user.dir"));
cmd.add("-jar");
cmd.add(jar.getAbsolutePath());
cmd.add("monkey");
--- a/jdk/test/tools/jimage/JImageToolTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/tools/jimage/JImageToolTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -63,6 +63,8 @@
String jimage = jimagePath.toAbsolutePath().toString();
String bootimage = modulesimagePath.toAbsolutePath().toString();
String extractDir = Paths.get(".", "extract").toAbsolutePath().toString();
+ jimage("list", bootimage);
+ jimage("verify", bootimage);
jimage("extract", "--dir", extractDir, bootimage);
System.out.println("Test successful");
} else {
--- a/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java Thu Jul 21 16:42:58 2016 +0000
+++ b/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java Thu Jul 21 17:13:23 2016 +0000
@@ -90,6 +90,71 @@
"",
},
+ // Asterisk works exactly the same as above
+ {
+ "*",
+ "jdk.localedata",
+ List.of(
+ "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
+ List.of(),
+ Arrays.stream(Locale.getAvailableLocales())
+ // "(root)" for Locale.ROOT rather than ""
+ .map(loc -> loc.equals(Locale.ROOT) ? "(root)" : loc.toString())
+ .collect(Collectors.toList()),
+ "",
+ },
+
+ // World English/Spanish in Latin America
+ {
+ "--include-locales=en-001,es-419",
+ "jdk.localedata",
+ List.of(
+ "/jdk.localedata/sun/text/resources/ext/FormatData_en_AU.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_es.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_es_AR.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_150.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_AT.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es_419.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es_AR.class"),
+ List.of(
+ "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/thai_dict",
+ "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
+ "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
+ List.of(
+ "(root)", "en", "en_US", "en_US_POSIX", "en_001", "en_150", "en_AG", "en_AI",
+ "en_AT", "en_AU", "en_BB", "en_BE", "en_BM", "en_BS", "en_BW", "en_BZ",
+ "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_DE",
+ "en_DG", "en_DK", "en_DM", "en_ER", "en_FI", "en_FJ", "en_FK", "en_FM",
+ "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GY", "en_HK",
+ "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_JE", "en_JM", "en_KE",
+ "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG", "en_MO",
+ "en_MS", "en_MT", "en_MU", "en_MW", "en_MY", "en_NA", "en_NF", "en_NG",
+ "en_NL", "en_NR", "en_NU", "en_NZ", "en_PG", "en_PH", "en_PK", "en_PN",
+ "en_PW", "en_RW", "en_SB", "en_SC", "en_SD", "en_SE", "en_SG", "en_SH",
+ "en_SI", "en_SL", "en_SS", "en_SX", "en_SZ", "en_TC", "en_TK", "en_TO",
+ "en_TT", "en_TV", "en_TZ", "en_UG", "en_VC", "en_VG", "en_VU", "en_WS",
+ "en_ZA", "en_ZM", "en_ZW", "es", "es_419", "es_AR", "es_BO", "es_BR",
+ "es_CL", "es_CO", "es_CR", "es_CU", "es_DO", "es_EC", "es_GT", "es_HN",
+ "es_MX", "es_NI", "es_PA", "es_PE", "es_PR", "es_PY", "es_SV", "es_US",
+ "es_UY", "es_VE"),
+ "",
+ },
+
// All English and Japanese locales
{
"--include-locales=en,ja",
@@ -128,6 +193,35 @@
"",
},
+ // All locales in Austria
+ {
+ "--include-locales=*-AT",
+ "jdk.localedata",
+ List.of(
+ "/jdk.localedata/sun/text/resources/ext/FormatData_de.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_de_AT.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_de.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_de_AT.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_150.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_AT.class"),
+ List.of(
+ "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/thai_dict",
+ "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
+ "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
+ List.of(
+ "(root)", "en", "en_US", "en_US_POSIX", "en_001", "en_150", "en_AT",
+ "de", "de_AT"),
+ "",
+ },
+
// All locales in India
{
"--include-locales=*-IN",
@@ -154,10 +248,11 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
List.of(
- "(root)", "as_IN", "bn_IN", "bo_IN", "brx_IN", "en", /* "en_001", */
- "en_IN", "en_US", "en_US_POSIX", "gu_IN", "hi_IN", "kn_IN", "kok_IN",
- "ks_IN", "ml_IN", "mr_IN", "ne_IN", "or_IN", "pa_IN", "pa_IN_#Guru",
- "ta_IN", "te_IN", "ur_IN"),
+ "(root)", "as_IN", "as", "bn_IN", "bn", "bo_IN", "bo", "brx_IN", "brx",
+ "en", "en_001", "en_IN", "en_US", "en_US_POSIX", "gu_IN", "gu", "hi_IN",
+ "hi", "kn_IN", "kn", "kok_IN", "kok", "ks_IN", "ks", "ml_IN", "ml",
+ "mr_IN", "mr", "ne_IN", "ne", "or_IN", "or", "pa_IN", "pa", "pa_IN_#Guru",
+ "pa__#Guru", "ta_IN", "ta", "te_IN", "te", "ur_IN", "ur"),
"",
},
@@ -203,12 +298,40 @@
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_zh_CN.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
List.of(
- "(root)", "en", "en_US", "en_US_POSIX", "zh_HK", "zh_HK_#Hans",
- "zh_HK_#Hant"),
+ "(root)", "en", "en_US", "en_US_POSIX", "zh", "zh__#Hans", "zh__#Hant",
+ "zh_HK", "zh_HK_#Hans", "zh_HK_#Hant"),
+ "",
+ },
+
+ // Simplified Chinese
+ {
+ "--include-locales=zh-Hans",
+ "jdk.localedata",
+ List.of(
+ "/jdk.localedata/sun/text/resources/ext/FormatData_zh.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_zh_CN.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_zh_SG.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
+ List.of(
+ "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/thai_dict",
+ "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
+ "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
+ "/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
+ List.of(
+ "(root)", "en", "en_US", "en_US_POSIX", "zh", "zh__#Hans", "zh_CN",
+ "zh_CN_#Hans", "zh_HK_#Hans", "zh_MO_#Hans", "zh_SG", "zh_SG_#Hans"),
"",
},
@@ -290,7 +413,7 @@
null,
null,
new PluginException(String.format(
- PluginsResourceBundle.getMessage("include-locales.invalidtag"), "zh_HK"))
+ PluginsResourceBundle.getMessage("include-locales.invalidtag"), "zh_hk"))
.getMessage(),
},