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

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-09-29 17:24:21 +00:00
commit 364f679451
42 changed files with 3302 additions and 1216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/make/lib/NioLibraries.gmk
View File

@ -53,12 +53,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
endif
ifeq ($(OPENJDK_TARGET_OS), aix)
BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
BUILD_LIBNIO_EXFILES += \
/NativeThread.c
# Notice: we really need the leading slash here because otherwise every
# FILE_NAME in EXCLUDE_FILES will actually match any file ending in FILE_NAME
# (e.g. 'NativeThread.c' will also exclude 'AixNativeThread.c').
BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
endif
$(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \

76
jdk/src/java.base/aix/native/libnio/ch/AixNativeThread.c
View File

@ -1,76 +0,0 @@
/*
* Copyright (c) 2002, 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
* 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.
*/
#include <sys/types.h>
#include <string.h>
#include "jni.h"
#include "jni_util.h"
#include "jvm.h"
#include "jlong.h"
#include "sun_nio_ch_NativeThread.h"
#include <pthread.h>
#include <sys/signal.h>
/* Also defined in src/aix/native/java/net/aix_close.c */
#define INTERRUPT_SIGNAL (SIGRTMAX - 1)
static void
nullHandler(int sig)
{
}
JNIEXPORT void JNICALL
Java_sun_nio_ch_NativeThread_init(JNIEnv *env, jclass cl)
{
/* Install the null handler for INTERRUPT_SIGNAL. This might overwrite the
* handler previously installed by java/net/aix_close.c, but that's okay
* since neither handler actually does anything. We install our own
* handler here simply out of paranoia; ultimately the two mechanisms
* should somehow be unified, perhaps within the VM.
*/
sigset_t ss;
struct sigaction sa, osa;
sa.sa_handler = nullHandler;
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);
if (sigaction(INTERRUPT_SIGNAL, &sa, &osa) < 0)
JNU_ThrowIOExceptionWithLastError(env, "sigaction");
}
JNIEXPORT jlong JNICALL
Java_sun_nio_ch_NativeThread_current(JNIEnv *env, jclass cl)
{
return (long)pthread_self();
}
JNIEXPORT void JNICALL
Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
{
if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
}

37
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
View File

@ -1962,12 +1962,12 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
* This method is bound as the predicate in {@linkplain MethodHandles#countedLoop(MethodHandle, MethodHandle,
* MethodHandle) counting loops}.
*
* @param counter the counter parameter, passed in during loop execution.
* @param limit the upper bound of the parameter, statically bound at loop creation time.
* @param counter the counter parameter, passed in during loop execution.
*
* @return whether the counter has reached the limit.
*/
static boolean countedLoopPredicate(int counter, int limit) {
static boolean countedLoopPredicate(int limit, int counter) {
return counter < limit;
}
@ -1975,26 +1975,15 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
* This method is bound as the step function in {@linkplain MethodHandles#countedLoop(MethodHandle, MethodHandle,
* MethodHandle) counting loops} to increment the counter.
*
* @param limit the upper bound of the loop counter (ignored).
* @param counter the loop counter.
*
* @return the loop counter incremented by 1.
*/
static int countedLoopStep(int counter, int limit) {
static int countedLoopStep(int limit, int counter) {
return counter + 1;
}
/**
* This method is bound as a filter in {@linkplain MethodHandles#countedLoop(MethodHandle, MethodHandle, MethodHandle,
* MethodHandle) counting loops} to pass the correct counter value to the body.
*
* @param counter the loop counter.
*
* @return the loop counter decremented by 1.
*/
static int decrementCounter(int counter) {
return counter - 1;
}
/**
* This is bound to initialize the loop-local iterator in {@linkplain MethodHandles#iteratedLoop iterating loops}.
*
@ -2164,12 +2153,11 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
MH_arrayIdentity = 5,
MH_countedLoopPred = 6,
MH_countedLoopStep = 7,
MH_iteratePred = 8,
MH_initIterator = 9,
MH_initIterator = 8,
MH_iteratePred = 9,
MH_iterateNext = 10,
MH_decrementCounter = 11,
MH_Array_newInstance = 12,
MH_LIMIT = 13;
MH_Array_newInstance = 11,
MH_LIMIT = 12;
static MethodHandle getConstantHandle(int idx) {
MethodHandle handle = HANDLES[idx];
@ -2220,18 +2208,15 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
case MH_countedLoopStep:
return IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "countedLoopStep",
MethodType.methodType(int.class, int.class, int.class));
case MH_iteratePred:
return IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "iteratePredicate",
MethodType.methodType(boolean.class, Iterator.class));
case MH_initIterator:
return IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "initIterator",
MethodType.methodType(Iterator.class, Iterable.class));
case MH_iteratePred:
return IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "iteratePredicate",
MethodType.methodType(boolean.class, Iterator.class));
case MH_iterateNext:
return IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "iterateNext",
MethodType.methodType(Object.class, Iterator.class));
case MH_decrementCounter:
return IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "decrementCounter",
MethodType.methodType(int.class, int.class));
case MH_Array_newInstance:
return IMPL_LOOKUP.findStatic(Array.class, "newInstance",
MethodType.methodType(Object.class, Class.class, int.class));

1581
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
View File

File diff suppressed because it is too large Load Diff

22
jdk/src/java.base/share/classes/java/lang/invoke/MethodType.java
View File

@ -809,6 +809,28 @@ class MethodType implements java.io.Serializable {
return sj.toString();
}
/** True if my parameter list is effectively identical to the given full list,
* after skipping the given number of my own initial parameters.
* In other words, after disregarding {@code skipPos} parameters,
* my remaining parameter list is no longer than the {@code fullList}, and
* is equal to the same-length initial sublist of {@code fullList}.
*/
/*non-public*/
boolean effectivelyIdenticalParameters(int skipPos, List<Class<?>> fullList) {
int myLen = ptypes.length, fullLen = fullList.size();
if (skipPos > myLen || myLen - skipPos > fullLen)
return false;
List<Class<?>> myList = Arrays.asList(ptypes);
if (skipPos != 0) {
myList = myList.subList(skipPos, myLen);
myLen -= skipPos;
}
if (fullLen == myLen)
return myList.equals(fullList);
else
return myList.equals(fullList.subList(0, myLen));
}
/** True if the old return type can always be viewed (w/o casting) under new return type,
* and the new parameters can be viewed (w/o casting) under the old parameter types.
*/

2
jdk/src/java.base/share/classes/java/util/ArrayList.java
View File

@ -876,6 +876,8 @@ public class ArrayList<E> extends AbstractList<E>
int lastRet = -1; // index of last element returned; -1 if no such
int expectedModCount = modCount;
Itr() {}
public boolean hasNext() {
return cursor != size;
}

15
jdk/src/java.base/share/classes/sun/security/rsa/RSASignature.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, 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
@ -182,14 +182,15 @@ public abstract class RSASignature extends SignatureSpi {
}
// verify the data and return the result. See JCA doc
// should be reset to the state after engineInitVerify call.
protected boolean engineVerify(byte[] sigBytes) throws SignatureException {
if (sigBytes.length != RSACore.getByteLength(publicKey)) {
throw new SignatureException("Signature length not correct: got " +
try {
if (sigBytes.length != RSACore.getByteLength(publicKey)) {
throw new SignatureException("Signature length not correct: got " +
sigBytes.length + " but was expecting " +
RSACore.getByteLength(publicKey));
}
byte[] digest = getDigestValue();
try {
}
byte[] digest = getDigestValue();
byte[] decrypted = RSACore.rsa(sigBytes, publicKey);
byte[] unpadded = padding.unpad(decrypted);
byte[] decodedDigest = decodeSignature(digestOID, unpadded);
@ -202,6 +203,8 @@ public abstract class RSASignature extends SignatureSpi {
return false;
} catch (IOException e) {
throw new SignatureException("Signature encoding error", e);
} finally {
resetDigest();
}
}

18
jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c
View File

@ -1302,7 +1302,7 @@ static void mcast_set_loop_v6(JNIEnv *env, jobject this, int fd, jobject value)
* Sets the multicast loopback mode.
*/
static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
jint opt, jobject value) {
jint opt, jobject value) {
#ifdef AF_INET6
#ifdef __linux__
mcast_set_loop_v4(env, this, fd, value);
@ -1330,10 +1330,9 @@ static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
* Signature: (ILjava/lang/Object;)V
*/
JNIEXPORT void JNICALL
Java_java_net_PlainDatagramSocketImpl_socketSetOption0(JNIEnv *env,
jobject this,
jint opt,
jobject value) {
Java_java_net_PlainDatagramSocketImpl_socketSetOption0
(JNIEnv *env, jobject this, jint opt, jobject value)
{
int fd;
int level, optname, optlen;
int optval;
@ -1380,7 +1379,7 @@ Java_java_net_PlainDatagramSocketImpl_socketSetOption0(JNIEnv *env,
* level and option name.
*/
if (NET_MapSocketOption(opt, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
@ -1699,8 +1698,9 @@ jobject getMulticastInterface(JNIEnv *env, jobject this, int fd, jint opt) {
* Signature: (I)Ljava/lang/Object;
*/
JNIEXPORT jobject JNICALL
Java_java_net_PlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobject this,
jint opt) {
Java_java_net_PlainDatagramSocketImpl_socketGetOption
(JNIEnv *env, jobject this, jint opt)
{
int fd;
int level, optname, optlen;
union {
@ -1751,7 +1751,7 @@ Java_java_net_PlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobject this,
* level and option name.
*/
if (NET_MapSocketOption(opt, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return NULL;
}

16
jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c
View File

@ -855,9 +855,9 @@ Java_java_net_PlainSocketImpl_socketShutdown(JNIEnv *env, jobject this,
* Signature: (IZLjava/lang/Object;)V
*/
JNIEXPORT void JNICALL
Java_java_net_PlainSocketImpl_socketSetOption0(JNIEnv *env, jobject this,
jint cmd, jboolean on,
jobject value) {
Java_java_net_PlainSocketImpl_socketSetOption0
(JNIEnv *env, jobject this, jint cmd, jboolean on, jobject value)
{
int fd;
int level, optname, optlen;
union {
@ -887,7 +887,7 @@ Java_java_net_PlainSocketImpl_socketSetOption0(JNIEnv *env, jobject this,
* level and option name.
*/
if (NET_MapSocketOption(cmd, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
@ -951,9 +951,9 @@ Java_java_net_PlainSocketImpl_socketSetOption0(JNIEnv *env, jobject this,
* Signature: (I)I
*/
JNIEXPORT jint JNICALL
Java_java_net_PlainSocketImpl_socketGetOption(JNIEnv *env, jobject this,
jint cmd, jobject iaContainerObj) {
Java_java_net_PlainSocketImpl_socketGetOption
(JNIEnv *env, jobject this, jint cmd, jobject iaContainerObj)
{
int fd;
int level, optname, optlen;
union {
@ -1004,7 +1004,7 @@ Java_java_net_PlainSocketImpl_socketGetOption(JNIEnv *env, jobject this,
* level and option name.
*/
if (NET_MapSocketOption(cmd, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return -1;
}

29
jdk/src/java.base/unix/native/libnet/SocketInputStream.c
View File

@ -58,15 +58,15 @@ static int NET_ReadWithTimeout(JNIEnv *env, int fd, char *bufP, int len, long ti
result = NET_TimeoutWithCurrentTime(fd, timeout, prevtime);
if (result <= 0) {
if (result == 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException", "Read timed out");
JNU_ThrowByName(env, "java/net/SocketTimeoutException", "Read timed out");
} else if (result == -1) {
if (errno == EBADF) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
} else if (errno == ENOMEM) {
JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
} else {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "select/poll failed");
(env, "java/net/SocketException", "select/poll failed");
}
}
return -1;
@ -100,19 +100,14 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
jint fd, nread;
if (IS_NULL(fdObj)) {
/* shouldn't this be a NullPointerException? -br */
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
JNU_ThrowByName(env, "java/net/SocketException",
"Socket closed");
return -1;
} else {
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
/* Bug 4086704 - If the Socket associated with this file descriptor
* was closed (sysCloseFD), then the file descriptor is set to -1.
*/
if (fd == -1) {
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
return -1;
}
}
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
if (fd == -1) {
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
return -1;
}
/*
@ -154,17 +149,17 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
break;
case EBADF:
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
JNU_ThrowByName(env, "java/net/SocketException",
"Socket closed");
break;
case EINTR:
JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
JNU_ThrowByName(env, "java/io/InterruptedIOException",
"Operation interrupted");
break;
default:
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Read failed");
(env, "java/net/SocketException", "Read failed");
}
}
} else {

7
jdk/src/java.base/unix/native/libnio/ch/NativeThread.c
View File

@ -37,6 +37,11 @@
#include <sys/signal.h>
/* Also defined in net/linux_close.c */
#define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
#elif _AIX
#include <pthread.h>
#include <sys/signal.h>
/* Also defined in net/aix_close.c */
#define INTERRUPT_SIGNAL (SIGRTMAX - 1)
#elif __solaris__
#include <thread.h>
#include <signal.h>
@ -59,7 +64,7 @@ JNIEXPORT void JNICALL
Java_sun_nio_ch_NativeThread_init(JNIEnv *env, jclass cl)
{
/* Install the null handler for INTERRUPT_SIGNAL. This might overwrite the
* handler previously installed by java/net/linux_close.c, but that's okay
* handler previously installed by <platform>_close.c, but that's okay
* since neither handler actually does anything. We install our own
* handler here simply out of paranoia; ultimately the two mechanisms
* should somehow be unified, perhaps within the VM.

28
jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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
@ -475,13 +475,14 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketSend
* Method: socketSetIntOption
* Signature: (III)V
*/
JNIEXPORT void JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketSetIntOption
(JNIEnv *env, jclass clazz, jint fd , jint cmd, jint value) {
JNIEXPORT void JNICALL
Java_java_net_DualStackPlainDatagramSocketImpl_socketSetIntOption
(JNIEnv *env, jclass clazz, jint fd, jint cmd, jint value)
{
int level = 0, opt = 0;
if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
@ -495,14 +496,15 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketSetI
* Method: socketGetIntOption
* Signature: (II)I
*/
JNIEXPORT jint JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketGetIntOption
(JNIEnv *env, jclass clazz, jint fd, jint cmd) {
int level = 0, opt = 0, result=0;
JNIEXPORT jint JNICALL
Java_java_net_DualStackPlainDatagramSocketImpl_socketGetIntOption
(JNIEnv *env, jclass clazz, jint fd, jint cmd)
{
int level = 0, opt = 0, result = 0;
int result_len = sizeof(result);
if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return -1;
}
@ -519,8 +521,10 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketGetI
* Method: dataAvailable
* Signature: ()I
*/
JNIEXPORT jint JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_dataAvailable
(JNIEnv *env, jobject this) {
JNIEXPORT jint JNICALL
Java_java_net_DualStackPlainDatagramSocketImpl_dataAvailable
(JNIEnv *env, jobject this)
{
SOCKET fd;
int rv = -1;
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);

21
jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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
@ -369,18 +369,17 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_shutdown0
* Method: setIntOption
* Signature: (III)V
*/
JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_setIntOption
(JNIEnv *env, jclass clazz, jint fd, jint cmd, jint value) {
JNIEXPORT void JNICALL
Java_java_net_DualStackPlainSocketImpl_setIntOption
(JNIEnv *env, jclass clazz, jint fd, jint cmd, jint value)
{
int level = 0, opt = 0;
struct linger linger = {0, 0};
char *parg;
int arglen;
if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
JNU_ThrowByNameWithLastError(env,
JNU_JAVANETPKG "SocketException",
"Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
@ -410,8 +409,8 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_setIntOption
* Signature: (II)I
*/
JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_getIntOption
(JNIEnv *env, jclass clazz, jint fd, jint cmd) {
(JNIEnv *env, jclass clazz, jint fd, jint cmd)
{
int level = 0, opt = 0;
int result=0;
struct linger linger = {0, 0};
@ -419,9 +418,7 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_getIntOption
int arglen;
if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
JNU_ThrowByNameWithLastError(env,
JNU_JAVANETPKG "SocketException",
"Unsupported socket option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return -1;
}

24
jdk/src/java.base/windows/native/libnet/SocketInputStream.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -62,18 +62,18 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
jobject fdObj, jbyteArray data,
jint off, jint len, jint timeout)
{
char *bufP;
char BUF[MAX_BUFFER_LEN];
jint fd, newfd;
jint nread;
char *bufP;
jint fd, newfd, nread;
if (IS_NULL(fdObj)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "socket closed");
JNU_ThrowByName(env, "java/net/SocketException",
"Socket closed");
return -1;
}
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
if (fd == -1) {
NET_ThrowSocketException(env, "Socket closed");
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
return -1;
}
@ -103,10 +103,10 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
if (ret <= 0) {
if (ret == 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
JNU_ThrowByName(env, "java/net/SocketTimeoutException",
"Read timed out");
} else if (ret == -1) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "socket closed");
JNU_ThrowByName(env, "java/net/SocketException", "socket closed");
}
if (bufP != BUF) {
free(bufP);
@ -117,7 +117,7 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
/*check if the socket has been closed while we were in timeout*/
newfd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
if (newfd == -1) {
NET_ThrowSocketException(env, "Socket Closed");
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
if (bufP != BUF) {
free(bufP);
}
@ -134,11 +134,11 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
// Check if the socket has been closed since we last checked.
// This could be a reason for recv failing.
if ((*env)->GetIntField(env, fdObj, IO_fd_fdID) == -1) {
NET_ThrowSocketException(env, "Socket closed");
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
} else {
switch (WSAGetLastError()) {
case WSAEINTR:
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
JNU_ThrowByName(env, "java/net/SocketException",
"socket closed");
break;
@ -153,7 +153,7 @@ Java_java_net_SocketInputStream_socketRead0(JNIEnv *env, jobject this,
break;
case WSAETIMEDOUT :
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
JNU_ThrowByName(env, "java/net/SocketTimeoutException",
"Read timed out");
break;

20
jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c
View File

@ -1795,9 +1795,9 @@ static void setMulticastInterface(JNIEnv *env, jobject this, int fd, int fd1,
* Signature: (ILjava/lang/Object;)V
*/
JNIEXPORT void JNICALL
Java_java_net_TwoStacksPlainDatagramSocketImpl_socketNativeSetOption(JNIEnv *env,jobject this,
jint opt,jobject value) {
Java_java_net_TwoStacksPlainDatagramSocketImpl_socketNativeSetOption
(JNIEnv *env,jobject this, jint opt,jobject value)
{
int fd=-1, fd1=-1;
int levelv4 = 0, levelv6 = 0, optnamev4 = 0, optnamev6 = 0, optlen = 0;
union {
@ -1828,13 +1828,13 @@ Java_java_net_TwoStacksPlainDatagramSocketImpl_socketNativeSetOption(JNIEnv *env
*/
if (fd1 != -1) {
if (NET_MapSocketOptionV6(opt, &levelv6, &optnamev6)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
}
if (fd != -1) {
if (NET_MapSocketOption(opt, &levelv4, &optnamev4)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
}
@ -2163,9 +2163,9 @@ jobject getMulticastInterface(JNIEnv *env, jobject this, int fd, int fd1, jint o
* Signature: (I)Ljava/lang/Object;
*/
JNIEXPORT jobject JNICALL
Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobject this,
jint opt) {
Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption
(JNIEnv *env, jobject this, jint opt)
{
int fd=-1, fd1=-1;
int level, optname, optlen;
union {
@ -2197,13 +2197,13 @@ Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobj
* level and option name.
*/
if (NET_MapSocketOption(opt, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return NULL;
}
if (fd == -1) {
if (NET_MapSocketOptionV6(opt, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return NULL;
}
fd = fd1; /* must be IPv6 only */

21
jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
View File

@ -838,10 +838,9 @@ Java_java_net_TwoStacksPlainSocketImpl_socketClose0(JNIEnv *env, jobject this,
* Signature: (IZLjava/lang/Object;)V
*/
JNIEXPORT void JNICALL
Java_java_net_TwoStacksPlainSocketImpl_socketNativeSetOption(JNIEnv *env,
jobject this,
jint cmd, jboolean on,
jobject value) {
Java_java_net_TwoStacksPlainSocketImpl_socketNativeSetOption
(JNIEnv *env, jobject this, jint cmd, jboolean on, jobject value)
{
int fd, fd1;
int level = 0, optname = 0, optlen = 0;
union {
@ -923,11 +922,10 @@ Java_java_net_TwoStacksPlainSocketImpl_socketNativeSetOption(JNIEnv *env,
/*
* Map the Java level socket option to the platform specific
* level
* level and option name.
*/
if (NET_MapSocketOption(cmd, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return;
}
@ -1006,15 +1004,16 @@ Java_java_net_TwoStacksPlainSocketImpl_socketNativeSetOption(JNIEnv *env,
* Signature: (I)I
*/
JNIEXPORT jint JNICALL
Java_java_net_TwoStacksPlainSocketImpl_socketGetOption(JNIEnv *env, jobject this,
jint opt, jobject iaContainerObj) {
Java_java_net_TwoStacksPlainSocketImpl_socketGetOption
(JNIEnv *env, jobject this, jint opt, jobject iaContainerObj)
{
int fd, fd1;
int level = 0, optname = 0, optlen = 0;
union {
int i;
struct linger ling;
} optval;
/*
* Get SOCKET and check it hasn't been closed
*/
@ -1073,7 +1072,7 @@ Java_java_net_TwoStacksPlainSocketImpl_socketGetOption(JNIEnv *env, jobject this
* level and option name.
*/
if (NET_MapSocketOption(opt, &level, &optname)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Invalid option");
JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
return -1;
}

13
jdk/src/java.base/windows/native/libnet/net_util_md.c
View File

@ -202,19 +202,6 @@ NET_ThrowCurrent(JNIEnv *env, char *msg)
NET_ThrowNew(env, WSAGetLastError(), msg);
}
void
NET_ThrowSocketException(JNIEnv *env, char* msg)
{
static jclass cls = NULL;
if (cls == NULL) {
cls = (*env)->FindClass(env, "java/net/SocketException");
CHECK_NULL(cls);
cls = (*env)->NewGlobalRef(env, cls);
CHECK_NULL(cls);
}
(*env)->ThrowNew(env, cls, msg);
}
void
NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
const char *defaultDetail) {

4
jdk/src/java.base/windows/native/libnet/net_util_md.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
@ -299,8 +299,6 @@ int NET_Socket(int domain, int type, int protocol);
void NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
const char *defaultDetail);
void NET_ThrowSocketException(JNIEnv *env, char* msg);
/*
* differs from NET_Timeout() as follows:
*

58
jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Cipher.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, 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
@ -344,7 +344,7 @@ final class P11Cipher extends CipherSpi {
private void implInit(int opmode, Key key, byte[] iv,
SecureRandom random)
throws InvalidKeyException, InvalidAlgorithmParameterException {
cancelOperation();
reset(true);
if (fixedKeySize != -1 && key.getEncoded().length != fixedKeySize) {
throw new InvalidKeyException("Key size is invalid");
}
@ -404,23 +404,26 @@ final class P11Cipher extends CipherSpi {
if (initialized == false) {
return;
}
initialized = false;
if ((session == null) || (token.explicitCancel == false)) {
return;
}
// cancel operation by finishing it
int bufLen = doFinalLength(0);
byte[] buffer = new byte[bufLen];
try {
if (encrypt) {
token.p11.C_EncryptFinal(session.id(), 0, buffer, 0, bufLen);
if (session.hasObjects() == false) {
session = token.killSession(session);
return;
} else {
token.p11.C_DecryptFinal(session.id(), 0, buffer, 0, bufLen);
// cancel operation by finishing it
int bufLen = doFinalLength(0);
byte[] buffer = new byte[bufLen];
if (encrypt) {
token.p11.C_EncryptFinal(session.id(), 0, buffer, 0, bufLen);
} else {
token.p11.C_DecryptFinal(session.id(), 0, buffer, 0, bufLen);
}
}
} catch (PKCS11Exception e) {
throw new ProviderException("Cancel failed", e);
} finally {
reset();
}
}
@ -483,7 +486,9 @@ final class P11Cipher extends CipherSpi {
}
// reset the states to the pre-initialized values
private void reset() {
private void reset(boolean doCancel) {
if (doCancel) cancelOperation();
initialized = false;
bytesBuffered = 0;
padBufferLen = 0;
@ -610,7 +615,7 @@ final class P11Cipher extends CipherSpi {
throw (ShortBufferException)
(new ShortBufferException().initCause(e));
}
reset();
reset(false);
throw new ProviderException("update() failed", e);
}
}
@ -728,7 +733,7 @@ final class P11Cipher extends CipherSpi {
throw (ShortBufferException)
(new ShortBufferException().initCause(e));
}
reset();
reset(false);
throw new ProviderException("update() failed", e);
}
}
@ -740,6 +745,7 @@ final class P11Cipher extends CipherSpi {
if (outLen < requiredOutLen) {
throw new ShortBufferException();
}
boolean doCancel = true;
try {
ensureInitialized();
int k = 0;
@ -753,7 +759,12 @@ final class P11Cipher extends CipherSpi {
}
k += token.p11.C_EncryptFinal(session.id(),
0, out, (outOfs + k), (outLen - k));
doCancel = false;
} else {
// Special handling to match SunJCE provider behavior
if (bytesBuffered == 0 && padBufferLen == 0) {
return 0;
}
if (paddingObj != null) {
if (padBufferLen != 0) {
k = token.p11.C_DecryptUpdate(session.id(), 0,
@ -762,20 +773,24 @@ final class P11Cipher extends CipherSpi {
}
k += token.p11.C_DecryptFinal(session.id(), 0, padBuffer, k,
padBuffer.length - k);
doCancel = false;
int actualPadLen = paddingObj.unpad(padBuffer, k);
k -= actualPadLen;
System.arraycopy(padBuffer, 0, out, outOfs, k);
} else {
k = token.p11.C_DecryptFinal(session.id(), 0, out, outOfs,
outLen);
doCancel = false;
}
}
return k;
} catch (PKCS11Exception e) {
doCancel = false;
handleException(e);
throw new ProviderException("doFinal() failed", e);
} finally {
reset();
reset(doCancel);
}
}
@ -788,6 +803,7 @@ final class P11Cipher extends CipherSpi {
throw new ShortBufferException();
}
boolean doCancel = true;
try {
ensureInitialized();
@ -818,7 +834,13 @@ final class P11Cipher extends CipherSpi {
}
k += token.p11.C_EncryptFinal(session.id(),
outAddr, outArray, (outOfs + k), (outLen - k));
doCancel = false;
} else {
// Special handling to match SunJCE provider behavior
if (bytesBuffered == 0 && padBufferLen == 0) {
return 0;
}
if (paddingObj != null) {
if (padBufferLen != 0) {
k = token.p11.C_DecryptUpdate(session.id(),
@ -828,6 +850,8 @@ final class P11Cipher extends CipherSpi {
}
k += token.p11.C_DecryptFinal(session.id(),
0, padBuffer, k, padBuffer.length - k);
doCancel = false;
int actualPadLen = paddingObj.unpad(padBuffer, k);
k -= actualPadLen;
outArray = padBuffer;
@ -835,6 +859,7 @@ final class P11Cipher extends CipherSpi {
} else {
k = token.p11.C_DecryptFinal(session.id(),
outAddr, outArray, outOfs, outLen);
doCancel = false;
}
}
if ((!encrypt && paddingObj != null) ||
@ -846,10 +871,11 @@ final class P11Cipher extends CipherSpi {
}
return k;
} catch (PKCS11Exception e) {
doCancel = false;
handleException(e);
throw new ProviderException("doFinal() failed", e);
} finally {
reset();
reset(doCancel);
}
}

18
jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java
View File

@ -616,8 +616,11 @@ final class P11Signature extends SignatureSpi {
return dsaToASN1(signature);
}
}
} catch (PKCS11Exception e) {
throw new ProviderException(e);
} catch (PKCS11Exception pe) {
throw new ProviderException(pe);
} catch (SignatureException | ProviderException e) {
cancelOperation();
throw e;
} finally {
initialized = false;
session = token.releaseSession(session);
@ -669,8 +672,8 @@ final class P11Signature extends SignatureSpi {
}
}
return true;
} catch (PKCS11Exception e) {
long errorCode = e.getErrorCode();
} catch (PKCS11Exception pe) {
long errorCode = pe.getErrorCode();
if (errorCode == CKR_SIGNATURE_INVALID) {
return false;
}
@ -682,10 +685,11 @@ final class P11Signature extends SignatureSpi {
if (errorCode == CKR_DATA_LEN_RANGE) {
return false;
}
throw new ProviderException(e);
throw new ProviderException(pe);
} catch (SignatureException | ProviderException e) {
cancelOperation();
throw e;
} finally {
// XXX we should not release the session if we abort above
// before calling C_Verify
initialized = false;
session = token.releaseSession(session);
}

8
jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java
View File

@ -743,6 +743,7 @@ public final class Secmod {
Map<Bytes,TrustAttributes> trustMap = new HashMap<Bytes,TrustAttributes>();
Token token = provider.getToken();
Session session = null;
boolean exceptionOccurred = true;
try {
session = token.getOpSession();
int MAX_NUM = 8192;
@ -762,8 +763,13 @@ public final class Secmod {
// skip put on pkcs11 error
}
}
exceptionOccurred = false;
} finally {
token.releaseSession(session);
if (exceptionOccurred) {
token.killSession(session);
} else {
token.releaseSession(session);
}
}
return trustMap;
}

10
jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 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
@ -160,8 +160,11 @@ public class NativeCipherWithJavaPadding extends CipherSpi {
ShortBufferException {
int tbSize = (trailingBytes == null? 0:trailingBytes.position());
int dataLen = tbSize + lastData.length;
// check total length
if ((dataLen < 1) || (dataLen % blockSize != 0)) {
// Special handling to match SunJCE provider behavior
if (dataLen <= 0) {
return 0;
} else if (dataLen % blockSize != 0) {
UcryptoProvider.debug("PKCS5Padding: unpad, buffered " + tbSize +
" bytes, last block " + lastData.length + " bytes");
@ -402,7 +405,6 @@ public class NativeCipherWithJavaPadding extends CipherSpi {
throws ShortBufferException, IllegalBlockSizeException,
BadPaddingException {
int estimatedOutLen = engineGetOutputSize(inLen);
if (out.length - outOfs < estimatedOutLen) {
throw new ShortBufferException("Actual: " + (out.length - outOfs) +
". Estimated Out Length: " + estimatedOutLen);

79
jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java
View File

@ -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
@ -258,27 +258,38 @@ class NativeRSASignature extends SignatureSpi {
@Override
protected synchronized byte[] engineSign() throws SignatureException {
byte[] sig = new byte[sigLength];
int rv = doFinal(sig, 0, sigLength);
if (rv < 0) {
throw new SignatureException(new UcryptoException(-rv));
try {
byte[] sig = new byte[sigLength];
int rv = doFinal(sig, 0, sigLength);
if (rv < 0) {
throw new SignatureException(new UcryptoException(-rv));
}
return sig;
} finally {
// doFinal should already be called, no need to cancel
reset(false);
}
return sig;
}
@Override
protected synchronized int engineSign(byte[] outbuf, int offset, int len)
throws SignatureException {
if (outbuf == null || (offset < 0) || (outbuf.length < (offset + sigLength))
|| (len < sigLength)) {
throw new SignatureException("Invalid output buffer. offset: " +
offset + ". len: " + len + ". sigLength: " + sigLength);
boolean doCancel = true;
try {
if (outbuf == null || (offset < 0) || (outbuf.length < (offset + sigLength))
|| (len < sigLength)) {
throw new SignatureException("Invalid output buffer. offset: " +
offset + ". len: " + len + ". sigLength: " + sigLength);
}
int rv = doFinal(outbuf, offset, sigLength);
doCancel = false;
if (rv < 0) {
throw new SignatureException(new UcryptoException(-rv));
}
return sigLength;
} finally {
reset(doCancel);
}
int rv = doFinal(outbuf, offset, sigLength);
if (rv < 0) {
throw new SignatureException(new UcryptoException(-rv));
}
return sigLength;
}
@Override
@ -329,19 +340,25 @@ class NativeRSASignature extends SignatureSpi {
@Override
protected synchronized boolean engineVerify(byte[] sigBytes, int sigOfs, int sigLen)
throws SignatureException {
if (sigBytes == null || (sigOfs < 0) || (sigBytes.length < (sigOfs + this.sigLength))
|| (sigLen != this.sigLength)) {
throw new SignatureException("Invalid signature length: got " +
sigLen + " but was expecting " + this.sigLength);
}
boolean doCancel = true;
try {
if (sigBytes == null || (sigOfs < 0) || (sigBytes.length < (sigOfs + this.sigLength))
|| (sigLen != this.sigLength)) {
throw new SignatureException("Invalid signature length: got " +
sigLen + " but was expecting " + this.sigLength);
}
int rv = doFinal(sigBytes, sigOfs, sigLen);
if (rv == 0) {
return true;
} else {
UcryptoProvider.debug("Signature: " + mech + " verification error " +
int rv = doFinal(sigBytes, sigOfs, sigLen);
doCancel = false;
if (rv == 0) {
return true;
} else {
UcryptoProvider.debug("Signature: " + mech + " verification error " +
new UcryptoException(-rv).getMessage());
return false;
return false;
}
} finally {
reset(doCancel);
}
}
@ -432,13 +449,9 @@ class NativeRSASignature extends SignatureSpi {
// returns 0 (success) or negative (ucrypto error occurred)
private int doFinal(byte[] sigBytes, int sigOfs, int sigLen) {
try {
ensureInitialized();
int k = nativeFinal(pCtxt.id, sign, sigBytes, sigOfs, sigLen);
return k;
} finally {
reset(false);
}
ensureInitialized();
int k = nativeFinal(pCtxt.id, sign, sigBytes, sigOfs, sigLen);
return k;
}
// check and return RSA key size in number of bytes

4
jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/extra/EditingHistory.java
View File

@ -48,7 +48,9 @@ public abstract class EditingHistory implements History {
private History currentDelegate;
protected EditingHistory(ConsoleReader in, Iterable<? extends String> originalHistory) {
this.fullHistory = new MemoryHistory();
MemoryHistory fullHistory = new MemoryHistory();
fullHistory.setIgnoreDuplicates(false);
this.fullHistory = fullHistory;
this.currentDelegate = fullHistory;
bind(in, CTRL_UP,
(Runnable) () -> moveHistoryToSnippet(in, ((EditingHistory) in.getHistory())::previousSnippet));

94
jdk/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
View File

@ -211,6 +211,62 @@ createGlobalRefs(JNIEnv *env, InvokeRequest *request)
return error;
}
/*
* Delete saved global references - if any - for:
* - a potentially thrown Exception
* - a returned refernce/array value
* See invoker_doInvoke() and invoke* methods where global references
* are being saved.
*/
static void
deletePotentiallySavedGlobalRefs(JNIEnv *env, InvokeRequest *request)
{
/* Delete potentially saved return value */
if ((request->invokeType == INVOKE_CONSTRUCTOR) ||
(returnTypeTag(request->methodSignature) == JDWP_TAG(OBJECT)) ||
(returnTypeTag(request->methodSignature) == JDWP_TAG(ARRAY))) {
if (request->returnValue.l != NULL) {
tossGlobalRef(env, &(request->returnValue.l));
}
}
/* Delete potentially saved exception */
if (request->exception != NULL) {
tossGlobalRef(env, &(request->exception));
}
}
/*
* Delete global argument references from the request which got put there before a
* invoke request was carried out. See fillInvokeRequest().
*/
static void
deleteGlobalArgumentRefs(JNIEnv *env, InvokeRequest *request)
{
void *cursor;
jint argIndex = 0;
jvalue *argument = request->arguments;
jbyte argumentTag = firstArgumentTypeTag(request->methodSignature, &cursor);
if (request->clazz != NULL) {
tossGlobalRef(env, &(request->clazz));
}
if (request->instance != NULL) {
tossGlobalRef(env, &(request->instance));
}
/* Delete global argument references */
while (argIndex < request->argumentCount) {
if ((argumentTag == JDWP_TAG(OBJECT)) ||
(argumentTag == JDWP_TAG(ARRAY))) {
if (argument->l != NULL) {
tossGlobalRef(env, &(argument->l));
}
}
argument++;
argIndex++;
argumentTag = nextArgumentTypeTag(&cursor);
}
}
static jvmtiError
fillInvokeRequest(JNIEnv *env, InvokeRequest *request,
jbyte invokeType, jbyte options, jint id,
@ -322,6 +378,8 @@ static void
invokeConstructor(JNIEnv *env, InvokeRequest *request)
{
jobject object;
JDI_ASSERT_MSG(request->clazz, "Request clazz null");
object = JNI_FUNC_PTR(env,NewObjectA)(env, request->clazz,
request->method,
request->arguments);
@ -338,6 +396,7 @@ invokeStatic(JNIEnv *env, InvokeRequest *request)
case JDWP_TAG(OBJECT):
case JDWP_TAG(ARRAY): {
jobject object;
JDI_ASSERT_MSG(request->clazz, "Request clazz null");
object = JNI_FUNC_PTR(env,CallStaticObjectMethodA)(env,
request->clazz,
request->method,
@ -426,6 +485,7 @@ invokeVirtual(JNIEnv *env, InvokeRequest *request)
case JDWP_TAG(OBJECT):
case JDWP_TAG(ARRAY): {
jobject object;
JDI_ASSERT_MSG(request->instance, "Request instance null");
object = JNI_FUNC_PTR(env,CallObjectMethodA)(env,
request->instance,
request->method,
@ -513,6 +573,8 @@ invokeNonvirtual(JNIEnv *env, InvokeRequest *request)
case JDWP_TAG(OBJECT):
case JDWP_TAG(ARRAY): {
jobject object;
JDI_ASSERT_MSG(request->clazz, "Request clazz null");
JDI_ASSERT_MSG(request->instance, "Request instance null");
object = JNI_FUNC_PTR(env,CallNonvirtualObjectMethodA)(env,
request->instance,
request->clazz,
@ -609,6 +671,8 @@ invoker_doInvoke(jthread thread)
JNIEnv *env;
jboolean startNow;
InvokeRequest *request;
jbyte options;
jbyte invokeType;
JDI_ASSERT(thread);
@ -625,6 +689,9 @@ invoker_doInvoke(jthread thread)
if (startNow) {
request->started = JNI_TRUE;
}
options = request->options;
invokeType = request->invokeType;
debugMonitorExit(invokerLock);
if (!startNow) {
@ -639,7 +706,7 @@ invoker_doInvoke(jthread thread)
JNI_FUNC_PTR(env,ExceptionClear)(env);
switch (request->invokeType) {
switch (invokeType) {
case INVOKE_CONSTRUCTOR:
invokeConstructor(env, request);
break;
@ -647,7 +714,7 @@ invoker_doInvoke(jthread thread)
invokeStatic(env, request);
break;
case INVOKE_INSTANCE:
if (request->options & JDWP_INVOKE_OPTIONS(NONVIRTUAL) ) {
if (options & JDWP_INVOKE_OPTIONS(NONVIRTUAL) ) {
invokeNonvirtual(env, request);
} else {
invokeVirtual(env, request);
@ -724,13 +791,24 @@ invoker_completeInvokeRequest(jthread thread)
returnValue = request->returnValue;
}
/*
* At this time, there's no need to retain global references on
* arguments since the reply is processed. No one will deal with
* this request ID anymore, so we must call deleteGlobalArgumentRefs().
*
* We cannot delete saved exception or return value references
* since otherwise a deleted handle would escape when writing
* the response to the stream. Instead, we clean those refs up
* after writing the respone.
*/
deleteGlobalArgumentRefs(env, request);
/*
* Give up the lock before I/O operation
*/
debugMonitorExit(invokerLock);
eventHandler_unlock();
if (!detached) {
outStream_initReply(&out, id);
(void)outStream_writeValue(env, &out, tag, returnValue);
@ -738,6 +816,16 @@ invoker_completeInvokeRequest(jthread thread)
(void)outStream_writeObjectRef(env, &out, exc);
outStream_sendReply(&out);
}
/*
* Delete potentially saved global references of return value
* and exception
*/
eventHandler_lock(); // for proper lock order
debugMonitorEnter(invokerLock);
deletePotentiallySavedGlobalRefs(env, request);
debugMonitorExit(invokerLock);
eventHandler_unlock();
}
jboolean

6
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
View File

@ -86,6 +86,9 @@ public class JlinkTask {
task.options.help = true;
}, "--help", "-h"),
new Option<JlinkTask>(true, (task, opt, arg) -> {
// if used multiple times, the last one wins!
// So, clear previous values, if any.
task.options.modulePath.clear();
String[] dirs = arg.split(File.pathSeparator);
int i = 0;
Arrays.stream(dirs)
@ -93,6 +96,9 @@ public class JlinkTask {
.forEach(task.options.modulePath::add);
}, "--module-path", "-p"),
new Option<JlinkTask>(true, (task, opt, arg) -> {
// if used multiple times, the last one wins!
// So, clear previous values, if any.
task.options.limitMods.clear();
for (String mn : arg.split(",")) {
if (mn.isEmpty()) {
throw taskHelper.newBadArgs("err.mods.must.be.specified",

51
jdk/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c
View File

@ -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
@ -45,6 +45,13 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommands
return jmm_interface->GetDiagnosticCommands(env);
}
#define EXCEPTION_CHECK_AND_FREE(x) do { \
if ((*env)->ExceptionCheck(env)) { \
free(x); \
return NULL; \
} \
} while(0)
jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
int num_arg) {
int i;
@ -59,6 +66,7 @@ jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
dcmd_arg_info_array = (dcmdArgInfo*) malloc(num_arg * sizeof(dcmdArgInfo));
/* According to ISO C it is perfectly legal for malloc to return zero if called with a zero argument */
if (dcmd_arg_info_array == NULL && num_arg != 0) {
JNU_ThrowOutOfMemoryError(env, 0);
return NULL;
}
jmm_interface->GetDiagnosticCommandArgumentsInfo(env, command,
@ -76,14 +84,24 @@ jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
return NULL;
}
for (i=0; i<num_arg; i++) {
jstring jname, jdesc,jtype,jdefStr;
jname = (*env)->NewStringUTF(env,dcmd_arg_info_array[i].name);
EXCEPTION_CHECK_AND_FREE(dcmd_arg_info_array);
jdesc = (*env)->NewStringUTF(env,dcmd_arg_info_array[i].description);
EXCEPTION_CHECK_AND_FREE(dcmd_arg_info_array);
jtype = (*env)->NewStringUTF(env,dcmd_arg_info_array[i].type);
EXCEPTION_CHECK_AND_FREE(dcmd_arg_info_array);
jdefStr = (*env)->NewStringUTF(env, dcmd_arg_info_array[i].default_string);
EXCEPTION_CHECK_AND_FREE(dcmd_arg_info_array);
obj = JNU_NewObjectByName(env,
"com/sun/management/internal/DiagnosticCommandArgumentInfo",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZZI)V",
(*env)->NewStringUTF(env,dcmd_arg_info_array[i].name),
(*env)->NewStringUTF(env,dcmd_arg_info_array[i].description),
(*env)->NewStringUTF(env,dcmd_arg_info_array[i].type),
dcmd_arg_info_array[i].default_string == NULL ? NULL:
(*env)->NewStringUTF(env, dcmd_arg_info_array[i].default_string),
jname, jdesc, jtype,
dcmd_arg_info_array[i].default_string == NULL ? NULL: jdefStr,
dcmd_arg_info_array[i].mandatory,
dcmd_arg_info_array[i].option,
dcmd_arg_info_array[i].multiple,
@ -93,6 +111,7 @@ jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
return NULL;
}
(*env)->SetObjectArrayElement(env, result, i, obj);
EXCEPTION_CHECK_AND_FREE(dcmd_arg_info_array);
}
free(dcmd_arg_info_array);
arraysCls = (*env)->FindClass(env, "java/util/Arrays");
@ -125,6 +144,7 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
jint ret = jmm_interface->GetOptionalSupport(env, &mos);
jsize num_commands;
dcmdInfo* dcmd_info_array;
jstring jname, jdesc, jimpact;
if (commands == NULL) {
JNU_ThrowNullPointerException(env, "Invalid String Array");
@ -139,7 +159,6 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
result = (*env)->NewObjectArray(env, num_commands, dcmdInfoCls, NULL);
if (result == NULL) {
JNU_ThrowOutOfMemoryError(env, 0);
return NULL;
}
if (num_commands == 0) {
@ -159,15 +178,22 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
dcmd_info_array[i].num_arguments);
if (args == NULL) {
free(dcmd_info_array);
JNU_ThrowOutOfMemoryError(env, 0);
return NULL;
}
jname = (*env)->NewStringUTF(env,dcmd_info_array[i].name);
EXCEPTION_CHECK_AND_FREE(dcmd_info_array);
jdesc = (*env)->NewStringUTF(env,dcmd_info_array[i].description);
EXCEPTION_CHECK_AND_FREE(dcmd_info_array);
jimpact = (*env)->NewStringUTF(env,dcmd_info_array[i].impact);
EXCEPTION_CHECK_AND_FREE(dcmd_info_array);
obj = JNU_NewObjectByName(env,
"com/sun/management/internal/DiagnosticCommandInfo",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V",
(*env)->NewStringUTF(env,dcmd_info_array[i].name),
(*env)->NewStringUTF(env,dcmd_info_array[i].description),
(*env)->NewStringUTF(env,dcmd_info_array[i].impact),
jname, jdesc, jimpact,
dcmd_info_array[i].permission_class==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_class),
dcmd_info_array[i].permission_name==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_name),
dcmd_info_array[i].permission_action==NULL?NULL:(*env)->NewStringUTF(env,dcmd_info_array[i].permission_action),
@ -175,10 +201,11 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
args);
if (obj == NULL) {
free(dcmd_info_array);
JNU_ThrowOutOfMemoryError(env, 0);
return NULL;
}
(*env)->SetObjectArrayElement(env, result, i, obj);
EXCEPTION_CHECK_AND_FREE(dcmd_info_array);
}
free(dcmd_info_array);
return result;

2
jdk/test/ProblemList.txt
View File

@ -275,8 +275,6 @@ com/sun/jdi/sde/SourceDebugExtensionTest.java 8158066 windows-
java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java 8062512 generic-all
java/util/Arrays/ParallelPrefix.java 8080165,8085982 generic-all
java/util/BitSet/BitSetStreamTest.java 8079538 generic-all
############################################################################

5
jdk/test/com/sun/jdi/InvokeHangTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 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
@ -29,6 +29,7 @@
* @author jjh
*
* @modules jdk.jdi
* @library /test/lib
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g InvokeHangTest.java
* @run driver InvokeHangTest
@ -133,7 +134,7 @@ public class InvokeHangTest extends TestScaffold {
BreakpointRequest request2;
static volatile int bkpts = 0;
Thread timerThread;
static int waitTime = 20000;
static long waitTime = jdk.test.lib.Utils.adjustTimeout(20000);
InvokeHangTest (String args[]) {
super(args);

416
jdk/test/com/sun/jdi/OomDebugTest.java Normal file
View File

@ -0,0 +1,416 @@
/*
* Copyright (c) 2016 Red Hat Inc.
*
* 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 8153711
* @summary JDWP: Memory Leak (global references not deleted after invokeMethod).
*
* @author Severin Gehwolf <sgehwolf@redhat.com>
*
* @library ..
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g OomDebugTest.java
* @run main OomDebugTest OomDebugTestTarget test1
* @run main OomDebugTest OomDebugTestTarget test2
* @run main OomDebugTest OomDebugTestTarget test3
* @run main OomDebugTest OomDebugTestTarget test4
* @run main OomDebugTest OomDebugTestTarget test5
*/
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import com.sun.jdi.ArrayReference;
import com.sun.jdi.ArrayType;
import com.sun.jdi.ClassType;
import com.sun.jdi.Field;
import com.sun.jdi.InvocationException;
import com.sun.jdi.Method;
import com.sun.jdi.ObjectReference;
import com.sun.jdi.ReferenceType;
import com.sun.jdi.StackFrame;
import com.sun.jdi.VMOutOfMemoryException;
import com.sun.jdi.Value;
import com.sun.jdi.event.BreakpointEvent;
import com.sun.jdi.event.ExceptionEvent;
/***************** Target program **********************/
class OomDebugTestTarget {
OomDebugTestTarget() {
System.out.println("DEBUG: invoked constructor");
}
static class FooCls {
@SuppressWarnings("unused")
private byte[] bytes = new byte[3000000];
};
FooCls fooCls = new FooCls();
byte[] byteArray = new byte[0];
void testMethod(FooCls foo) {
System.out.println("DEBUG: invoked 'void testMethod(FooCls)', foo == " + foo);
}
void testPrimitive(byte[] foo) {
System.out.println("DEBUG: invoked 'void testPrimitive(byte[])', foo == " + foo);
}
byte[] testPrimitiveArrRetval() {
System.out.println("DEBUG: invoked 'byte[] testPrimitiveArrRetval()'");
return new byte[3000000];
}
FooCls testFooClsRetval() {
System.out.println("DEBUG: invoked 'FooCls testFooClsRetval()'");
return new FooCls();
}
public void entry() {}
public static void main(String[] args){
System.out.println("DEBUG: OomDebugTestTarget.main");
new OomDebugTestTarget().entry();
}
}
/***************** Test program ************************/
public class OomDebugTest extends TestScaffold {
private static final String[] ALL_TESTS = new String[] {
"test1", "test2", "test3", "test4", "test5"
};
private static final Set<String> ALL_TESTS_SET = new HashSet<String>();
static {
ALL_TESTS_SET.addAll(Arrays.asList(ALL_TESTS));
}
private static final String TEST_CLASSES = System.getProperty("test.classes", ".");
private static final File RESULT_FILE = new File(TEST_CLASSES, "results.properties");
private static final String LAST_TEST = ALL_TESTS[ALL_TESTS.length - 1];
private ReferenceType targetClass;
private ObjectReference thisObject;
private int failedTests;
private final String testMethod;
public OomDebugTest(String[] args) {
super(args);
if (args.length != 2) {
throw new RuntimeException("Test failed unexpectedly.");
}
this.testMethod = args[1];
}
@Override
protected void runTests() throws Exception {
try {
addListener(new TargetAdapter() {
@Override
public void exceptionThrown(ExceptionEvent event) {
String name = event.exception().referenceType().name();
System.err.println("DEBUG: Exception thrown in debuggee was: " + name);
}
});
/*
* Get to the top of entry()
* to determine targetClass and mainThread
*/
BreakpointEvent bpe = startTo("OomDebugTestTarget", "entry", "()V");
targetClass = bpe.location().declaringType();
mainThread = bpe.thread();
StackFrame frame = mainThread.frame(0);
thisObject = frame.thisObject();
java.lang.reflect.Method m = findTestMethod();
m.invoke(this);
} catch (NoSuchMethodException e) {
e.printStackTrace();
failure();
} catch (SecurityException e) {
e.printStackTrace();
failure();
}
/*
* resume the target, listening for events
*/
listenUntilVMDisconnect();
}
private java.lang.reflect.Method findTestMethod()
throws NoSuchMethodException, SecurityException {
return OomDebugTest.class.getDeclaredMethod(testMethod);
}
private void failure() {
failedTests++;
}
/*
* Test case: Object reference as method parameter.
*/
@SuppressWarnings("unused") // called via reflection
private void test1() throws Exception {
System.out.println("DEBUG: ------------> Running test1");
try {
Field field = targetClass.fieldByName("fooCls");
ClassType clsType = (ClassType)field.type();
Method constructor = getConstructorForClass(clsType);
for (int i = 0; i < 15; i++) {
@SuppressWarnings({ "rawtypes", "unchecked" })
ObjectReference objRef = clsType.newInstance(mainThread,
constructor,
new ArrayList(0),
ObjectReference.INVOKE_NONVIRTUAL);
if (objRef.isCollected()) {
System.out.println("DEBUG: Object got GC'ed before we can use it. NO-OP.");
continue;
}
invoke("testMethod", "(LOomDebugTestTarget$FooCls;)V", objRef);
}
} catch (InvocationException e) {
handleFailure(e);
}
}
/*
* Test case: Array reference as method parameter.
*/
@SuppressWarnings("unused") // called via reflection
private void test2() throws Exception {
System.out.println("DEBUG: ------------> Running test2");
try {
Field field = targetClass.fieldByName("byteArray");
ArrayType arrType = (ArrayType)field.type();
for (int i = 0; i < 15; i++) {
ArrayReference byteArrayVal = arrType.newInstance(3000000);
if (byteArrayVal.isCollected()) {
System.out.println("DEBUG: Object got GC'ed before we can use it. NO-OP.");
continue;
}
invoke("testPrimitive", "([B)V", byteArrayVal);
}
} catch (VMOutOfMemoryException e) {
defaultHandleOOMFailure(e);
}
}
/*
* Test case: Array reference as return value.
*/
@SuppressWarnings("unused") // called via reflection
private void test3() throws Exception {
System.out.println("DEBUG: ------------> Running test3");
try {
for (int i = 0; i < 15; i++) {
invoke("testPrimitiveArrRetval",
"()[B",
Collections.EMPTY_LIST,
vm().mirrorOfVoid());
}
} catch (InvocationException e) {
handleFailure(e);
}
}
/*
* Test case: Object reference as return value.
*/
@SuppressWarnings("unused") // called via reflection
private void test4() throws Exception {
System.out.println("DEBUG: ------------> Running test4");
try {
for (int i = 0; i < 15; i++) {
invoke("testFooClsRetval",
"()LOomDebugTestTarget$FooCls;",
Collections.EMPTY_LIST,
vm().mirrorOfVoid());
}
} catch (InvocationException e) {
handleFailure(e);
}
}
/*
* Test case: Constructor
*/
@SuppressWarnings({ "unused", "unchecked", "rawtypes" }) // called via reflection
private void test5() throws Exception {
System.out.println("DEBUG: ------------> Running test5");
try {
ClassType type = (ClassType)thisObject.type();
for (int i = 0; i < 15; i++) {
type.newInstance(mainThread,
findMethod(targetClass, "<init>", "()V"),
new ArrayList(0),
ObjectReference.INVOKE_NONVIRTUAL);
}
} catch (InvocationException e) {
handleFailure(e);
}
}
private Method getConstructorForClass(ClassType clsType) {
List<Method> methods = clsType.methodsByName("<init>");
if (methods.size() != 1) {
throw new RuntimeException("FAIL. Expected only one, the default, constructor");
}
return methods.get(0);
}
private void handleFailure(InvocationException e) {
// There is no good way to see the OOME diagnostic message in the target since the
// TestScaffold might throw an exception while trying to print the stack trace. I.e
// it might get a a VMDisconnectedException before the stack trace printing finishes.
System.err.println("FAILURE: InvocationException thrown. Trying to determine cause...");
defaultHandleOOMFailure(e);
}
private void defaultHandleOOMFailure(Exception e) {
e.printStackTrace();
failure();
}
@SuppressWarnings({ "rawtypes", "unchecked" })
void invoke(String methodName, String methodSig, Value value)
throws Exception {
List args = new ArrayList(1);
args.add(value);
invoke(methodName, methodSig, args, value);
}
void invoke(String methodName,
String methodSig,
@SuppressWarnings("rawtypes") List args,
Value value) throws Exception {
Method method = findMethod(targetClass, methodName, methodSig);
if ( method == null) {
failure("FAILED: Can't find method: "
+ methodName + " for class = " + targetClass);
return;
}
invoke(method, args, value);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
void invoke(Method method, List args, Value value) throws Exception {
thisObject.invokeMethod(mainThread, method, args, 0);
System.out.println("DEBUG: Done invoking method via debugger.");
}
Value fieldValue(String fieldName) {
Field field = targetClass.fieldByName(fieldName);
return thisObject.getValue(field);
}
// Determine the pass/fail status on some heuristic and don't fail the
// test if < 3 of the total number of tests (currently 5) fail. This also
// has the nice side effect that all tests are first attempted and only
// all tests ran an overall pass/fail status is determined.
private static void determineOverallTestStatus(OomDebugTest oomTest)
throws IOException, FileNotFoundException {
Properties resultProps = new Properties();
if (!RESULT_FILE.exists()) {
RESULT_FILE.createNewFile();
}
FileInputStream fin = null;
try {
fin = new FileInputStream(RESULT_FILE);
resultProps.load(fin);
resultProps.put(oomTest.testMethod,
Integer.toString(oomTest.failedTests));
} finally {
if (fin != null) {
fin.close();
}
}
System.out.println("DEBUG: Finished running test '"
+ oomTest.testMethod + "'.");
if (LAST_TEST.equals(oomTest.testMethod)) {
System.out.println("DEBUG: Determining overall test status.");
Set<String> actualTestsRun = new HashSet<String>();
int totalTests = ALL_TESTS.length;
int failedTests = 0;
for (Object key: resultProps.keySet()) {
actualTestsRun.add((String)key);
Object propVal = resultProps.get(key);
int value = Integer.parseInt((String)propVal);
failedTests += value;
}
if (!ALL_TESTS_SET.equals(actualTestsRun)) {
String errorMsg = "Test failed! Expected to run tests '"
+ ALL_TESTS_SET + "', but only these were run '"
+ actualTestsRun + "'";
throw new RuntimeException(errorMsg);
}
if (failedTests >= 3) {
String errorMsg = "Test failed. Expected < 3 sub-tests to fail "
+ "for a pass. Got " + failedTests
+ " failed tests out of " + totalTests + ".";
throw new RuntimeException(errorMsg);
}
RESULT_FILE.delete();
System.out.println("All " + totalTests + " tests passed.");
} else {
System.out.println("DEBUG: More tests to run. Coninuing.");
FileOutputStream fout = null;
try {
fout = new FileOutputStream(RESULT_FILE);
resultProps.store(fout, "Storing results after test "
+ oomTest.testMethod);
} finally {
if (fout != null) {
fout.close();
}
}
}
}
public static void main(String[] args) throws Exception {
System.setProperty("test.vm.opts", "-Xmx40m"); // Set debuggee VM option
OomDebugTest oomTest = new OomDebugTest(args);
try {
oomTest.startTests();
} catch (Throwable e) {
System.out.println("DEBUG: Got exception for test run. " + e);
e.printStackTrace();
oomTest.failure();
}
determineOverallTestStatus(oomTest);
}
}

2
jdk/test/java/lang/invoke/CountedLoopIterationCountsTest.java
View File

@ -71,7 +71,7 @@ public class CountedLoopIterationCountsTest {
}
}
static int step(int counter, int stepCount) {
static int step(int stepCount, int counter) {
return stepCount + 1;
}

129
jdk/test/java/lang/invoke/JavaDocExamplesTest.java
View File

@ -703,6 +703,66 @@ assertEquals(120, loop.invoke(5));
}}
}
static int inc(int i) { return i + 1; } // drop acc, k
static int mult(int i, int acc) { return i * acc; } //drop k
static boolean cmp(int i, int k) { return i < k; }
@Test public void testSimplerLoop() throws Throwable {
MethodHandle MH_inc, MH_mult, MH_cmp;
Class<?> I = int.class;
MH_inc = LOOKUP.findStatic(THIS_CLASS, "inc", methodType(I, I));
MH_mult = LOOKUP.findStatic(THIS_CLASS, "mult", methodType(I, I, I));
MH_cmp = LOOKUP.findStatic(THIS_CLASS, "cmp", methodType(boolean.class, I, I));
{{
{} /// JAVADOC
// simplified implementation of the factorial function as a loop handle
// null initializer for counter, should initialize to 0
MethodHandle MH_one = MethodHandles.constant(int.class, 1);
MethodHandle MH_pred = MethodHandles.dropArguments(MH_cmp, 1, int.class); // drop acc
MethodHandle MH_fin = MethodHandles.dropArguments(MethodHandles.identity(int.class), 0, int.class); // drop i
MethodHandle[] counterClause = new MethodHandle[]{null, MH_inc};
MethodHandle[] accumulatorClause = new MethodHandle[]{MH_one, MH_mult, MH_pred, MH_fin};
MethodHandle loop = MethodHandles.loop(counterClause, accumulatorClause);
assertEquals(720, loop.invoke(6));
{}
}}
}
// for testFacLoop
{}
static class FacLoop {
final int k;
FacLoop(int k) { this.k = k; }
int inc(int i) { return i + 1; }
int mult(int i, int acc) { return i * acc; }
boolean pred(int i) { return i < k; }
int fin(int i, int acc) { return acc; }
}
{}
// assume MH_inc, MH_mult, and MH_pred are handles to the above methods
@Test public void testFacLoop() throws Throwable {
MethodHandle MH_FacLoop, MH_inc, MH_mult, MH_pred, MH_fin;
Class<?> I = int.class;
MH_FacLoop = LOOKUP.findConstructor(FacLoop.class, methodType(void.class, I));
MH_inc = LOOKUP.findVirtual(FacLoop.class, "inc", methodType(I, I));
MH_mult = LOOKUP.findVirtual(FacLoop.class, "mult", methodType(I, I, I));
MH_pred = LOOKUP.findVirtual(FacLoop.class, "pred", methodType(boolean.class, I));
MH_fin = LOOKUP.findVirtual(FacLoop.class, "fin", methodType(I, I, I));
{{
{} /// JAVADOC
// instance-based implementation of the factorial function as a loop handle
// null initializer for counter, should initialize to 0
MethodHandle MH_one = MethodHandles.constant(int.class, 1);
MethodHandle[] instanceClause = new MethodHandle[]{MH_FacLoop};
MethodHandle[] counterClause = new MethodHandle[]{null, MH_inc};
MethodHandle[] accumulatorClause = new MethodHandle[]{MH_one, MH_mult, MH_pred, MH_fin};
MethodHandle loop = MethodHandles.loop(instanceClause, counterClause, accumulatorClause);
assertEquals(5040, loop.invoke(7));
{}
}}
}
static List<String> initZip(Iterator<String> a, Iterator<String> b) { return new ArrayList<>(); }
static boolean zipPred(List<String> zip, Iterator<String> a, Iterator<String> b) { return a.hasNext() && b.hasNext(); }
static List<String> zipStep(List<String> zip, Iterator<String> a, Iterator<String> b) {
@ -749,36 +809,81 @@ assertEquals(23, loop.invoke(23));
}}
}
static String start(String arg) { return arg; }
static String step(int counter, String v, String arg) { return "na " + v; }
static String step(String v, int counter, String start_) { return "na " + v; } //#0
static String step(String v, int counter ) { return "na " + v; } //#1
static String step(String v, int counter, int iterations_, String pre, String start_) { return pre + " " + v; } //#2
static String step3(String v, int counter, String pre) { return pre + " " + v; } //#3
@Test public void testCountedLoop() throws Throwable {
MethodHandle MH_start, MH_step;
Class<?> S = String.class;
MH_start = LOOKUP.findStatic(THIS_CLASS, "start", methodType(S, S));
MH_step = LOOKUP.findStatic(THIS_CLASS, "step", methodType(S, int.class, S, S));
MethodHandle MH_step;
Class<?> S = String.class, I = int.class;
// Theme:
MH_step = LOOKUP.findStatic(THIS_CLASS, "step", methodType(S, S, I, S));
{{
{} /// JAVADOC
// String s = "Lambdaman!"; for (int i = 0; i < 13; ++i) { s = "na " + s; } return s;
// => a variation on a well known theme
MethodHandle fit13 = MethodHandles.constant(int.class, 13);
MethodHandle loop = MethodHandles.countedLoop(fit13, MH_start, MH_step);
MethodHandle start = MethodHandles.identity(String.class);
MethodHandle loop = MethodHandles.countedLoop(fit13, start, MH_step); // (v, i, _) -> "na " + v
assertEquals("na na na na na na na na na na na na na Lambdaman!", loop.invoke("Lambdaman!"));
{}
}}
// Variation #1:
MH_step = LOOKUP.findStatic(THIS_CLASS, "step", methodType(S, S, I));
{{
{} /// JAVADOC
// String s = "Lambdaman!"; for (int i = 0; i < 13; ++i) { s = "na " + s; } return s;
// => a variation on a well known theme
MethodHandle count = MethodHandles.dropArguments(MethodHandles.identity(int.class), 1, String.class);
MethodHandle start = MethodHandles.dropArguments(MethodHandles.identity(String.class), 0, int.class);
MethodHandle loop = MethodHandles.countedLoop(count, start, MH_step); // (v, i) -> "na " + v
assertEquals("na na na na na na na na na na na na na Lambdaman!", loop.invoke(13, "Lambdaman!"));
{}
assertEquals("na na Lambdaman!", loop.invoke(2, "Lambdaman!"));
assertEquals("Lambdaman!", loop.invoke(0, "Lambdaman!"));
assertEquals("Lambdaman!", loop.invoke(-1, "Lambdaman!"));
assertEquals("Lambdaman!", loop.invoke(Integer.MIN_VALUE, "Lambdaman!"));
}}
// Variation #2:
MH_step = LOOKUP.findStatic(THIS_CLASS, "step", methodType(S, S, I, I, S, S));
{{
{} /// JAVADOC
// String s = "Lambdaman!", t = "na"; for (int i = 0; i < 13; ++i) { s = t + " " + s; } return s;
// => a variation on a well known theme
MethodHandle count = MethodHandles.identity(int.class);
MethodHandle start = MethodHandles.dropArguments(MethodHandles.identity(String.class), 0, int.class, String.class);
MethodHandle loop = MethodHandles.countedLoop(count, start, MH_step); // (v, i, _, pre, _) -> pre + " " + v
assertEquals("na na na na na na na na na na na na na Lambdaman!", loop.invoke(13, "na", "Lambdaman!"));
{}
}}
// Variation #3:
MH_step = LOOKUP.findStatic(THIS_CLASS, "step3", methodType(S, S, I, S));
{{
{} /// JAVADOC
// String s = "Lambdaman!", t = "na"; for (int i = 0; i < 13; ++i) { s = t + " " + s; } return s;
// => a variation on a well known theme
MethodType loopType = methodType(String.class, String.class, int.class, String.class);
MethodHandle count = MethodHandles.dropArgumentsToMatch(MethodHandles.identity(int.class), 0, loopType.parameterList(), 1);
MethodHandle start = MethodHandles.dropArgumentsToMatch(MethodHandles.identity(String.class), 0, loopType.parameterList(), 2);
MethodHandle body = MethodHandles.dropArgumentsToMatch(MH_step, 2, loopType.parameterList(), 0);
MethodHandle loop = MethodHandles.countedLoop(count, start, body); // (v, i, pre, _, _) -> pre + " " + v
assertEquals("na na na na na na na na na na na na na Lambdaman!", loop.invoke("na", 13, "Lambdaman!"));
{}
}}
}
static List<String> reverseStep(String e, List<String> r, List<String> l) {
static List<String> reverseStep(List<String> r, String e) {
r.add(0, e);
return r;
}
static List<String> newArrayList(List<String> l) { return new ArrayList<>(); }
static List<String> newArrayList() { return new ArrayList<>(); }
@Test public void testIteratedLoop() throws Throwable {
MethodHandle MH_newArrayList, MH_reverseStep;
Class<?> L = List.class;
MH_newArrayList = LOOKUP.findStatic(THIS_CLASS, "newArrayList", methodType(L, L));
MH_reverseStep = LOOKUP.findStatic(THIS_CLASS, "reverseStep", methodType(L, String.class, L, L));
Class<?> L = List.class, S = String.class;
MH_newArrayList = LOOKUP.findStatic(THIS_CLASS, "newArrayList", methodType(L));
MH_reverseStep = LOOKUP.findStatic(THIS_CLASS, "reverseStep", methodType(L, L, S));
{{
{} /// JAVADOC
// reverse a list

602
jdk/test/java/lang/invoke/LoopCombinatorTest.java
View File

@ -28,6 +28,7 @@
* @bug 8150635
* @bug 8150956
* @bug 8150957
* @bug 8151179
* @bug 8152667
* @bug 8153637
* @bug 8154751
@ -146,6 +147,16 @@ public class LoopCombinatorTest {
assertEquals(120, loop.invoke(new LoopWithVirtuals(), 5));
}
@Test
public static void testLoopOmitPred() throws Throwable {
// construct a loop to calculate factorial that omits a predicate
MethodHandle[] counterClause = new MethodHandle[]{null, Fac.MH_inc, null, Fac.MH_fin};
MethodHandle[] accumulatorClause = new MethodHandle[]{Fac.MH_one, Fac.MH_mult, Fac.MH_pred, Fac.MH_fin};
MethodHandle loop = MethodHandles.loop(counterClause, accumulatorClause);
assertEquals(Fac.MT_fac, loop.type());
assertEquals(120, loop.invoke(5));
}
@DataProvider
static Object[][] negativeTestData() {
MethodHandle i0 = MethodHandles.constant(int.class, 0);
@ -153,7 +164,8 @@ public class LoopCombinatorTest {
MethodHandle id = MethodHandles.dropArguments(i0, 0, int.class, double.class);
MethodHandle i3 = MethodHandles.dropArguments(i0, 0, int.class, int.class, int.class);
List<MethodHandle> inits = Arrays.asList(ii, id, i3);
List<Class<?>> ints = Arrays.asList(int.class, int.class, int.class);
List<Class<?>> ints3 = Arrays.asList(int.class, int.class, int.class);
List<Class<?>> ints4 = Arrays.asList(int.class, int.class, int.class, int.class);
List<MethodHandle> finis = Arrays.asList(Fac.MH_fin, Fac.MH_inc, Counted.MH_step);
List<MethodHandle> preds1 = Arrays.asList(null, null, null);
List<MethodHandle> preds2 = Arrays.asList(null, Fac.MH_fin, null);
@ -174,7 +186,7 @@ public class LoopCombinatorTest {
"clause 0: init and step return types must match: int != void"},
{new MethodHandle[][]{{ii}, {id}, {i3}},
"found non-effectively identical init parameter type lists: " + inits +
" (common suffix: " + ints + ")"},
" (common suffix: " + ints3 + ")"},
{new MethodHandle[][]{{null, Fac.MH_inc, null, Fac.MH_fin}, {null, Fac.MH_inc, null, Fac.MH_inc},
{null, Counted.MH_start, null, Counted.MH_step}},
"found non-identical finalizer return types: " + finis + " (return type: int)"},
@ -185,11 +197,11 @@ public class LoopCombinatorTest {
{new MethodHandle[][]{{Fac.MH_zero, Fac.MH_inc}, {Fac.MH_one, eek, Fac.MH_pred, Fac.MH_fin},
{null, Fac.MH_dot}},
"found non-effectively identical parameter type lists:\nstep: " + nesteps +
"\npred: " + nepreds + "\nfini: " + nefinis + " (common parameter sequence: " + ints + ")"},
"\npred: " + nepreds + "\nfini: " + nefinis + " (common parameter sequence: " + ints3 + ")"},
{new MethodHandle[][]{{null, LoopWithVirtuals.MH_inc},
{LoopWithVirtuals.MH_one, LoopWithVirtuals.MH_mult, LoopWithVirtuals.MH_pred, LoopWithVirtuals.MH_fin}},
"found non-effectively identical parameter type lists:\nstep: " + lvsteps +
"\npred: " + lvpreds + "\nfini: " + lvfinis + " (common parameter sequence: " + ints + ")"}
"\npred: " + lvpreds + "\nfini: " + lvfinis + " (common parameter sequence: " + ints4 + ")"}
};
}
@ -207,7 +219,7 @@ public class LoopCombinatorTest {
public static void testLoopNegative(MethodHandle[][] clauses, String expectedMessage) throws Throwable {
boolean caught = false;
try {
MH_loop.invokeWithArguments(clauses);
MH_loop.invokeWithArguments((Object[]) clauses);
} catch (IllegalArgumentException iae) {
assertEquals(expectedMessage, iae.getMessage());
caught = true;
@ -215,12 +227,100 @@ public class LoopCombinatorTest {
assertTrue(caught);
}
@Test
public static void testWhileLoop() throws Throwable {
@Test(dataProvider = "whileLoopTestData")
public static void testWhileLoop(MethodHandle MH_zero,
MethodHandle MH_pred,
MethodHandle MH_step,
String messageOrNull) throws Throwable {
// int i = 0; while (i < limit) { ++i; } return i; => limit
MethodHandle loop = MethodHandles.whileLoop(While.MH_zero, While.MH_pred, While.MH_step);
assertEquals(While.MT_while, loop.type());
assertEquals(23, loop.invoke(23));
try {
MethodHandle loop = MethodHandles.whileLoop(MH_zero, MH_pred, MH_step);
assert messageOrNull == null;
if (MH_step.type().equals(While.MH_step.type()))
assertEquals(While.MT_while, loop.type());
assertEquals(MH_step.type().dropParameterTypes(0, 1), loop.type());
while (loop.type().parameterCount() > 1) loop = snip(loop);
assertEquals(23, loop.invoke(23));
} catch (IllegalArgumentException iae) {
assert messageOrNull != null;
assertEqualsFIXME(messageOrNull, iae.getMessage());
}
}
static void assertEqualsFIXME(String expect, String actual) {
if (!expect.equals(actual)) {
// just issue a warning
System.out.println("*** "+actual+"\n != "+expect);
}
}
@DataProvider
static Object[][] whileLoopTestData() {
MethodHandle
zeroI = While.MH_zero,
zeroX = snip(zeroI),
zeroIB = slap(zeroI, byte.class),
predII = While.MH_pred,
predIX = snip(predII),
predIIB = slap(predII, byte.class),
stepII = While.MH_step,
stepIX = snip(stepII),
stepIIB = slap(stepII, byte.class)
;
return new Object[][] {
// normal while loop clauses, perhaps with effectively-identical reductions
{zeroI, predII, stepII, null},
{zeroX, predII, stepII, null},
{null, predII, stepII, null},
// expanded while loop clauses
{zeroIB, predIIB, stepIIB, null},
{zeroI, predIIB, stepIIB, null},
{null, predIIB, stepIIB, null},
{zeroIB, predII, stepIIB, null},
{zeroX, predII, stepIIB, null},
{null, predII, stepIIB, null},
// short step clauses cause errors
{zeroI, predII, stepIX, "loop predicate must match: (int,int)boolean != (int)boolean"},
{zeroIB, predIX, stepIX, "loop initializer must match: (int,byte)int != ()int"},
// bad body type
{zeroI, predII, tweak(stepII, -1, char.class), "body function must match: (int,int)char != (char,int,int)char"},
{zeroI, predII, tweak(stepII, 0, char.class), "body function must match: (char,int)int != (int,char,int)int"},
// bad pred type
{zeroI, tweak(predII, -1, char.class), stepII, "loop predicate must match: (int,int)char != (int,int)boolean"},
{zeroI, tweak(predII, 0, char.class), stepII, "loop predicate must match: (char,int)boolean != (int,int)boolean"},
// bad init type
{tweak(zeroI, -1, char.class), predII, stepII, "loop initializer must match: (int)char != (int)int"},
{tweak(zeroI, 0, char.class), predII, stepII, "loop initializer must match: (char)int != (int)int"},
};
}
// tweak the type of an MH
static MethodHandle tweak(MethodHandle mh, int argPos, Class<?> type) {
MethodType mt = mh.type();
if (argPos == -1)
mt = mt.changeReturnType(type);
else
mt = mt.changeParameterType(argPos, type);
return MethodHandles.explicitCastArguments(mh, mt);
}
// snip off an MH argument, hard-wiring to zero
static MethodHandle snip(MethodHandle mh, int argPos) {
if (argPos < 0) return null; // special case for optional args
Class<?> argType = mh.type().parameterType(argPos);
Object zero;
try {
zero = MethodHandles.zero(argType).invoke();
} catch (Throwable ex) {
throw new AssertionError(ex);
}
return MethodHandles.insertArguments(mh, argPos, zero);
}
static MethodHandle snip(MethodHandle mh) {
return snip(mh, mh.type().parameterCount()-1);
}
// slap on an extra type on the end of the MH
static MethodHandle slap(MethodHandle mh, Class<?> addType) {
return MethodHandles.dropArguments(mh, mh.type().parameterCount(), addType);
}
@Test
@ -231,22 +331,42 @@ public class LoopCombinatorTest {
assertEquals("a", loop.invoke());
}
@Test
public static void testDoWhileLoop() throws Throwable {
@Test(dataProvider = "whileLoopTestData")
public static void testDoWhileLoop(MethodHandle MH_zero,
MethodHandle MH_pred,
MethodHandle MH_step,
String messageOrNull) throws Throwable {
// int i = 0; do { ++i; } while (i < limit); return i; => limit
MethodHandle loop = MethodHandles.doWhileLoop(While.MH_zero, While.MH_step, While.MH_pred);
assertEquals(While.MT_while, loop.type());
assertEquals(23, loop.invoke(23));
try {
MethodHandle loop = MethodHandles.doWhileLoop(MH_zero, MH_step, MH_pred);
assert messageOrNull == null;
if (MH_step.type().equals(While.MH_step.type()))
assertEquals(While.MT_while, loop.type());
assertEquals(MH_step.type().dropParameterTypes(0, 1), loop.type());
while (loop.type().parameterCount() > 1) loop = snip(loop);
assertEquals(23, loop.invoke(23));
} catch (IllegalArgumentException iae) {
assert messageOrNull != null;
if (!messageOrNull.equals(iae.getMessage())) {
// just issue a warning
System.out.println("*** "+messageOrNull+"\n != "+iae.getMessage());
}
}
}
@Test
public static void testDoWhileNullInit() throws Throwable {
While w = new While();
int v = 5;
MethodHandle loop = MethodHandles.doWhileLoop(null, While.MH_voidBody.bindTo(w), While.MH_voidPred.bindTo(w));
assertEquals(While.MT_void, loop.type());
loop.invoke(v);
assertEquals(v, w.i);
public static void testDoWhileBadInit() throws Throwable {
boolean caught = false;
try {
While w = new While();
MethodHandle loop = MethodHandles.doWhileLoop(MethodHandles.empty(methodType(char.class)),
While.MH_voidBody.bindTo(w),
While.MH_voidPred.bindTo(w));
} catch (IllegalArgumentException iae) {
assertEquals("loop initializer must match: ()char != (int)void", iae.getMessage());
caught = true;
}
assertTrue(caught);
}
@Test
@ -260,13 +380,18 @@ public class LoopCombinatorTest {
}
@Test
public static void testWhileNullInit() throws Throwable {
While w = new While();
int v = 5;
MethodHandle loop = MethodHandles.whileLoop(null, While.MH_voidPred.bindTo(w), While.MH_voidBody.bindTo(w));
assertEquals(While.MT_void, loop.type());
loop.invoke(v);
assertEquals(v, w.i);
public static void testWhileBadInit() throws Throwable {
boolean caught = false;
try {
While w = new While();
MethodHandle loop = MethodHandles.whileLoop(MethodHandles.empty(methodType(void.class, char.class)),
While.MH_voidPred.bindTo(w),
While.MH_voidBody.bindTo(w));
} catch (IllegalArgumentException iae) {
assertEquals("loop initializer must match: (char)void != (int)void", iae.getMessage());
caught = true;
}
assertTrue(caught);
}
@Test
@ -291,10 +416,26 @@ public class LoopCombinatorTest {
assertEquals(v, w.i);
}
@DataProvider
static Object[][] nullArgs() {
MethodHandle c = MethodHandles.constant(int.class, 1);
return new Object[][]{{null, c}, {c, null}};
}
@Test(dataProvider = "nullArgs", expectedExceptions = NullPointerException.class)
public static void testWhileNullArgs(MethodHandle pred, MethodHandle body) {
MethodHandles.whileLoop(null, pred, body);
}
@Test(dataProvider = "nullArgs", expectedExceptions = NullPointerException.class)
public static void testDoWhileNullArgs(MethodHandle body, MethodHandle pred) {
MethodHandles.whileLoop(null, body, pred);
}
@Test
public static void testCountedLoop() throws Throwable {
// String s = "Lambdaman!"; for (int i = 0; i < 13; ++i) { s = "na " + s; } return s; => a variation on a well known theme
MethodHandle fit13 = MethodHandles.constant(int.class, 13);
MethodHandle fit13 = MethodHandles.dropArguments(MethodHandles.constant(int.class, 13), 0, String.class);
MethodHandle loop = MethodHandles.countedLoop(fit13, Counted.MH_start, Counted.MH_step);
assertEquals(Counted.MT_counted, loop.type());
assertEquals("na na na na na na na na na na na na na Lambdaman!", loop.invoke("Lambdaman!"));
@ -303,9 +444,25 @@ public class LoopCombinatorTest {
@Test
public static void testCountedLoopVoidInit() throws Throwable {
MethodHandle fit5 = MethodHandles.constant(int.class, 5);
MethodHandle loop = MethodHandles.countedLoop(fit5, MethodHandles.zero(void.class), Counted.MH_printHello);
assertEquals(Counted.MT_countedPrinting, loop.type());
loop.invoke();
for (int i = 0; i < 8; i++) {
MethodHandle zero = MethodHandles.zero(void.class);
MethodHandle init = fit5;
MethodHandle body = Counted.MH_printHello;
boolean useNull = (i & 1) != 0, addInitArg = (i & 2) != 0, addBodyArg = (i & 4) != 0;
if (useNull) zero = null;
if (addInitArg) init = MethodHandles.dropArguments(init, 0, int.class);
if (addBodyArg) body = MethodHandles.dropArguments(body, 1, int.class);
System.out.println("testCountedLoopVoidInit i="+i+" : "+Arrays.asList(init, zero, body));
MethodHandle loop = MethodHandles.countedLoop(init, zero, body);
MethodType expectedType = Counted.MT_countedPrinting;
if (addInitArg || addBodyArg)
expectedType = expectedType.insertParameterTypes(0, int.class);
assertEquals(expectedType, loop.type());
if (addInitArg || addBodyArg)
loop.invoke(99);
else
loop.invoke();
}
}
@Test
@ -327,7 +484,7 @@ public class LoopCombinatorTest {
loop.invoke();
}
@Test
@Test(expectedExceptions = NullPointerException.class)
public static void testCountedLoopNullBody() throws Throwable {
MethodHandle h5 = MethodHandles.constant(int.class, 5);
MethodHandle h13 = MethodHandles.constant(int.class, 13);
@ -336,14 +493,14 @@ public class LoopCombinatorTest {
assertEquals(13, loop.invoke());
}
@Test
@Test(expectedExceptions = NullPointerException.class)
public static void testCountedLoopNullIterations() throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(null, null, null);
assertEquals(methodType(void.class), loop.type());
loop.invoke();
}
@Test
@Test(expectedExceptions = NullPointerException.class)
public static void testCountedLoopNullInitAndBody() throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null, null);
assertEquals(methodType(void.class), loop.type());
@ -352,45 +509,63 @@ public class LoopCombinatorTest {
@DataProvider
static Object[][] countedLoopBodyParameters() {
Class<?> V = String.class, I = int.class, A = List.class;
// return types are of these forms:
// {count = int(A...), init = V(A...), body = V(V, I, A...)}
return new Object[][] {
{methodType(String.class), methodType(String.class, int.class)},
{methodType(String.class, List.class), methodType(String.class, int.class)},
{methodType(String.class, List.class), methodType(String.class, int.class, String.class)}
// body leads determining A...
{methodType(I), methodType(V), methodType(V, V, I)},
{methodType(I), methodType(V), methodType(V, V, I, A)},
{methodType(I,A), methodType(V), methodType(V, V, I, A)},
{methodType(I), methodType(V,A), methodType(V, V, I, A)},
// body leads, with void V
{methodType(I), methodType(void.class), methodType(void.class, I)},
{methodType(I), methodType(void.class), methodType(void.class, I, A)},
{methodType(I,A), methodType(void.class), methodType(void.class, I, A)},
{methodType(I), methodType(void.class,A), methodType(void.class, I, A)},
// count leads determining A..., but only if body drops all A...
{methodType(I,A), methodType(V), methodType(V, V, I)},
{methodType(I,A), methodType(V,A), methodType(V, V, I)},
// count leads, with void V
{methodType(I,A), methodType(void.class), methodType(void.class, I)},
{methodType(I,A), methodType(void.class,A), methodType(void.class, I)},
};
}
@Test(dataProvider = "countedLoopBodyParameters")
public static void testCountedLoopBodyParameters(MethodType initType, MethodType bodyType) throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5),
MethodHandles.empty(initType), MethodHandles.empty(bodyType));
assertEquals(initType, loop.type());
public static void testCountedLoopBodyParameters(MethodType countType, MethodType initType, MethodType bodyType) throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(
MethodHandles.empty(countType),
initType == null ? null : MethodHandles.empty(initType),
MethodHandles.empty(bodyType));
// The rule: If body takes the minimum number of parameters, then take what countType offers.
// The initType has to just roll with whatever the other two agree on.
int innerParams = (bodyType.returnType() == void.class ? 1 : 2);
MethodType expectType = bodyType.dropParameterTypes(0, innerParams);
if (expectType.parameterCount() == 0)
expectType = expectType.insertParameterTypes(0, countType.parameterList());
assertEquals(expectType, loop.type());
}
@DataProvider
static Object[][] countedLoopTypes() {
return new Object[][]{{void.class}, {int.class}, {Object.class}, {String.class}, {List.class}};
}
@Test(dataProvider = "countedLoopTypes")
public static void testCountedLoopBodyParametersNullInit(Class<?> t) throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null,
MethodHandles.empty(methodType(t, int.class)));
assertEquals(methodType(t), loop.type());
loop.invoke();
@Test(dataProvider = "countedLoopBodyParameters")
public static void testCountedLoopBodyParametersNullInit(MethodType countType, MethodType initType, MethodType bodyType) throws Throwable {
testCountedLoopBodyParameters(countType, null, bodyType);
}
@Test
public static void testCountedLoopStateDefinedByBody() throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null, Counted.MH_stateBody);
public static void testCountedLoopStateInitializedToNull() throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5),
MethodHandles.empty(methodType(String.class)), Counted.MH_stateBody);
assertEquals(Counted.MT_bodyDeterminesState, loop.type());
assertEquals("sssssnull01234", loop.invoke());
}
@Test
public static void testCountedLoopArgsDefinedByIterations() throws Throwable {
MethodHandle loop = MethodHandles.countedLoop(
MethodHandles.dropArguments(MethodHandles.constant(int.class, 3), 0, String.class),
null, Counted.MH_append);
MethodHandle iterations =
MethodHandles.dropArguments(MethodHandles.constant(int.class, 3), 0, String.class);
MethodHandle loop = MethodHandles.countedLoop(iterations,
MethodHandles.empty(iterations.type().changeReturnType(String.class)), Counted.MH_append);
assertEquals(Counted.MT_iterationsDefineArgs, loop.type());
assertEquals("hello012", loop.invoke("hello"));
}
@ -420,7 +595,8 @@ public class LoopCombinatorTest {
@Test
public static void testCountedLoopEmpty() throws Throwable {
// for (int i = 0; i < 5; ++i) { /* empty */ }
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null, null);
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null,
MethodHandles.empty(methodType(void.class, int.class)));
assertEquals(methodType(void.class), loop.type());
loop.invoke();
}
@ -429,11 +605,45 @@ public class LoopCombinatorTest {
public static void testCountedRangeLoopEmpty() throws Throwable {
// for (int i = -5; i < 5; ++i) { /* empty */ }
MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, -5),
MethodHandles.constant(int.class, 5), null, null);
MethodHandles.constant(int.class, 5), null, MethodHandles.empty(methodType(void.class, int.class)));
assertEquals(methodType(void.class), loop.type());
loop.invoke();
}
@DataProvider
static Object[][] countedLoopNegativeData() {
MethodHandle dummy = MethodHandles.zero(void.class);
MethodHandle one = MethodHandles.constant(int.class, 1);
MethodHandle oneString = MethodHandles.dropArguments(one, 0, String.class);
MethodHandle oneDouble = MethodHandles.dropArguments(one, 0, double.class);
return new Object[][]{
{dummy, one, dummy, dummy, String.format("start/end must return int %s, %s", dummy, one)},
{one, dummy, dummy, dummy, String.format("start/end must return int %s, %s", one, dummy)},
{oneString, oneDouble, dummy, dummy,
String.format("start and end parameter types must match: %s != %s", oneString.type(),
oneDouble.type())},
{oneString, oneString, dummy, dummy,
String.format("start/end and init parameter types must match: %s != %s", oneString.type(),
dummy.type())},
{one, one, null, dummy, String.format("actual and expected body signatures must match: %s != %s",
dummy.type(), dummy.type().appendParameterTypes(int.class))}
};
}
@Test(dataProvider = "countedLoopNegativeData")
public static void testCountedLoopNegative(MethodHandle start, MethodHandle end, MethodHandle init,
MethodHandle body, String msg) {
if (true) return; //%%%FIXME%%%%
boolean caught = false;
try {
MethodHandles.countedLoop(start, end, init, body);
} catch (IllegalArgumentException iae) {
assertEquals(msg, iae.getMessage());
caught = true;
}
assertTrue(caught);
}
@Test
public static void testIterateSum() throws Throwable {
// Integer[] a = new Integer[]{1,2,3,4,5,6}; int sum = 0; for (int e : a) { sum += e; } return sum; => 21
@ -442,50 +652,106 @@ public class LoopCombinatorTest {
assertEquals(21, loop.invoke(new Integer[]{1, 2, 3, 4, 5, 6}));
}
@Test
public static void testIterateReverse() throws Throwable {
MethodHandle loop = MethodHandles.iteratedLoop(null, Iterate.MH_reverseInit, Iterate.MH_reverseStep);
assertEquals(Iterate.MT_reverse, loop.type());
List<String> list = Arrays.asList("a", "b", "c", "d", "e");
List<String> reversedList = Arrays.asList("e", "d", "c", "b", "a");
assertEquals(reversedList, (List<String>) loop.invoke(list));
@DataProvider
static Object[][] iteratorInits() {
return new Object[][]{{Iterate.MH_iteratorFromList}, {Iterate.MH_iteratorFromIterable}, {null}};
}
@Test
public static void testIterateLength() throws Throwable {
MethodHandle loop = MethodHandles.iteratedLoop(null, Iterate.MH_lengthInit, Iterate.MH_lengthStep);
assertEquals(Iterate.MT_length, loop.type());
List<Double> list = Arrays.asList(23.0, 148.0, 42.0);
assertEquals(list.size(), (int) loop.invoke(list));
@Test(dataProvider = "iteratorInits")
public static void testIterateReverse(MethodHandle iterator) throws Throwable {
// this test uses List as its loop state type; don't try to change that
if (iterator != null)
iterator = iterator.asType(iterator.type().changeParameterType(0, List.class));
for (int i = 0; i < 4; i++) {
MethodHandle init = Iterate.MH_reverseInit, body = Iterate.MH_reverseStep;
boolean snipInit = (i & 1) != 0, snipBody = (i & 2) != 0;
if (snipInit) init = snip(init);
if (snipBody) body = snip(body);
if (!snipInit && snipBody && iterator == null) {
// Body does not determine (A...), so the default guy just picks Iterable.
// If body insisted on (List), the default guy would adjust himself.
// Init has no authority to change the (A...), so must patch init.
// All according to plan!
init = slap(snip(init), Iterable.class);
}
System.out.println("testIterateReverse i="+i+" : "+Arrays.asList(iterator, init, body));
MethodHandle loop = MethodHandles.iteratedLoop(iterator, init, body);
MethodType expectedType = Iterate.MT_reverse;
if (iterator == null && i >= 2)
expectedType = expectedType.changeParameterType(0, Iterable.class);
assertEquals(expectedType, loop.type());
List<String> list = Arrays.asList("a", "b", "c", "d", "e");
List<String> reversedList = Arrays.asList("e", "d", "c", "b", "a");
assertEquals(reversedList, (List<String>) loop.invoke(list));
}
}
@Test
public static void testIterateMap() throws Throwable {
MethodHandle loop = MethodHandles.iteratedLoop(null, Iterate.MH_mapInit, Iterate.MH_mapStep);
assertEquals(Iterate.MT_map, loop.type());
List<String> list = Arrays.asList("Hello", "world", "!");
List<String> upList = Arrays.asList("HELLO", "WORLD", "!");
assertEquals(upList, (List<String>) loop.invoke(list));
@Test(dataProvider = "iteratorInits")
public static void testIterateLength(MethodHandle iterator) throws Throwable {
MethodHandle body = Iterate.MH_lengthStep;
MethodHandle init = Iterate.MH_lengthInit;
MethodType expectedType = Iterate.MT_length;
int barity = body.type().parameterCount();
Class<?> iteratorSource = iterator == null ? null : iterator.type().parameterType(0);
if (iterator != null && iteratorSource != body.type().parameterType(barity-1)) {
// adjust body to accept the other type
body = body.asType(body.type().changeParameterType(barity-1, iteratorSource));
init = init.asType(init.type().changeParameterType(0, iteratorSource));
expectedType = expectedType.changeParameterType(0, iteratorSource);
}
for (;; init = snip(init)) {
System.out.println("testIterateLength.init = "+init);
MethodHandle loop = MethodHandles.iteratedLoop(iterator, init, body);
assertEquals(expectedType, loop.type());
List<Double> list = Arrays.asList(23.0, 148.0, 42.0);
assertEquals(list.size(), (int) loop.invoke(list));
if (init == null) break;
}
}
@Test
public static void testIteratePrint() throws Throwable {
MethodHandle loop = MethodHandles.iteratedLoop(null, null, Iterate.MH_printStep);
assertEquals(Iterate.MT_print, loop.type());
@Test(dataProvider = "iteratorInits")
public static void testIterateMap(MethodHandle iterator) throws Throwable {
MethodHandle body = Iterate.MH_mapStep;
MethodHandle init = Iterate.MH_mapInit;
MethodType expectedType = Iterate.MT_map;
int barity = body.type().parameterCount();
Class<?> iteratorSource = iterator == null ? null : iterator.type().parameterType(0);
if (iterator != null && iteratorSource != body.type().parameterType(barity-1)) {
// adjust body to accept the other type
body = body.asType(body.type().changeParameterType(barity-1, iteratorSource));
init = init.asType(init.type().changeParameterType(0, iteratorSource));
expectedType = expectedType.changeParameterType(0, iteratorSource);
}
for (; init != null; init = snip(init)) {
System.out.println("testIterateMap.init = "+init);
MethodHandle loop = MethodHandles.iteratedLoop(iterator, init, body);
assertEquals(expectedType, loop.type());
List<String> list = Arrays.asList("Hello", "world", "!");
List<String> upList = Arrays.asList("HELLO", "WORLD", "!");
assertEquals(upList, (List<String>) loop.invoke(list));
}
}
@Test(dataProvider = "iteratorInits")
public static void testIteratePrint(MethodHandle iterator) throws Throwable {
MethodHandle body = Iterate.MH_printStep;
MethodType expectedType = Iterate.MT_print;
int barity = body.type().parameterCount();
Class<?> iteratorSource = iterator == null ? null : iterator.type().parameterType(0);
if (iterator != null && iteratorSource != body.type().parameterType(barity-1)) {
// adjust body to accept the other type
body = body.asType(body.type().changeParameterType(barity-1, iteratorSource));
expectedType = expectedType.changeParameterType(0, iteratorSource);
}
MethodHandle loop = MethodHandles.iteratedLoop(iterator, null, body);
assertEquals(expectedType, loop.type());
loop.invoke(Arrays.asList("hello", "world"));
}
@Test
@Test(expectedExceptions = NullPointerException.class)
public static void testIterateNullBody() {
boolean caught = false;
try {
MethodHandles.iteratedLoop(MethodHandles.empty(methodType(Iterator.class, int.class)),
MethodHandles.identity(int.class), null);
} catch (IllegalArgumentException iae) {
assertEquals("iterated loop body must not be null", iae.getMessage());
caught = true;
}
assertTrue(caught);
MethodHandles.iteratedLoop(MethodHandles.empty(methodType(Iterator.class, int.class)),
MethodHandles.identity(int.class), null);
}
@DataProvider
@ -500,15 +766,18 @@ public class LoopCombinatorTest {
try {
MethodHandles.iteratedLoop(MethodHandles.empty(v), null, MethodHandles.empty(v));
} catch(IllegalArgumentException iae) {
assertEquals("iteratedLoop first argument must have Iterator return type", iae.getMessage());
assertEqualsFIXME("iteratedLoop first argument must have Iterator return type", iae.getMessage());
caught = true;
}
assertTrue(caught);
}
@Test
public static void testIterateVoidInit() throws Throwable {
MethodHandle loop = MethodHandles.iteratedLoop(null, Iterate.MH_voidInit, Iterate.MH_printStep);
@Test(dataProvider = "iteratorInits")
public static void testIterateVoidInit(MethodHandle iterator) throws Throwable {
// this test uses List as its loop state type; don't try to change that
if (iterator != null)
iterator = iterator.asType(iterator.type().changeParameterType(0, List.class));
MethodHandle loop = MethodHandles.iteratedLoop(iterator, Iterate.MH_voidInit, Iterate.MH_printStep);
assertEquals(Iterate.MT_print, loop.type());
loop.invoke(Arrays.asList("hello", "world"));
}
@ -516,60 +785,79 @@ public class LoopCombinatorTest {
@DataProvider
static Object[][] iterateParameters() {
MethodType i = methodType(int.class);
MethodType sil_i = methodType(int.class, String.class, int.class, List.class);
MethodType sil_v = methodType(void.class, String.class, int.class, List.class);
MethodType isl_i = methodType(int.class, int.class, String.class, List.class);
MethodType isli_i = methodType(int.class, int.class, String.class, List.class, int.class);
MethodType sl_v = methodType(void.class, String.class, List.class);
MethodType sli_v = methodType(void.class, String.class, List.class, int.class);
MethodType l_it = methodType(Iterator.class, List.class);
MethodType li_i = methodType(int.class, List.class, int.class);
MethodType li_it = methodType(Iterator.class, List.class, int.class);
MethodType il_it = methodType(Iterator.class, int.class, List.class);
MethodType l_i = methodType(int.class, List.class);
MethodType _it = methodType(Iterator.class);
MethodType si_i = methodType(int.class, String.class, int.class);
MethodType s_i = methodType(int.class, String.class);
return new Object[][]{
{null, null, sl_v},
{null, i, sil_i},
{null, l_i, sil_i},
{l_it, null, sl_v},
{l_it, i, sil_i},
{li_it, l_i, sil_i},
{l_it, null, sil_i},
{li_it, null, sl_v},
{_it, l_i, si_i},
{_it, l_i, s_i}
{l_it, null, sl_v, ""},
{l_it, l_i, isl_i, ""},
{l_it, null, sl_v, ""},
{li_it, li_i, isli_i, ""},
{il_it, null, sil_v, "inferred first loop argument must inherit from Iterable: int"},
{li_it, null, sli_v, ""},
{sl_v, null, sl_v, "iteratedLoop first argument must have Iterator return type"},
{li_it, l_it, sl_v,
String.format("iterator and init parameter lists must match: %s != %s", li_it, l_it)},
{li_it, li_i, isl_i,
String.format("body types (regard parameter types after index 0, and result type) must match: %s != %s",
isl_i, isl_i.dropParameterTypes(0, 1).appendParameterTypes(int.class))}
};
}
@Test(dataProvider = "iterateParameters")
public static void testIterateParameters(MethodType it, MethodType in, MethodType bo) throws Throwable {
public static void testIterateParameters(MethodType it, MethodType in, MethodType bo, String msg) {
boolean negative = !msg.isEmpty();
MethodHandle iterator = it == null ? null : MethodHandles.empty(it);
MethodHandle init = in == null ? null : MethodHandles.empty(in);
MethodHandle loop = MethodHandles.iteratedLoop(iterator, init, MethodHandles.empty(bo));
MethodType lt = loop.type();
if (it == null && in == null) {
assertEquals(bo.dropParameterTypes(0, 1), lt);
} else if (it == null) {
if (in.parameterCount() == 0) {
assertEquals(bo.dropParameterTypes(0, in.returnType() == void.class ? 1 : 2), lt);
} else {
assertEquals(methodType(bo.returnType(), in.parameterArray()), lt);
boolean caught = false;
MethodHandle loop = null;
try {
loop = MethodHandles.iteratedLoop(iterator, init, MethodHandles.empty(bo));
} catch (Throwable t) {
if (!negative) {
throw t;
}
} else if (in == null) {
assertEquals(methodType(bo.returnType(), it.parameterArray()), lt);
} else if (it.parameterCount() > in.parameterCount()) {
assertEquals(methodType(bo.returnType(), it.parameterArray()), lt);
} else if (it.parameterCount() < in.parameterCount()) {
assertEquals(methodType(bo.returnType(), in.parameterArray()), lt);
assertEqualsFIXME(msg, t.getMessage());
caught = true;
}
if (negative) {
assertTrue(caught);
} else {
// both it, in present; with equal parameter list lengths
assertEquals(it.parameterList(), lt.parameterList());
assertEquals(in.parameterList(), lt.parameterList());
assertEquals(bo.returnType(), lt.returnType());
MethodType lt = loop.type();
if (it == null && in == null) {
assertEquals(bo.dropParameterTypes(0, 1), lt);
} else if (it == null) {
if (in.parameterCount() == 0) {
assertEquals(bo.dropParameterTypes(0, in.returnType() == void.class ? 1 : 2), lt);
} else {
assertEquals(methodType(bo.returnType(), in.parameterArray()), lt);
}
} else if (in == null) {
assertEquals(methodType(bo.returnType(), it.parameterArray()), lt);
} else if (it.parameterCount() > in.parameterCount()) {
assertEquals(methodType(bo.returnType(), it.parameterArray()), lt);
} else if (it.parameterCount() < in.parameterCount()) {
assertEquals(methodType(bo.returnType(), in.parameterArray()), lt);
} else {
// both it, in present; with equal parameter list lengths
assertEquals(it.parameterList(), lt.parameterList());
assertEquals(in.parameterList(), lt.parameterList());
assertEquals(bo.returnType(), lt.returnType());
}
}
}
@Test
public static void testIteratorSubclass() throws Throwable {
MethodHandle loop = MethodHandles.iteratedLoop(MethodHandles.empty(methodType(BogusIterator.class, List.class)),
null, MethodHandles.empty(methodType(void.class, String.class)));
null, MethodHandles.empty(methodType(void.class, String.class, List.class)));
assertEquals(methodType(void.class, List.class), loop.type());
}
@ -892,7 +1180,7 @@ public class LoopCombinatorTest {
return arg;
}
static String step(int counter, String v, String arg) {
static String step(String v, int counter) {
return "na " + v;
}
@ -904,15 +1192,15 @@ public class LoopCombinatorTest {
System.out.print("hello");
}
static int addCounter(int counter, int x) {
static int addCounter(int x, int counter) {
return x + counter;
}
static String stateBody(int counter, String s) {
static String stateBody(String s, int counter) {
return "s" + s + counter;
}
static String append(int counter, String localState, String loopArg) {
static String append(String localState, int counter, String loopArg) {
if (null == localState) {
return loopArg + counter;
}
@ -922,12 +1210,12 @@ public class LoopCombinatorTest {
static final Class<Counted> COUNTED = Counted.class;
static final MethodType MT_start = methodType(String.class, String.class);
static final MethodType MT_step = methodType(String.class, int.class, String.class, String.class);
static final MethodType MT_step = methodType(String.class, String.class, int.class);
static final MethodType MT_stepUpdateArray = methodType(void.class, int.class, int[].class);
static final MethodType MT_printHello = methodType(void.class, int.class);
static final MethodType MT_addCounter = methodType(int.class, int.class, int.class);
static final MethodType MT_stateBody = methodType(String.class, int.class, String.class);
static final MethodType MT_append = methodType(String.class, int.class, String.class, String.class);
static final MethodType MT_stateBody = methodType(String.class, String.class, int.class);
static final MethodType MT_append = methodType(String.class, String.class, int.class, String.class);
static final MethodHandle MH_13;
static final MethodHandle MH_m5;
@ -984,7 +1272,7 @@ public class LoopCombinatorTest {
return new ArrayList<>();
}
static List<String> reverseStep(String e, List<String> r, List<String> l) {
static List<String> reverseStep(List<String> r, String e, List<String> l) {
r.add(0, e);
return r;
}
@ -993,7 +1281,7 @@ public class LoopCombinatorTest {
return 0;
}
static int lengthStep(Object o, int len, List<Double> l) {
static int lengthStep(int len, Object o, List<Double> l) {
return len + 1;
}
@ -1001,7 +1289,7 @@ public class LoopCombinatorTest {
return new ArrayList<>();
}
static List<String> mapStep(String e, List<String> r, List<String> l) {
static List<String> mapStep(List<String> r, String e, List<String> l) {
r.add(e.toUpperCase());
return r;
}
@ -1010,10 +1298,18 @@ public class LoopCombinatorTest {
System.out.print(s);
}
static void voidInit() {
static void voidInit(List<String> l) {
// empty
}
static ListIterator<?> iteratorFromList(List<?> l) {
return l.listIterator();
}
static Iterator<?> iteratorFromIterable(Iterable<?> l) {
return l.iterator();
}
static final Class<Iterate> ITERATE = Iterate.class;
static final MethodType MT_sumIterator = methodType(Iterator.class, Integer[].class);
@ -1024,12 +1320,15 @@ public class LoopCombinatorTest {
static final MethodType MT_mapInit = methodType(List.class, List.class);
static final MethodType MT_sumStep = methodType(int.class, int.class, int.class, Integer[].class);
static final MethodType MT_reverseStep = methodType(List.class, String.class, List.class, List.class);
static final MethodType MT_lengthStep = methodType(int.class, Object.class, int.class, List.class);
static final MethodType MT_mapStep = methodType(List.class, String.class, List.class, List.class);
static final MethodType MT_reverseStep = methodType(List.class, List.class, String.class, List.class);
static final MethodType MT_lengthStep = methodType(int.class, int.class, Object.class, List.class);
static final MethodType MT_mapStep = methodType(List.class, List.class, String.class, List.class);
static final MethodType MT_printStep = methodType(void.class, String.class, List.class);
static final MethodType MT_voidInit = methodType(void.class);
static final MethodType MT_voidInit = methodType(void.class, List.class);
static final MethodType MT_iteratorFromList = methodType(ListIterator.class, List.class);
static final MethodType MT_iteratorFromIterable = methodType(Iterator.class, Iterable.class);
static final MethodHandle MH_sumIterator;
static final MethodHandle MH_sumInit;
@ -1047,6 +1346,9 @@ public class LoopCombinatorTest {
static final MethodHandle MH_voidInit;
static final MethodHandle MH_iteratorFromList;
static final MethodHandle MH_iteratorFromIterable;
static final MethodType MT_sum = methodType(int.class, Integer[].class);
static final MethodType MT_reverse = methodType(List.class, List.class);
static final MethodType MT_length = methodType(int.class, List.class);
@ -1066,6 +1368,8 @@ public class LoopCombinatorTest {
MH_mapStep = LOOKUP.findStatic(ITERATE, "mapStep", MT_mapStep);
MH_printStep = LOOKUP.findStatic(ITERATE, "printStep", MT_printStep);
MH_voidInit = LOOKUP.findStatic(ITERATE, "voidInit", MT_voidInit);
MH_iteratorFromList = LOOKUP.findStatic(ITERATE, "iteratorFromList", MT_iteratorFromList);
MH_iteratorFromIterable = LOOKUP.findStatic(ITERATE, "iteratorFromIterable", MT_iteratorFromIterable);
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}

140
jdk/test/java/security/Signature/ResetAfterException.java Normal file
View File

@ -0,0 +1,140 @@
/*
* 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 8149802
* @summary Ensure that Signature objects are reset after verification errored out.
*/
import java.util.Arrays;
import java.security.*;
public class ResetAfterException {
public static void main(String[] args) throws Exception {
byte[] data = "data to be signed".getBytes();
byte[] shortBuffer = new byte[2];
Provider[] provs = Security.getProviders();
boolean failed = false;
for (Provider p : provs) {
Signature sig;
try {
sig = Signature.getInstance("SHA256withRSA", p);
} catch (NoSuchAlgorithmException nsae) {
// no support, skip
continue;
}
boolean res = true;
System.out.println("Testing Provider: " + p.getName());
KeyPairGenerator keyGen = null;
try {
// It's possible that some provider, e.g. SunMSCAPI,
// doesn't work well with keys from other providers
// so we use the same provider to generate key first
keyGen = KeyPairGenerator.getInstance("RSA", p);
} catch (NoSuchAlgorithmException nsae) {
keyGen = KeyPairGenerator.getInstance("RSA");
}
if (keyGen == null) {
throw new RuntimeException("Error: No support for RSA KeyPairGenerator");
}
keyGen.initialize(1024);
KeyPair keyPair = keyGen.generateKeyPair();
sig.initSign(keyPair.getPrivate());
sig.update(data);
byte[] signature = sig.sign();
// First check signing
try {
sig.update(data);
// sign with short output buffer to cause exception
int len = sig.sign(shortBuffer, 0, shortBuffer.length);
System.out.println("FAIL: Should throw SE with short buffer");
res = false;
} catch (SignatureException e) {
// expected exception; ignore
System.out.println("Expected Ex for short output buffer: " + e);
}
// Signature object should reset after a failed generation
sig.update(data);
byte[] signature2 = sig.sign();
if (!Arrays.equals(signature, signature2)) {
System.out.println("FAIL: Generated different signature");
res = false;
} else {
System.out.println("Generated same signature");
}
// Now, check signature verification
sig.initVerify(keyPair.getPublic());
sig.update(data);
try {
// first verify with valid signature bytes
res = sig.verify(signature);
} catch (SignatureException e) {
System.out.println("FAIL: Valid signature rejected");
e.printStackTrace();
res = false;
}
try {
sig.update(data);
// verify with short signaure to cause exception
if (sig.verify(shortBuffer)) {
System.out.println("FAIL: Invalid signature verified");
res = false;
} else {
System.out.println("Invalid signature rejected");
}
} catch (SignatureException e) {
// expected exception; ignore
System.out.println("Expected Ex for short output buffer: " + e);
}
// Signature object should reset after an a failed verification
sig.update(data);
try {
// verify with valid signature bytes again
res = sig.verify(signature);
if (!res) {
System.out.println("FAIL: Valid signature is rejected");
} else {
System.out.println("Valid signature is accepted");
}
} catch (GeneralSecurityException e) {
System.out.println("FAIL: Valid signature is rejected");
e.printStackTrace();
res = false;
}
failed |= !res;
}
if (failed) {
throw new RuntimeException("One or more test failed");
} else {
System.out.println("Test Passed");
}
}
}

18
jdk/test/java/text/Format/NumberFormat/DFSSerialization.java
View File

@ -27,13 +27,21 @@
* @library /java/text/testlib
* @build DFSSerialization IntlTest HexDumpReader
* @run main DFSSerialization
* @summary Three different tests are done. 1.read from the object created using jdk1.4.2 2.create a valid DecimalFormatSymbols object with current JDK, then read the object 3.Try to create an valid DecimalFormatSymbols object by passing null to set null for the exponent separator symbol. Expect the NullPointerException.
* @summary Three different tests are done.
* 1. read from the object created using jdk1.4.2
* 2. create a valid DecimalFormatSymbols object with current JDK, then read the object
* 3. Try to create an valid DecimalFormatSymbols object by passing null to set null
* for the exponent separator symbol. Expect the NullPointerException.
*/
import java.awt.*;
import java.text.*;
import java.util.*;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
public class DFSSerialization extends IntlTest{
public static void main(String[] args) throws Exception {

11
jdk/test/java/text/Format/NumberFormat/SerializationLoadTest.java
View File

@ -31,10 +31,13 @@
* @key randomness
*/
import java.awt.*;
import java.text.*;
import java.util.*;
import java.io.*;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.Random;
public class SerializationLoadTest {

8
jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
View File

@ -40,6 +40,7 @@ import java.nio.file.Files;
import java.util.Arrays;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@ -133,11 +134,14 @@ public class MultiReleaseJarAPI {
testCustomMultiReleaseValue(value, Map.of(), expected);
}
private static final AtomicInteger JAR_COUNT = new AtomicInteger(0);
private void testCustomMultiReleaseValue(String value,
Map<String, String> extraAttributes, boolean expected)
throws Exception {
creator.buildCustomMultiReleaseJar("custom-mr.jar", value, extraAttributes);
File custom = new File(userdir, "custom-mr.jar");
String fileName = "custom-mr" + JAR_COUNT.incrementAndGet() + ".jar";
creator.buildCustomMultiReleaseJar(fileName, value, extraAttributes);
File custom = new File(userdir, fileName);
try (JarFile jf = new JarFile(custom, true, ZipFile.OPEN_READ, Runtime.version())) {
Assert.assertEquals(jf.isMultiRelease(), expected);
}

85
jdk/test/javax/crypto/Cipher/EmptyFinalBuffer.java Normal file
View File

@ -0,0 +1,85 @@
/*
* 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 6946830
* @summary Test the Cipher.doFinal() with 0-length buffer
* @key randomness
*/
import java.util.*;
import java.nio.*;
import java.security.*;
import javax.crypto.*;
import javax.crypto.spec.*;
public class EmptyFinalBuffer {
private static final String[] ALGOS = {
"AES/ECB/PKCS5Padding", "AES/CBC/PKCS5Padding"
};
public static void main(String[] args) throws Exception {
Provider[] provs = Security.getProviders();
SecretKey key = new SecretKeySpec(new byte[16], "AES");
boolean testFailed = false;
for (Provider p : provs) {
System.out.println("Testing: " + p.getName());
for (String algo : ALGOS) {
System.out.print("Algo: " + algo);
Cipher c;
try {
c = Cipher.getInstance(algo, p);
} catch (NoSuchAlgorithmException nsae) {
// skip
System.out.println("=> No Support");
continue;
}
c.init(Cipher.ENCRYPT_MODE, key);
AlgorithmParameters params = c.getParameters();
c.init(Cipher.DECRYPT_MODE, key, params);
try {
byte[] out = c.doFinal(new byte[0]);
System.out.println("=> Accepted w/ " +
(out == null? "null" : (out.length + "-byte")) +
" output");
} catch (Exception e) {
testFailed = true;
System.out.println("=> Rejected w/ Exception");
e.printStackTrace();
}
}
}
if (testFailed) {
throw new Exception("One or more tests failed");
} else {
System.out.println("All tests passed");
}
}
}

493
jdk/test/javax/net/ssl/templates/SSLTest.java Normal file
View File

@ -0,0 +1,493 @@
/*
* 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.
*/
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
import java.security.KeyStore;
import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
/**
* Helper class for JSSE tests.
*
* Please run in othervm mode. SunJSSE does not support dynamic system
* properties, no way to re-use system properties in samevm/agentvm mode.
*/
public class SSLTest {
public static final String TEST_SRC = System.getProperty("test.src", ".");
/*
* Where do we find the keystores?
*/
public static final String PATH_TO_STORES = "../etc";
public static final String KEY_STORE_FILE = "keystore";
public static final String TRUST_STORE_FILE = "truststore";
public static final String PASSWORD = "passphrase";
public static final int FREE_PORT = 0;
// in seconds
public static final long CLIENT_SIGNAL_TIMEOUT = 30L;
public static final long SERVER_SIGNAL_TIMEOUT = 90L;
// in millis
public static final int CLIENT_TIMEOUT = 15000;
public static final int SERVER_TIMEOUT = 30000;
/*
* Should we run the client or server in a separate thread?
* Both sides can throw exceptions, but do you have a preference
* as to which side should be the main thread.
*/
private boolean separateServerThread = false;
/*
* What's the server port? Use any free port by default
*/
private volatile int serverPort;
private volatile Exception serverException;
private volatile Exception clientException;
private Thread clientThread;
private Thread serverThread;
private Peer serverPeer;
private Peer clientPeer;
private Application serverApplication;
private Application clientApplication;
private SSLContext context;
/*
* Is the server ready to serve?
*/
private final CountDownLatch serverCondition = new CountDownLatch(1);
/*
* Is the client ready to handshake?
*/
private final CountDownLatch clientCondition = new CountDownLatch(1);
/*
* Public API.
*/
public static interface Peer {
void run(SSLTest test) throws Exception;
}
public static interface Application {
void run(SSLSocket socket, SSLTest test) throws Exception;
}
public static void debug() {
debug("ssl");
}
public static void debug(String mode) {
System.setProperty("javax.net.debug", mode);
}
public static void setup(String keyFilename, String trustFilename,
String password) {
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", password);
System.setProperty("javax.net.ssl.trustStore", trustFilename);
System.setProperty("javax.net.ssl.trustStorePassword", password);
}
public static void setup() throws Exception {
String keyFilename = TEST_SRC + "/" + PATH_TO_STORES + "/"
+ KEY_STORE_FILE;
String trustFilename = TEST_SRC + "/" + PATH_TO_STORES + "/"
+ TRUST_STORE_FILE;
setup(keyFilename, trustFilename, PASSWORD);
}
public static void print(String message, Throwable... errors) {
synchronized (System.out) {
System.out.println(message);
Arrays.stream(errors).forEach(e -> e.printStackTrace(System.out));
}
}
public static KeyStore loadJksKeyStore(String filename, String password)
throws Exception {
return loadKeyStore(filename, password, "JKS");
}
public static KeyStore loadKeyStore(String filename, String password,
String type) throws Exception {
KeyStore keystore = KeyStore.getInstance(type);
try (FileInputStream fis = new FileInputStream(filename)) {
keystore.load(fis, password.toCharArray());
}
return keystore;
}
public SSLTest setSeparateServerThread(boolean separateServerThread) {
this.separateServerThread = separateServerThread;
return this;
}
public SSLTest setServerPort(int serverPort) {
this.serverPort = serverPort;
return this;
}
public int getServerPort() {
return serverPort;
}
public SSLTest setSSLContext(SSLContext context) {
this.context = context;
return this;
}
public SSLContext getSSLContext() {
return context;
}
public SSLServerSocketFactory getSSLServerSocketFactory() {
if (context != null) {
return context.getServerSocketFactory();
}
return (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
}
public SSLSocketFactory getSSLSocketFactory() {
if (context != null) {
return context.getSocketFactory();
}
return (SSLSocketFactory) SSLSocketFactory.getDefault();
}
public void signalServerReady() {
serverCondition.countDown();
}
public boolean waitForClientSignal(long timeout, TimeUnit unit)
throws InterruptedException {
return clientCondition.await(timeout, unit);
}
public boolean waitForClientSignal() throws InterruptedException {
return waitForClientSignal(CLIENT_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public void signalClientReady() {
clientCondition.countDown();
}
public boolean waitForServerSignal(long timeout, TimeUnit unit)
throws InterruptedException {
return serverCondition.await(timeout, unit);
}
public boolean waitForServerSignal() throws InterruptedException {
return waitForServerSignal(SERVER_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public SSLTest setServerPeer(Peer serverPeer) {
this.serverPeer = serverPeer;
return this;
}
public Peer getServerPeer() {
return serverPeer;
}
public SSLTest setServerApplication(Application serverApplication) {
this.serverApplication = serverApplication;
return this;
}
public Application getServerApplication() {
return serverApplication;
}
public SSLTest setClientPeer(Peer clientPeer) {
this.clientPeer = clientPeer;
return this;
}
public Peer getClientPeer() {
return clientPeer;
}
public SSLTest setClientApplication(Application clientApplication) {
this.clientApplication = clientApplication;
return this;
}
public Application getClientApplication() {
return clientApplication;
}
public void runTest() throws Exception {
if (separateServerThread) {
startServer(true, this);
startClient(false, this);
serverThread.join();
} else {
startClient(true, this);
startServer(false, this);
clientThread.join();
}
if (clientException != null || serverException != null) {
throw new RuntimeException("Test failed");
}
}
public SSLTest() {
serverPeer = (test) -> doServerSide(test);
clientPeer = (test) -> doClientSide(test);
serverApplication = (socket, test) -> runServerApplication(socket);
clientApplication = (socket, test) -> runClientApplication(socket);
}
/*
* Private part.
*/
/*
* Define the server side of the test.
*/
private static void doServerSide(SSLTest test) throws Exception {
SSLServerSocket sslServerSocket;
// kick start the server side service
SSLServerSocketFactory sslssf = test.getSSLServerSocketFactory();
sslServerSocket = (SSLServerSocket)sslssf.createServerSocket(FREE_PORT);
test.setServerPort(sslServerSocket.getLocalPort());
print("Server is listening on port " + test.getServerPort());
// Signal the client, the server is ready to accept connection.
test.signalServerReady();
// Try to accept a connection in 30 seconds.
SSLSocket sslSocket;
try {
sslServerSocket.setSoTimeout(SERVER_TIMEOUT);
sslSocket = (SSLSocket) sslServerSocket.accept();
print("Server accepted connection");
} catch (SocketTimeoutException ste) {
sslServerSocket.close();
// Ignore the test case if no connection within 30 seconds.
print("No incoming client connection in 30 seconds. "
+ "Ignore in server side.", ste);
return;
}
// handle the connection
try {
// Is it the expected client connection?
//
// Naughty test cases or third party routines may try to
// connection to this server port unintentionally. In
// order to mitigate the impact of unexpected client
// connections and avoid intermittent failure, it should
// be checked that the accepted connection is really linked
// to the expected client.
boolean clientIsReady = test.waitForClientSignal();
if (clientIsReady) {
// Run the application in server side.
print("Run server application");
test.getServerApplication().run(sslSocket, test);
} else { // Otherwise, ignore
// We don't actually care about plain socket connections
// for TLS communication testing generally. Just ignore
// the test if the accepted connection is not linked to
// the expected client or the client connection timeout
// in 30 seconds.
print("The client is not the expected one or timeout. "
+ "Ignore in server side.");
}
} finally {
sslSocket.close();
sslServerSocket.close();
}
}
/*
* Define the server side application of the test for the specified socket.
*/
private static void runServerApplication(SSLSocket socket)
throws Exception {
// here comes the test logic
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslIS.read();
sslOS.write(85);
sslOS.flush();
}
/*
* Define the client side of the test.
*/
private static void doClientSide(SSLTest test) throws Exception {
// Wait for server to get started.
//
// The server side takes care of the issue if the server cannot
// get started in 90 seconds. The client side would just ignore
// the test case if the serer is not ready.
boolean serverIsReady = test.waitForServerSignal();
if (!serverIsReady) {
print("The server is not ready yet in 90 seconds. "
+ "Ignore in client side.");
return;
}
SSLSocketFactory sslsf = test.getSSLSocketFactory();
try (SSLSocket sslSocket = (SSLSocket)sslsf.createSocket()) {
try {
sslSocket.connect(
new InetSocketAddress("localhost",
test.getServerPort()), CLIENT_TIMEOUT);
print("Client connected to server");
} catch (IOException ioe) {
// The server side may be impacted by naughty test cases or
// third party routines, and cannot accept connections.
//
// Just ignore the test if the connection cannot be
// established.
print("Cannot make a connection in 15 seconds. "
+ "Ignore in client side.", ioe);
return;
}
// OK, here the client and server get connected.
// Signal the server, the client is ready to communicate.
test.signalClientReady();
// There is still a chance in theory that the server thread may
// wait client-ready timeout and then quit. The chance should
// be really rare so we don't consider it until it becomes a
// real problem.
// Run the application in client side.
print("Run client application");
test.getClientApplication().run(sslSocket, test);
}
}
/*
* Define the client side application of the test for the specified socket.
*/
private static void runClientApplication(SSLSocket socket)
throws Exception {
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslOS.write(280);
sslOS.flush();
sslIS.read();
}
private void startServer(boolean newThread, SSLTest test) throws Exception {
if (newThread) {
serverThread = new Thread() {
@Override
public void run() {
try {
serverPeer.run(test);
} catch (Exception e) {
/*
* Our server thread just died.
*
* Release the client, if not active already...
*/
print("Server died ...", e);
serverException = e;
}
}
};
serverThread.start();
} else {
try {
serverPeer.run(test);
} catch (Exception e) {
print("Server failed ...", e);
serverException = e;
}
}
}
private void startClient(boolean newThread, SSLTest test) throws Exception {
if (newThread) {
clientThread = new Thread() {
@Override
public void run() {
try {
clientPeer.run(test);
} catch (Exception e) {
/*
* Our client thread just died.
*/
print("Client died ...", e);
clientException = e;
}
}
};
clientThread.start();
} else {
try {
clientPeer.run(test);
} catch (Exception e) {
print("Client failed ...", e);
clientException = e;
}
}
}
}

279
jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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
@ -26,7 +26,9 @@
* @bug 4328195
* @summary Need to include the alternate subject DN for certs,
* https should check for this
* @run main/othervm ServerIdentityTest
* @library /javax/net/ssl/templates
* @run main/othervm ServerIdentityTest dnsstore
* @run main/othervm ServerIdentityTest ipstore
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
@ -34,242 +36,71 @@
* @author Yingxian Wang
*/
import java.io.*;
import java.net.*;
import javax.net.ssl.*;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URL;
import java.security.KeyStore;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
public class ServerIdentityTest {
/*
* =============================================================
* Set the various variables needed for the tests, then
* specify what tests to run on each side.
*/
/*
* Should we run the client or server in a separate thread?
* Both sides can throw exceptions, but do you have a preference
* as to which side should be the main thread.
*/
static boolean separateServerThread = true;
/*
* Where do we find the keystores?
*/
static String pathToStores = "./";
static String[] keyStoreFiles = {"dnsstore", "ipstore"};
static String[] trustStoreFiles = {"dnsstore", "ipstore"};
static String passwd = "changeit";
/*
* Is the server ready to serve?
*/
boolean serverReady = false;
/*
* Turn on SSL debugging?
*/
static boolean debug = false;
/*
* If the client or server is doing some kind of object creation
* that the other side depends on, and that thread prematurely
* exits, you may experience a hang. The test harness will
* terminate all hung threads after its timeout has expired,
* currently 3 minutes by default, but you might try to be
* smart about it....
*/
/*
* Define the server side of the test.
*
* If the server prematurely exits, serverReady will be set to true
* to avoid infinite hangs.
*/
void doServerSide() throws Exception {
SSLServerSocketFactory sslssf =
context.getServerSocketFactory();
SSLServerSocket sslServerSocket =
(SSLServerSocket) sslssf.createServerSocket(serverPort);
serverPort = sslServerSocket.getLocalPort();
/*
* Signal Client, we're ready for his connect.
*/
serverReady = true;
SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
OutputStream sslOS = sslSocket.getOutputStream();
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(sslOS));
bw.write("HTTP/1.1 200 OK\r\n\r\n\r\n");
bw.flush();
Thread.sleep(2000);
sslSocket.getSession().invalidate();
sslSocket.close();
}
/*
* Define the client side of the test.
*
* If the server prematurely exits, serverReady will be set to true
* to avoid infinite hangs.
*/
void doClientSide() throws Exception {
/*
* Wait for server to get started.
*/
while (!serverReady) {
Thread.sleep(50);
}
String host = iphost? "127.0.0.1": "localhost";
URL url = new URL("https://"+host+":"+serverPort+"/index.html");
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
is.close();
}
/*
* =============================================================
* The remainder is just support stuff
*/
volatile int serverPort = 0;
volatile Exception serverException = null;
volatile Exception clientException = null;
private static final String PASSWORD = "changeit";
public static void main(String[] args) throws Exception {
SSLSocketFactory reservedSFactory =
HttpsURLConnection.getDefaultSSLSocketFactory();
try {
for (int i = 0; i < keyStoreFiles.length; i++) {
String keyFilename =
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + keyStoreFiles[i];
String trustFilename =
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + trustStoreFiles[i];
final String keystore = args[0];
String keystoreFilename = SSLTest.TEST_SRC + "/" + keystore;
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", passwd);
System.setProperty("javax.net.ssl.trustStore", trustFilename);
System.setProperty("javax.net.ssl.trustStorePassword", passwd);
SSLTest.setup(keystoreFilename, keystoreFilename, PASSWORD);
if (debug)
System.setProperty("javax.net.debug", "all");
SSLContext context = SSLContext.getInstance("SSL");
SSLContext context = SSLContext.getInstance("SSL");
KeyManager[] kms = new KeyManager[1];
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = new FileInputStream(keyFilename);
ks.load(fis, passwd.toCharArray());
fis.close();
KeyManager km = new MyKeyManager(ks, passwd.toCharArray());
kms[0] = km;
context.init(kms, null, null);
HttpsURLConnection.setDefaultSSLSocketFactory(
context.getSocketFactory());
/*
* Start the tests.
*/
System.out.println("Testing " + keyFilename);
new ServerIdentityTest(context, keyStoreFiles[i]);
}
} finally {
HttpsURLConnection.setDefaultSSLSocketFactory(reservedSFactory);
}
}
Thread clientThread = null;
Thread serverThread = null;
/*
* Primary constructor, used to drive remainder of the test.
*
* Fork off the other side, then do your work.
*/
SSLContext context;
boolean iphost = false;
ServerIdentityTest(SSLContext context, String keystore)
throws Exception {
this.context = context;
iphost = keystore.equals("ipstore");
if (separateServerThread) {
startServer(true);
startClient(false);
} else {
startClient(true);
startServer(false);
}
KeyManager[] kms = new KeyManager[1];
KeyStore ks = SSLTest.loadJksKeyStore(keystoreFilename, PASSWORD);
KeyManager km = new MyKeyManager(ks, PASSWORD.toCharArray());
kms[0] = km;
context.init(kms, null, null);
HttpsURLConnection.setDefaultSSLSocketFactory(
context.getSocketFactory());
/*
* Wait for other side to close down.
* Start the test.
*/
if (separateServerThread) {
serverThread.join();
} else {
clientThread.join();
}
System.out.println("Testing " + keystore);
/*
* When we get here, the test is pretty much over.
*
* If the main thread excepted, that propagates back
* immediately. If the other thread threw an exception, we
* should report back.
*/
if (serverException != null)
throw serverException;
if (clientException != null)
throw clientException;
}
void startServer(boolean newThread) throws Exception {
if (newThread) {
serverThread = new Thread() {
public void run() {
try {
doServerSide();
} catch (Exception e) {
e.printStackTrace();
/*
* Our server thread just died.
*
* Release the client, if not active already...
*/
System.err.println("Server died...");
serverReady = true;
serverException = e;
}
new SSLTest()
.setSSLContext(context)
.setServerApplication((socket, test) -> {
BufferedWriter bw = new BufferedWriter(
new OutputStreamWriter(socket.getOutputStream()));
bw.write("HTTP/1.1 200 OK\r\n\r\n\r\n");
bw.flush();
Thread.sleep(2000);
socket.getSession().invalidate();
SSLTest.print("Server application is done");
})
.setClientPeer((test) -> {
boolean serverIsReady = test.waitForServerSignal();
if (!serverIsReady) {
SSLTest.print(
"The server is not ready, ignore on client side.");
return;
}
};
serverThread.start();
} else {
doServerSide();
}
}
void startClient(boolean newThread) throws Exception {
if (newThread) {
clientThread = new Thread() {
public void run() {
try {
doClientSide();
} catch (Exception e) {
/*
* Our client thread just died.
*/
System.err.println("Client died...");
clientException = e;
}
}
};
clientThread.start();
} else {
doClientSide();
}
// Signal the server, the client is ready to communicate.
test.signalClientReady();
String host = keystore.equals("ipstore")
? "127.0.0.1" : "localhost";
URL url = new URL("https://" + host + ":" + test.getServerPort()
+ "/index.html");
((HttpURLConnection) url.openConnection())
.getInputStream().close();
SSLTest.print("Client is done");
}).runTest();
}
}

37
jdk/test/tools/jlink/JLinkTest.java
View File

@ -149,6 +149,43 @@ public class JLinkTest {
.call().assertSuccess();
}
{
String moduleName = "m_8165735"; // JDK-8165735
helper.generateDefaultJModule(moduleName+"dependency").assertSuccess();
Path jmod = helper.generateDefaultJModule(moduleName, moduleName+"dependency").assertSuccess();
JImageGenerator.getJLinkTask()
.modulePath(helper.defaultModulePath())
.repeatedModulePath(".") // second --module-path overrides the first one
.output(helper.createNewImageDir(moduleName))
.addMods(moduleName)
// second --module-path does not have that module
.call().assertFailure("Error: Module m_8165735 not found");
JImageGenerator.getJLinkTask()
.modulePath(".") // first --module-path overridden later
.repeatedModulePath(helper.defaultModulePath())
.output(helper.createNewImageDir(moduleName))
.addMods(moduleName)
// second --module-path has that module
.call().assertSuccess();
JImageGenerator.getJLinkTask()
.modulePath(helper.defaultModulePath())
.output(helper.createNewImageDir(moduleName))
.limitMods(moduleName)
.repeatedLimitMods("java.base") // second --limit-modules overrides first
.addMods(moduleName)
.call().assertFailure("Error: Module m_8165735dependency not found, required by m_8165735");
JImageGenerator.getJLinkTask()
.modulePath(helper.defaultModulePath())
.output(helper.createNewImageDir(moduleName))
.limitMods("java.base")
.repeatedLimitMods(moduleName) // second --limit-modules overrides first
.addMods(moduleName)
.call().assertSuccess();
}
{
// Help
StringWriter writer = new StringWriter();

22
jdk/test/tools/lib/tests/JImageGenerator.java
View File

@ -564,6 +564,10 @@ public class JImageGenerator {
private final List<String> limitMods = new ArrayList<>();
private final List<String> options = new ArrayList<>();
private String modulePath;
// if you want to specifiy repeated --module-path option
private String repeatedModulePath;
// if you want to specifiy repeated --limit-modules option
private String repeatedLimitMods;
private Path output;
private Path existing;
@ -572,6 +576,11 @@ public class JImageGenerator {
return this;
}
public JLinkTask repeatedModulePath(String modulePath) {
this.repeatedModulePath = modulePath;
return this;
}
public JLinkTask addJars(Path jars) {
this.jars.add(jars);
return this;
@ -597,6 +606,11 @@ public class JImageGenerator {
return this;
}
public JLinkTask repeatedLimitMods(String modules) {
this.repeatedLimitMods = modules;
return this;
}
public JLinkTask output(Path output) {
this.output = output;
return this;
@ -639,6 +653,10 @@ public class JImageGenerator {
options.add(LIMIT_MODULES_OPTION);
options.add(limitMods.stream().collect(Collectors.joining(",")));
}
if (repeatedLimitMods != null) {
options.add(LIMIT_MODULES_OPTION);
options.add(repeatedLimitMods);
}
if (!jars.isEmpty() || !jmods.isEmpty()) {
options.add(MODULE_PATH_OPTION);
options.add(modulePath());
@ -647,6 +665,10 @@ public class JImageGenerator {
options.add(MODULE_PATH_OPTION);
options.add(modulePath);
}
if (repeatedModulePath != null) {
options.add(MODULE_PATH_OPTION);
options.add(repeatedModulePath);
}
if (!pluginModulePath.isEmpty()) {
options.add(PLUGIN_MODULE_PATH);
options.add(toPath(pluginModulePath));