http.keepAlive.time.server and + http.keepAlive.time.proxy
+These properties modify the behavior of the HTTP keepalive cache in the case + where the server (or proxy) has not specified a keepalive time. If the + property is set in this case, then idle connections will be closed after the + specified number of seconds. If the property is set, and the server does + specify a keepalive time in a "Keep-Alive" response header, then the time specified + by the server is used. If the property is not set and also the server + does not specify a keepalive time, then connections are kept alive for an + implementation defined time, assuming {@code http.keepAlive} is {@code true}.
http.maxRedirects (default: 20)
This integer value determines the maximum number, for a given request,
of HTTP redirects that will be automatically followed by the
diff --git a/jdk/src/share/classes/sun/management/ThreadImpl.java b/jdk/src/share/classes/sun/management/ThreadImpl.java
index 4d25d7daddb..612821552a5 100644
--- a/jdk/src/share/classes/sun/management/ThreadImpl.java
+++ b/jdk/src/share/classes/sun/management/ThreadImpl.java
@@ -331,6 +331,13 @@ public void setThreadCpuTimeEnabled(boolean enable) {
}
}
+ public long getTotalThreadAllocatedBytes() {
+ if (isThreadAllocatedMemoryEnabled()) {
+ return getTotalThreadAllocatedMemory();
+ }
+ return -1;
+ }
+
public long getCurrentThreadAllocatedBytes() {
if (isThreadAllocatedMemoryEnabled()) {
return getThreadAllocatedMemory0(0);
@@ -507,6 +514,7 @@ private static native void getThreadInfo1(long[] ids,
private static native void getThreadUserCpuTime1(long[] ids, long[] result);
private static native long getThreadAllocatedMemory0(long id);
private static native void getThreadAllocatedMemory1(long[] ids, long[] result);
+ private static native long getTotalThreadAllocatedMemory();
private static native void setThreadCpuTimeEnabled0(boolean enable);
private static native void setThreadAllocatedMemoryEnabled0(boolean enable);
private static native void setThreadContentionMonitoringEnabled0(boolean enable);
diff --git a/jdk/src/share/classes/sun/net/www/HeaderParser.java b/jdk/src/share/classes/sun/net/www/HeaderParser.java
index 3f1629fa8c6..5e41605ea03 100644
--- a/jdk/src/share/classes/sun/net/www/HeaderParser.java
+++ b/jdk/src/share/classes/sun/net/www/HeaderParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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,6 +26,7 @@
package sun.net.www;
import java.util.Iterator;
+import java.util.OptionalInt;
/* This is useful for the nightmare of parsing multi-part HTTP/RFC822 headers
* sensibly:
@@ -244,6 +245,19 @@ public int findInt(String k, int Default) {
return Default;
}
}
+
+ public OptionalInt findInt(String k) {
+ try {
+ String s = findValue(k);
+ if (s == null) {
+ return OptionalInt.empty();
+ }
+ return OptionalInt.of(Integer.parseInt(s));
+ } catch (Throwable t) {
+ return OptionalInt.empty();
+ }
+ }
+
/*
public static void main(String[] a) throws Exception {
System.out.print("enter line to parse> ");
diff --git a/jdk/src/share/classes/sun/net/www/http/HttpClient.java b/jdk/src/share/classes/sun/net/www/http/HttpClient.java
index dd6384efe88..e7440f0b655 100644
--- a/jdk/src/share/classes/sun/net/www/http/HttpClient.java
+++ b/jdk/src/share/classes/sun/net/www/http/HttpClient.java
@@ -28,6 +28,7 @@
import java.io.*;
import java.net.*;
import java.util.Locale;
+import java.util.OptionalInt;
import sun.net.NetworkClient;
import sun.net.ProgressSource;
import sun.net.www.MessageHeader;
@@ -114,13 +115,14 @@ static private int getDefaultPort(String proto) {
recomputing the value of keepingAlive */
int keepAliveConnections = -1; /* number of keep-alives left */
- /**Idle timeout value, in milliseconds. Zero means infinity,
- * iff keepingAlive=true.
- * Unfortunately, we can't always believe this one. If I'm connected
- * through a Netscape proxy to a server that sent me a keep-alive
- * time of 15 sec, the proxy unilaterally terminates my connection
- * after 5 sec. So we have to hard code our effective timeout to
- * 4 sec for the case where we're using a proxy. *SIGH*
+ /*
+ * The timeout if specified by the server. Following values possible
+ * 0: the server specified no keep alive headers
+ * -1: the server provided "Connection: keep-alive" but did not specify a
+ * a particular time in a "Keep-Alive:" headers
+ * -2: the server provided "Connection: keep-alive" and timeout=0
+ * Positive values are the number of seconds specified by the server
+ * in a "Keep-Alive" header
*/
int keepAliveTimeout = 0;
@@ -816,7 +818,23 @@ private boolean parseHTTPHeader(MessageHeader responses, ProgressSource pi, Http
responses.findValue("Keep-Alive"));
/* default should be larger in case of proxy */
keepAliveConnections = p.findInt("max", usingProxy?50:5);
- keepAliveTimeout = p.findInt("timeout", usingProxy?60:5);
+ if (keepAliveConnections < 0) {
+ keepAliveConnections = usingProxy?50:5;
+ }
+ OptionalInt timeout = p.findInt("timeout");
+ if (!timeout.isPresent()) {
+ keepAliveTimeout = -1;
+ } else {
+ keepAliveTimeout = timeout.getAsInt();
+ if (keepAliveTimeout < 0) {
+ // if the server specified a negative (invalid) value
+ // then we set to -1, which is equivalent to no value
+ keepAliveTimeout = -1;
+ } else if (keepAliveTimeout == 0) {
+ // handled specially to mean close connection immediately
+ keepAliveTimeout = -2;
+ }
+ }
}
} else if (b[7] != '0') {
/*
@@ -1070,6 +1088,10 @@ public String getProxyHostUsed() {
}
}
+ public boolean getUsingProxy() {
+ return usingProxy;
+ }
+
/**
* @return the proxy port being used for this client. Meaningless
* if getProxyHostUsed() gives null.
diff --git a/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java b/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
index d6548e0c531..5acef4d7ce7 100644
--- a/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
+++ b/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
@@ -38,6 +38,8 @@
import java.util.List;
import sun.security.action.GetIntegerAction;
+import sun.net.www.protocol.http.HttpURLConnection;
+import sun.util.logging.PlatformLogger;
/**
* A class that implements a cache of idle Http connections for keep-alive
@@ -50,6 +52,32 @@ public class KeepAliveCache
implements Runnable {
private static final long serialVersionUID = -2937172892064557949L;
+ // Keep alive time set according to priority specified here:
+ // 1. If server specifies a time with a Keep-Alive header
+ // 2. If user specifies a time with system property below
+ // 3. Default values which depend on proxy vs server and whether
+ // a Connection: keep-alive header was sent by server
+
+ // name suffixed with "server" or "proxy"
+ private static final String keepAliveProp = "http.keepAlive.time.";
+
+ private static final int userKeepAliveServer;
+ private static final int userKeepAliveProxy;
+
+ static final PlatformLogger logger = HttpURLConnection.getHttpLogger();
+
+ @SuppressWarnings("removal")
+ static int getUserKeepAliveSeconds(String type) {
+ int v = AccessController.doPrivileged(
+ new GetIntegerAction(keepAliveProp+type, -1)).intValue();
+ return v < -1 ? -1 : v;
+ }
+
+ static {
+ userKeepAliveServer = getUserKeepAliveSeconds("server");
+ userKeepAliveProxy = getUserKeepAliveSeconds("proxy");
+ }
+
/* maximum # keep-alive connections to maintain at once
* This should be 2 by the HTTP spec, but because we don't support pipe-lining
* a larger value is more appropriate. So we now set a default of 5, and the value
@@ -127,15 +155,41 @@ public Void run() {
if (v == null) {
int keepAliveTimeout = http.getKeepAliveTimeout();
- v = new ClientVector(keepAliveTimeout > 0 ?
- keepAliveTimeout * 1000 : LIFETIME);
- v.put(http);
- super.put(key, v);
+ if (keepAliveTimeout == 0) {
+ keepAliveTimeout = getUserKeepAlive(http.getUsingProxy());
+ if (keepAliveTimeout == -1) {
+ // same default for server and proxy
+ keepAliveTimeout = 5;
+ }
+ } else if (keepAliveTimeout == -1) {
+ keepAliveTimeout = getUserKeepAlive(http.getUsingProxy());
+ if (keepAliveTimeout == -1) {
+ // different default for server and proxy
+ keepAliveTimeout = http.getUsingProxy() ? 60 : 5;
+ }
+ } else if (keepAliveTimeout == -2) {
+ keepAliveTimeout = 0;
+ }
+ // at this point keepAliveTimeout is the number of seconds to keep
+ // alive, which could be 0, if the user specified 0 for the property
+ assert keepAliveTimeout >= 0;
+ if (keepAliveTimeout == 0) {
+ http.closeServer();
+ } else {
+ v = new ClientVector(keepAliveTimeout * 1000);
+ v.put(http);
+ super.put(key, v);
+ }
} else {
v.put(http);
}
}
+ // returns the keep alive set by user in system property or -1 if not set
+ private static int getUserKeepAlive(boolean isProxy) {
+ return isProxy ? userKeepAliveProxy : userKeepAliveServer;
+ }
+
/* remove an obsolete HttpClient from its VectorCache */
public synchronized void remove(HttpClient h, Object obj) {
KeepAliveKey key = new KeepAliveKey(h.url, obj);
@@ -252,6 +306,11 @@ synchronized HttpClient get() {
e.hc.closeServer();
} else {
hc = e.hc;
+ if (KeepAliveCache.logger.isLoggable(PlatformLogger.Level.FINEST)) {
+ String msg = "cached HttpClient was idle for "
+ + Long.toString(currentTime - e.idleStartTime);
+ KeepAliveCache.logger.finest(msg);
+ }
}
} while ((hc == null) && (!isEmpty()));
return hc;
diff --git a/jdk/src/share/javavm/export/jmm.h b/jdk/src/share/javavm/export/jmm.h
index 23d8fa4061a..508b4c8cb1d 100644
--- a/jdk/src/share/javavm/export/jmm.h
+++ b/jdk/src/share/javavm/export/jmm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -218,7 +218,8 @@ typedef struct {
} dcmdArgInfo;
typedef struct jmmInterface_1_ {
- void* reserved1;
+ jlong (JNICALL *GetTotalThreadAllocatedMemory)
+ (JNIEnv *env);
jlong (JNICALL *GetOneThreadAllocatedMemory)
(JNIEnv *env,
jlong thread_id);
diff --git a/jdk/src/share/native/sun/management/ThreadImpl.c b/jdk/src/share/native/sun/management/ThreadImpl.c
index b696f2f7de9..c92ec381d10 100644
--- a/jdk/src/share/native/sun/management/ThreadImpl.c
+++ b/jdk/src/share/native/sun/management/ThreadImpl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -98,7 +98,7 @@ JNIEXPORT jlong JNICALL
Java_sun_management_ThreadImpl_getThreadAllocatedMemory0
(JNIEnv *env, jclass cls, jlong tid)
{
- return jmm_interface->GetOneThreadAllocatedMemory(env, tid);
+ return jmm_interface->GetOneThreadAllocatedMemory(env, tid);
}
JNIEXPORT void JNICALL
@@ -108,6 +108,13 @@ Java_sun_management_ThreadImpl_getThreadAllocatedMemory1
jmm_interface->GetThreadAllocatedMemory(env, ids, sizeArray);
}
+JNIEXPORT jlong JNICALL
+Java_sun_management_ThreadImpl_getTotalThreadAllocatedMemory
+ (JNIEnv *env, jclass cls)
+{
+ return jmm_interface->GetTotalThreadAllocatedMemory(env);
+}
+
JNIEXPORT jobjectArray JNICALL
Java_sun_management_ThreadImpl_findMonitorDeadlockedThreads0
(JNIEnv *env, jclass cls)
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 54fb0beac49..39661ccd327 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -383,3 +383,15 @@ sun/tools/jps/TestJpsJarRelative.java generic-all
sample/mergesort/MergeSortTest.java 8178912 generic-all
sample/chatserver/ChatTest.java 8178912 generic-all
+
+############################################################################
+
+# cacerts tests
+
+############################################################################
+security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#globalsigneccrootcar4 8328825 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar1 8328825 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar2 8328825 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar3 8328825 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar4 8328825 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java 8314509 generic-all
diff --git a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
index bf4cdc5bb3a..2c4e8f54459 100644
--- a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
+++ b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
/*
@test %W% %E%
+ @key headful
@bug 6818312
@summary The size returned by SecurityWarning.getSize() should not be zero
@author anthony.petrov@sun.com: area=awt.toplevel
diff --git a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
index a8391503238..f10182131f3 100644
--- a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
+++ b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
/*
@test %W% %E%
+ @key headful
@bug 6594131
@summary Tests the AWTUtilities.get/setWindowOpacity() methods
@author anthony.petrov@...: area=awt.toplevel
diff --git a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
index 9d954f92a85..16d8eb04325 100644
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
+++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,19 @@
*/
/*
- * @test
- * @bug 6173675 8231209
+ * @test id=G1
+ * @bug 6173675 8231209 8304074 8313081
* @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
- * @author Paul Hohensee
+ * @requires vm.gc == "G1"
+ * @run main/othervm -XX:+UseG1GC ThreadAllocatedMemory
+ */
+
+/*
+ * @test id=Serial
+ * @bug 6173675 8231209 8304074 8313081
+ * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
+ * @requires vm.gc == "Serial"
+ * @run main/othervm -XX:+UseSerialGC ThreadAllocatedMemory
*/
import java.lang.management.*;
@@ -33,6 +42,7 @@
public class ThreadAllocatedMemory {
private static com.sun.management.ThreadMXBean mbean =
(com.sun.management.ThreadMXBean)ManagementFactory.getThreadMXBean();
+ private static boolean testFailed = false;
private static volatile boolean done = false;
private static volatile boolean done1 = false;
private static Object obj = new Object();
@@ -55,6 +65,13 @@ public static void main(String[] argv)
// Test many threads that are not this one
testGetThreadsAllocatedBytes();
+ // Test cumulative Java thread allocation since JVM launch
+ testGetTotalThreadAllocatedBytes();
+
+ if (testFailed) {
+ throw new RuntimeException("TEST FAILED");
+ }
+
System.out.println("Test passed");
}
@@ -92,13 +109,15 @@ private static void testSupportEnableDisable() {
}
private static void testGetCurrentThreadAllocatedBytes() {
+ Thread curThread = Thread.currentThread();
+
long size = mbean.getCurrentThreadAllocatedBytes();
- ensureValidSize(size);
+ ensureValidSize(curThread, size);
// do some more allocation
doit();
- checkResult(Thread.currentThread(), size,
+ checkResult(curThread, size,
mbean.getCurrentThreadAllocatedBytes());
}
@@ -107,7 +126,7 @@ private static void testCurrentThreadGetThreadAllocatedBytes() {
long id = curThread.getId();
long size = mbean.getThreadAllocatedBytes(id);
- ensureValidSize(size);
+ ensureValidSize(curThread, size);
// do some more allocation
doit();
@@ -119,7 +138,8 @@ private static void testGetThreadAllocatedBytes()
throws Exception {
// start a thread
- done = false; done1 = false;
+ done = false;
+ done1 = false;
Thread curThread = new MyThread("MyThread");
curThread.start();
long id = curThread.getId();
@@ -128,7 +148,7 @@ private static void testGetThreadAllocatedBytes()
waitUntilThreadBlocked(curThread);
long size = mbean.getThreadAllocatedBytes(id);
- ensureValidSize(size);
+ ensureValidSize(curThread, size);
// let thread go to do some more allocation
synchronized (obj) {
@@ -152,8 +172,7 @@ private static void testGetThreadAllocatedBytes()
try {
curThread.join();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
+ reportUnexpected(e, "during join");
}
}
@@ -161,7 +180,8 @@ private static void testGetThreadsAllocatedBytes()
throws Exception {
// start threads
- done = false; done1 = false;
+ done = false;
+ done1 = false;
for (int i = 0; i < NUM_THREADS; i++) {
threads[i] = new MyThread("MyThread-" + i);
threads[i].start();
@@ -172,7 +192,7 @@ private static void testGetThreadsAllocatedBytes()
for (int i = 0; i < NUM_THREADS; i++) {
sizes[i] = mbean.getThreadAllocatedBytes(threads[i].getId());
- ensureValidSize(sizes[i]);
+ ensureValidSize(threads[i], sizes[i]);
}
// let threads go to do some more allocation
@@ -201,38 +221,106 @@ private static void testGetThreadsAllocatedBytes()
try {
threads[i].join();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
+ reportUnexpected(e, "during join");
break;
}
}
}
- private static void ensureValidSize(long size) {
+ private static void testGetTotalThreadAllocatedBytes()
+ throws Exception {
+
+ // baseline should be positive
+ Thread curThread = Thread.currentThread();
+ long cumulativeSize = mbean.getTotalThreadAllocatedBytes();
+ if (cumulativeSize <= 0) {
+ throw new RuntimeException(
+ "Invalid allocated bytes returned for " + curThread.getName() + " = " + cumulativeSize);
+ }
+
+ // start threads
+ done = false;
+ done1 = false;
+ for (int i = 0; i < NUM_THREADS; i++) {
+ threads[i] = new MyThread("MyThread-" + i);
+ threads[i].start();
+ }
+
+ // wait for threads to block after doing some allocation
+ waitUntilThreadsBlocked();
+
+ // check after threads are blocked
+ cumulativeSize = checkResult(curThread, cumulativeSize, mbean.getTotalThreadAllocatedBytes());
+
+ // let threads go to do some more allocation
+ synchronized (obj) {
+ done = true;
+ obj.notifyAll();
+ }
+
+ // wait for threads to get going again. we don't care if we
+ // catch them in mid-execution or if some of them haven't
+ // restarted after we're done sleeping.
+ goSleep(400);
+
+ System.out.println("Done sleeping");
+
+ // check while threads are running
+ cumulativeSize = checkResult(curThread, cumulativeSize, mbean.getTotalThreadAllocatedBytes());
+
+ // let threads exit
+ synchronized (obj) {
+ done1 = true;
+ obj.notifyAll();
+ }
+
+ for (int i = 0; i < NUM_THREADS; i++) {
+ try {
+ threads[i].join();
+ } catch (InterruptedException e) {
+ reportUnexpected(e, "during join");
+ break;
+ }
+ }
+
+ // check after threads exit
+ checkResult(curThread, cumulativeSize, mbean.getTotalThreadAllocatedBytes());
+ }
+
+ private static void ensureValidSize(Thread curThread, long size) {
// implementation could have started measurement when
// measurement was enabled, in which case size can be 0
if (size < 0) {
throw new RuntimeException(
- "Invalid allocated bytes returned = " + size);
+ "Invalid allocated bytes returned for thread " +
+ curThread.getName() + " = " + size);
}
}
- private static void checkResult(Thread curThread,
- long prev_size, long curr_size) {
- if (curr_size < prev_size) {
- throw new RuntimeException("Allocated bytes " + curr_size +
- " expected >= " + prev_size);
- }
+ private static long checkResult(Thread curThread,
+ long prevSize, long currSize) {
System.out.println(curThread.getName() +
- " Previous allocated bytes = " + prev_size +
- " Current allocated bytes = " + curr_size);
+ " Previous allocated bytes = " + prevSize +
+ " Current allocated bytes = " + currSize);
+ if (currSize < prevSize) {
+ throw new RuntimeException("TEST FAILED: " +
+ curThread.getName() +
+ " previous allocated bytes = " + prevSize +
+ " > current allocated bytes = " + currSize);
+ }
+ return currSize;
+ }
+
+ private static void reportUnexpected(Exception e, String when) {
+ System.out.println("Unexpected exception thrown " + when + ".");
+ e.printStackTrace(System.out);
+ testFailed = true;
}
private static void goSleep(long ms) throws Exception {
try {
Thread.sleep(ms);
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
throw e;
}
}
@@ -287,34 +375,23 @@ public void run() {
try {
obj.wait();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
+ reportUnexpected(e, "while !done");
break;
}
}
}
- long size1 = mbean.getThreadAllocatedBytes(getId());
+ long prevSize = mbean.getThreadAllocatedBytes(getId());
ThreadAllocatedMemory.doit();
- long size2 = mbean.getThreadAllocatedBytes(getId());
-
- System.out.println(getName() + ": " +
- "ThreadAllocatedBytes = " + size1 +
- " ThreadAllocatedBytes = " + size2);
-
- if (size1 > size2) {
- throw new RuntimeException(getName() +
- " ThreadAllocatedBytes = " + size1 +
- " > ThreadAllocatedBytes = " + size2);
- }
+ long currSize = mbean.getThreadAllocatedBytes(getId());
+ checkResult(this, prevSize, currSize);
synchronized (obj) {
while (!done1) {
try {
obj.wait();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
+ reportUnexpected(e, "while !done1");
break;
}
}
diff --git a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java
index 980189098cb..d325d1dda66 100644
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java
+++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, 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
@@ -47,7 +47,6 @@ public static void main(String[] argv)
return;
}
-
// start threads, wait for them to block
long[] ids = new long[NUM_THREADS];
@@ -59,7 +58,6 @@ public static void main(String[] argv)
waitUntilThreadBlocked();
-
// disable allocated memory measurement
if (mbean.isThreadAllocatedMemoryEnabled()) {
mbean.setThreadAllocatedMemoryEnabled(false);
@@ -117,19 +115,9 @@ public static void main(String[] argv)
// restarted after we're done sleeping.
goSleep(400);
- long[] sizes1 = mbean.getThreadAllocatedBytes(ids);
-
+ long[] afterSizes = mbean.getThreadAllocatedBytes(ids);
for (int i = 0; i < NUM_THREADS; i++) {
- long newSize = sizes1[i];
- if (sizes[i] > newSize) {
- throw new RuntimeException("TEST FAILED: " +
- threads[i].getName() +
- " previous allocated bytes = " + sizes[i] +
- " > current allocated bytes = " + newSize);
- }
- System.out.println(threads[i].getName() +
- " Previous allocated bytes = " + sizes[i] +
- " Current allocated bytes = " + newSize);
+ checkResult(threads[i], sizes[i], afterSizes[i]);
}
try {
@@ -147,7 +135,6 @@ public static void main(String[] argv)
"Caught expected IllegalArgumentException: " + e.getMessage());
}
-
// let threads exit
synchronized (obj) {
done1 = true;
@@ -158,9 +145,7 @@ public static void main(String[] argv)
try {
threads[i].join();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
- testFailed = true;
+ reportUnexpected(e, "during join");
break;
}
}
@@ -173,11 +158,30 @@ public static void main(String[] argv)
}
+ private static void checkResult(Thread curThread,
+ long prevSize, long currSize) {
+ System.out.println(curThread.getName() +
+ " Previous allocated bytes = " + prevSize +
+ " Current allocated bytes = " + currSize);
+ if (currSize < prevSize) {
+ throw new RuntimeException("TEST FAILED: " +
+ curThread.getName() +
+ " previous allocated bytes = " + prevSize +
+ " > current allocated bytes = " + currSize);
+
+ }
+ }
+
+ private static void reportUnexpected(Exception e, String when) {
+ System.out.println("Unexpected exception thrown " + when + ".");
+ e.printStackTrace(System.out);
+ testFailed = true;
+ }
+
private static void goSleep(long ms) throws Exception {
try {
Thread.sleep(ms);
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
throw e;
}
}
@@ -221,9 +225,7 @@ public void run() {
try {
obj.wait();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
- testFailed = true;
+ reportUnexpected(e, "while !done");
break;
}
}
@@ -236,9 +238,7 @@ public void run() {
try {
obj.wait();
} catch (InterruptedException e) {
- System.out.println("Unexpected exception is thrown.");
- e.printStackTrace(System.out);
- testFailed = true;
+ reportUnexpected(e, "while !done");
break;
}
}
diff --git a/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html b/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html
index 9b8277d1d16..d1d92a0ac2e 100644
--- a/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html
+++ b/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html
@@ -1,5 +1,5 @@