From 29c465d94ae1fbcc9da6dc1432174659f192398d Mon Sep 17 00:00:00 2001 From: amlu Date: Fri, 23 Nov 2018 12:45:47 +0800 Subject: [PATCH 1/5] 8214241: Problem list com/sun/jndi/ldap/LdapTimeoutTest.java for all platforms Reviewed-by: vtewari, weijun --- test/jdk/ProblemList.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index ef0fca80068..5269a3cf75a 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -876,7 +876,7 @@ sun/tools/jhsdb/HeapDumpTest.java 8193639 solaris- com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java 8169942 linux-i586,macosx-all,windows-x64 -com/sun/jndi/ldap/LdapTimeoutTest.java 8151678 linux-all +com/sun/jndi/ldap/LdapTimeoutTest.java 8151678 generic-all com/sun/jndi/dns/ConfigTests/PortUnreachable.java 7164518 macosx-all From b6126bd4dc6f74c574866f97eb5e6f282868de32 Mon Sep 17 00:00:00 2001 From: ysuenaga Date: Fri, 23 Nov 2018 16:36:07 +0900 Subject: [PATCH 2/5] 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions Reviewed-by: mgronlun, egahlin --- test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java index 53cee75887c..8a6dbb00c4e 100644 --- a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java +++ b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java @@ -99,9 +99,7 @@ private static void test(String configName, Object value) { private static void testNegative(String configName, Object value) { try { - // Syntactically invalid arguments are catched by the JCMD framework where an error code of 1 is returned. - // Syntactically valid arguments that are semantically invalid (invalid value ranges for example) are handled by JFR code, it will always return a value of 0. - JcmdHelper.jcmd(configName.equals(UNSUPPORTED_OPTION) ? 1 : 0, "JFR.configure", configName + "=" + value); + JcmdHelper.jcmd(1, "JFR.configure", configName + "=" + value); } catch(Exception e) { testExceptions.add(e); } From 2a7bf7609b8e73488fdae774869c2d0be7130b70 Mon Sep 17 00:00:00 2001 From: vtewari Date: Fri, 23 Nov 2018 13:16:45 +0530 Subject: [PATCH 3/5] 8203672: JNI exception pending in PlainSocketImpl.c 8203264: JNI exception pending in PlainDatagramSocketImpl.c:740 8203673: JNI exception pending in DualStackPlainDatagramSocketImpl.c:398 Reviewed-by: chegar, igerasim --- .../native/libnet/PlainDatagramSocketImpl.c | 26 ++++++++++--------- .../libnet/DualStackPlainDatagramSocketImpl.c | 15 +++++------ .../windows/native/libnet/PlainSocketImpl.c | 4 +++ 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c b/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c index eb0e0be9795..0cf7e7eb0ad 100644 --- a/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c +++ b/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c @@ -684,19 +684,21 @@ Java_java_net_PlainDatagramSocketImpl_peekData(JNIEnv *env, jobject this, packetAddress = NULL; } } - if (packetAddress == NULL) { - packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr, &port); - /* stuff the new Inetaddress in the packet */ - (*env)->SetObjectField(env, packet, dp_addressID, packetAddress); - } else { - /* only get the new port number */ - port = NET_GetPortFromSockaddr(&rmtaddr); + if (!(*env)->ExceptionCheck(env)){ + if (packetAddress == NULL ) { + packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr, &port); + /* stuff the new InetAddress in the packet */ + (*env)->SetObjectField(env, packet, dp_addressID, packetAddress); + } else { + /* only get the new port number */ + port = NET_GetPortFromSockaddr(&rmtaddr); + } + /* and fill in the data, remote address/port and such */ + (*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n, + (jbyte *)fullPacket); + (*env)->SetIntField(env, packet, dp_portID, port); + (*env)->SetIntField(env, packet, dp_lengthID, n); } - /* and fill in the data, remote address/port and such */ - (*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n, - (jbyte *)fullPacket); - (*env)->SetIntField(env, packet, dp_portID, port); - (*env)->SetIntField(env, packet, dp_lengthID, n); } if (mallocedPacket) { diff --git a/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c b/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c index 210431037ac..d2f7675c8e9 100644 --- a/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c +++ b/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c @@ -386,15 +386,14 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketRece packetAddress = NULL; } } - if (packetAddress == NULL) { - packetAddress = NET_SockaddrToInetAddress(env, &sa, &port); - if (packetAddress != NULL) { - /* stuff the new Inetaddress into the packet */ - (*env)->SetObjectField(env, dpObj, dp_addressID, packetAddress); + if (!(*env)->ExceptionCheck(env)){ + if (packetAddress == NULL ) { + packetAddress = NET_SockaddrToInetAddress(env, &sa, &port); + if (packetAddress != NULL) { + /* stuff the new InetAddress into the packet */ + (*env)->SetObjectField(env, dpObj, dp_addressID, packetAddress); + } } - } - - if (!(*env)->ExceptionCheck(env)) { /* populate the packet */ (*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, rv, (jbyte *)fullPacket); diff --git a/src/java.base/windows/native/libnet/PlainSocketImpl.c b/src/java.base/windows/native/libnet/PlainSocketImpl.c index 29b665a945d..65aa2123cac 100644 --- a/src/java.base/windows/native/libnet/PlainSocketImpl.c +++ b/src/java.base/windows/native/libnet/PlainSocketImpl.c @@ -303,6 +303,10 @@ JNIEXPORT jint JNICALL Java_java_net_PlainSocketImpl_accept0 SetHandleInformation((HANDLE)(UINT_PTR)newfd, HANDLE_FLAG_INHERIT, 0); ia = NET_SockaddrToInetAddress(env, &sa, &port); + if (ia == NULL){ + closesocket(newfd); + return -1; + } isa = (*env)->NewObject(env, isa_class, isa_ctorID, ia, port); if (isa == NULL) { closesocket(newfd); From b29387e53e965148f08d61cedbb0012ff6bc3c13 Mon Sep 17 00:00:00 2001 From: rehn Date: Fri, 23 Nov 2018 10:43:18 +0100 Subject: [PATCH 4/5] 8212108: SafepointSynchronizer never ending counter (big enough) Reviewed-by: dholmes, eosterlund --- .../event/runtime/TestBiasedLockRevocationEvents.java | 10 +++++----- .../jdk/jdk/jfr/event/runtime/TestSafepointEvents.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java b/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java index 75b52ddeda1..0da2e9e0466 100644 --- a/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java +++ b/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java @@ -275,13 +275,13 @@ class MyLock {}; List events = Events.fromRecording(recording); // Determine which safepoints included single and bulk revocation VM operations - Set vmOperationsSingle = new HashSet<>(); - Set vmOperationsBulk = new HashSet<>(); + Set vmOperationsSingle = new HashSet<>(); + Set vmOperationsBulk = new HashSet<>(); for (RecordedEvent event : events) { if (event.getEventType().getName().equals(EventNames.ExecuteVMOperation)) { String operation = event.getValue("operation"); - Integer safepointId = event.getValue("safepointId"); + Long safepointId = event.getValue("safepointId"); if (operation.equals("RevokeBias")) { vmOperationsSingle.add(safepointId); @@ -297,14 +297,14 @@ class MyLock {}; // Match all revoke events to a corresponding VMOperation event for (RecordedEvent event : events) { if (event.getEventType().getName().equals(EventNames.BiasedLockRevocation)) { - Integer safepointId = event.getValue("safepointId"); + Long safepointId = event.getValue("safepointId"); String lockClass = ((RecordedClass)event.getValue("lockClass")).getName(); if (lockClass.equals(MyLock.class.getName())) { Asserts.assertTrue(vmOperationsSingle.contains(safepointId)); revokeCount++; } } else if (event.getEventType().getName().equals(EventNames.BiasedLockClassRevocation)) { - Integer safepointId = event.getValue("safepointId"); + Long safepointId = event.getValue("safepointId"); String lockClass = ((RecordedClass)event.getValue("revokedClass")).getName(); if (lockClass.toString().equals(MyLock.class.getName())) { Asserts.assertTrue(vmOperationsBulk.contains(safepointId)); diff --git a/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java b/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java index 6d7ee264509..743216d8a9a 100644 --- a/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java +++ b/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java @@ -84,9 +84,9 @@ public static void main(String[] args) throws Exception { } // Collect all events grouped by safepoint id - SortedMap> safepointIds = new TreeMap<>(); + SortedMap> safepointIds = new TreeMap<>(); for (RecordedEvent event : Events.fromRecording(recording)) { - Integer safepointId = event.getValue("safepointId"); + Long safepointId = event.getValue("safepointId"); if (!safepointIds.containsKey(safepointId)) { safepointIds.put(safepointId, new HashSet<>()); } From 10ac5aa67eb085ebc62bc1bae006a78c7d2fe69c Mon Sep 17 00:00:00 2001 From: jwilhelm Date: Sat, 24 Nov 2018 01:05:11 +0100 Subject: [PATCH 5/5] 8214276: Problemlist compiler/intrinsics/mathexact/MulExactLConstantTest.java Reviewed-by: kbarrett --- test/hotspot/jtreg/ProblemList.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index a29da510423..52325983c42 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -61,6 +61,8 @@ compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x +compiler/intrinsics/mathexact/MulExactLConstantTest.java 8214189 windows-all + ############################################################################# # :hotspot_gc