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

8231210: [BACKOUT] JDK-8207266 ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread

Browse Source 
Reviewed-by: phh, dholmes
This commit is contained in:
Daniel D. Daugherty 2019-09-18 20:49:13 -04:00
parent 8a2c4975d5
commit 48946faf34
8 changed files with 115 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotspot/share/include/jmm.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -239,9 +239,6 @@ typedef struct jmmInterface_1_ {
jobject (JNICALL *GetMemoryPoolUsage) (JNIEnv* env, jobject pool);
jobject (JNICALL *GetPeakMemoryPoolUsage) (JNIEnv* env, jobject pool);
jlong (JNICALL *GetOneThreadAllocatedMemory)
(JNIEnv *env,
jlong thread_id);
void (JNICALL *GetThreadAllocatedMemory)
(JNIEnv *env,
jlongArray ids,

26
src/hotspot/share/services/management.cpp
View File

@ -2068,31 +2068,6 @@ jlong Management::ticks_to_ms(jlong ticks) {
}
#endif // INCLUDE_MANAGEMENT
// Gets the amount of memory allocated on the Java heap for a single thread.
// Returns -1 if the thread does not exist or has terminated.
JVM_ENTRY(jlong, jmm_GetOneThreadAllocatedMemory(JNIEnv *env, jlong thread_id))
if (thread_id < 0) {
THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
"Invalid thread ID", -1);
}
if (thread_id == 0) {
// current thread
if (THREAD->is_Java_thread()) {
return ((JavaThread*)THREAD)->cooked_allocated_bytes();
}
return -1;
}
ThreadsListHandle tlh;
JavaThread* java_thread = tlh.list()->find_JavaThread_from_java_tid(thread_id);
if (java_thread != NULL) {
return java_thread->cooked_allocated_bytes();
}
return -1;
JVM_END
// Gets an array containing the amount of memory allocated on the Java
// heap for a set of threads (in bytes). Each element of the array is
// the amount of memory allocated for the thread ID specified in the
@ -2217,7 +2192,6 @@ const struct jmmInterface_1_ jmm_interface = {
jmm_GetMemoryManagers,
jmm_GetMemoryPoolUsage,
jmm_GetPeakMemoryPoolUsage,
jmm_GetOneThreadAllocatedMemory,
jmm_GetThreadAllocatedMemory,
jmm_GetMemoryUsage,
jmm_GetLongAttribute,

58
src/java.management/share/classes/java/lang/management/ThreadMXBean.java
View File

@ -160,7 +160,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
*
* @return an array of {@code long}, each is a thread ID.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
*/
@ -199,7 +199,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* it does not exist.
*
* @throws IllegalArgumentException if {@code id <= 0}.
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
*/
@ -237,7 +237,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
*
* @throws IllegalArgumentException if any element in the input array
* {@code ids} is {@code <= 0}.
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
*/
@ -284,7 +284,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
*
* @throws IllegalArgumentException if {@code id <= 0}.
* @throws IllegalArgumentException if {@code maxDepth is negative}.
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
*
@ -337,7 +337,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @throws IllegalArgumentException if {@code maxDepth is negative}.
* @throws IllegalArgumentException if any element in the input array
* {@code ids} is {@code <= 0}.
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
*
@ -360,7 +360,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @return {@code true} if thread contention monitoring is enabled;
* {@code false} otherwise.
*
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine does not support thread contention monitoring.
*
* @see #isThreadContentionMonitoringSupported
@ -374,10 +374,10 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @param enable {@code true} to enable;
* {@code false} to disable.
*
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support thread contention monitoring.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("control").
*
@ -394,7 +394,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* the current thread has executed in user mode or system mode.
*
* <p>
* This is a convenience method for local management use and is
* This is a convenient method for local management use and is
* equivalent to calling:
* <blockquote><pre>
* {@link #getThreadCpuTime getThreadCpuTime}(Thread.currentThread().getId());
@ -403,7 +403,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @return the total CPU time for the current thread if CPU time
* measurement is enabled; {@code -1} otherwise.
*
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* the current thread.
*
@ -421,7 +421,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* not necessarily nanoseconds accuracy.
*
* <p>
* This is a convenience method for local management use and is
* This is a convenient method for local management use and is
* equivalent to calling:
* <blockquote><pre>
* {@link #getThreadUserTime getThreadUserTime}(Thread.currentThread().getId());
@ -430,7 +430,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @return the user-level CPU time for the current thread if CPU time
* measurement is enabled; {@code -1} otherwise.
*
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* the current thread.
*
@ -467,7 +467,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* {@code -1} otherwise.
*
* @throws IllegalArgumentException if {@code id <= 0}.
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* other threads.
*
@ -502,7 +502,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* {@code -1} otherwise.
*
* @throws IllegalArgumentException if {@code id <= 0}.
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* other threads.
*
@ -548,7 +548,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @return {@code true} if thread CPU time measurement is enabled;
* {@code false} otherwise.
*
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine does not support CPU time measurement for other threads
* nor for the current thread.
*
@ -564,11 +564,11 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @param enable {@code true} to enable;
* {@code false} to disable.
*
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine does not support CPU time measurement for
* any threads nor for the current thread.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("control").
*
@ -604,7 +604,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @return an array of IDs of the threads that are monitor
* deadlocked, if any; {@code null} otherwise.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
*
@ -616,7 +616,7 @@ public interface ThreadMXBean extends PlatformManagedObject {
* Resets the peak thread count to the current number of
* live threads.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("control").
*
@ -642,10 +642,10 @@ public interface ThreadMXBean extends PlatformManagedObject {
* deadlocked waiting for object monitors or ownable synchronizers, if any;
* {@code null} otherwise.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine does not support monitoring of ownable synchronizer usage.
*
* @see #isSynchronizerUsageSupported
@ -704,10 +704,10 @@ public interface ThreadMXBean extends PlatformManagedObject {
* information about a thread whose ID is in the corresponding
* element of the input array of IDs.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
* @throws UnsupportedOperationException
* @throws java.lang.UnsupportedOperationException
* <ul>
* <li>if {@code lockedMonitors} is {@code true} but
* the Java virtual machine does not support monitoring
@ -794,10 +794,10 @@ public interface ThreadMXBean extends PlatformManagedObject {
* element of the input array of IDs.
*
* @throws IllegalArgumentException if {@code maxDepth} is negative.
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
* @throws UnsupportedOperationException
* @throws java.lang.UnsupportedOperationException
* <ul>
* <li>if {@code lockedMonitors} is {@code true} but
* the Java virtual machine does not support monitoring
@ -835,10 +835,10 @@ public interface ThreadMXBean extends PlatformManagedObject {
*
* @return an array of {@link ThreadInfo} for all live threads.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
* @throws UnsupportedOperationException
* @throws java.lang.UnsupportedOperationException
* <ul>
* <li>if {@code lockedMonitors} is {@code true} but
* the Java virtual machine does not support monitoring
@ -884,10 +884,10 @@ public interface ThreadMXBean extends PlatformManagedObject {
* @return an array of {@link ThreadInfo} for all live threads.
*
* @throws IllegalArgumentException if {@code maxDepth} is negative.
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("monitor").
* @throws UnsupportedOperationException
* @throws java.lang.UnsupportedOperationException
* <ul>
* <li>if {@code lockedMonitors} is {@code true} but
* the Java virtual machine does not support monitoring

68
src/java.management/share/classes/sun/management/ThreadImpl.java
View File

@ -29,7 +29,6 @@ import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
import javax.management.ObjectName;
import java.util.Objects;
/**
* Implementation for java.lang.management.ThreadMXBean as well as providing the
@ -113,15 +112,11 @@ public class ThreadImpl implements ThreadMXBean {
return cpuTimeEnabled;
}
private void ensureThreadAllocatedMemorySupported() {
protected boolean isThreadAllocatedMemoryEnabled() {
if (!isThreadAllocatedMemorySupported()) {
throw new UnsupportedOperationException(
"Thread allocated memory measurement is not supported.");
"Thread allocated memory measurement is not supported");
}
}
protected boolean isThreadAllocatedMemoryEnabled() {
ensureThreadAllocatedMemorySupported();
return allocatedMemoryEnabled;
}
@ -160,18 +155,16 @@ public class ThreadImpl implements ThreadMXBean {
return getThreadInfo(ids, 0);
}
private void verifyThreadId(long id) {
if (id <= 0) {
throw new IllegalArgumentException(
"Invalid thread ID parameter: " + id);
}
}
private void verifyThreadIds(long[] ids) {
Objects.requireNonNull(ids);
if (ids == null) {
throw new NullPointerException("Null ids parameter.");
}
for (int i = 0; i < ids.length; i++) {
verifyThreadId(ids[i]);
if (ids[i] <= 0) {
throw new IllegalArgumentException(
"Invalid thread ID parameter: " + ids[i]);
}
}
}
@ -349,41 +342,26 @@ public class ThreadImpl implements ThreadMXBean {
}
}
protected long getCurrentThreadAllocatedBytes() {
if (isThreadAllocatedMemoryEnabled()) {
return getThreadAllocatedMemory0(0);
}
return -1;
}
private boolean verifyThreadAllocatedMemory(long id) {
verifyThreadId(id);
return isThreadAllocatedMemoryEnabled();
}
protected long getThreadAllocatedBytes(long id) {
boolean verified = verifyThreadAllocatedMemory(id);
if (verified) {
return getThreadAllocatedMemory0(
Thread.currentThread().getId() == id ? 0 : id);
}
return -1;
long[] ids = new long[1];
ids[0] = id;
final long[] sizes = getThreadAllocatedBytes(ids);
return sizes[0];
}
private boolean verifyThreadAllocatedMemory(long[] ids) {
verifyThreadIds(ids);
// check if Thread allocated memory measurement is supported.
if (!isThreadAllocatedMemorySupported()) {
throw new UnsupportedOperationException(
"Thread allocated memory measurement is not supported.");
}
return isThreadAllocatedMemoryEnabled();
}
protected long[] getThreadAllocatedBytes(long[] ids) {
Objects.requireNonNull(ids);
if (ids.length == 1) {
long size = getThreadAllocatedBytes(ids[0]);
return new long[] { size };
}
boolean verified = verifyThreadAllocatedMemory(ids);
long[] sizes = new long[ids.length];
@ -396,7 +374,10 @@ public class ThreadImpl implements ThreadMXBean {
}
protected void setThreadAllocatedMemoryEnabled(boolean enable) {
ensureThreadAllocatedMemorySupported();
if (!isThreadAllocatedMemorySupported()) {
throw new UnsupportedOperationException(
"Thread allocated memory measurement is not supported.");
}
Util.checkControlAccess();
synchronized (this) {
@ -530,7 +511,6 @@ public class ThreadImpl implements ThreadMXBean {
private static native void getThreadTotalCpuTime1(long[] ids, long[] result);
private static native long getThreadUserCpuTime0(long id);
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 void setThreadCpuTimeEnabled0(boolean enable);
private static native void setThreadAllocatedMemoryEnabled0(boolean enable);

9
src/java.management/share/native/libmanagement/ThreadImpl.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -94,13 +94,6 @@ Java_sun_management_ThreadImpl_getThreadUserCpuTime1
JNI_FALSE /* user */);
}
JNIEXPORT jlong JNICALL
Java_sun_management_ThreadImpl_getThreadAllocatedMemory0
(JNIEnv *env, jclass cls, jlong tid)
{
return jmm_interface->GetOneThreadAllocatedMemory(env, tid);
}
JNIEXPORT void JNICALL
Java_sun_management_ThreadImpl_getThreadAllocatedMemory1
(JNIEnv *env, jclass cls, jlongArray ids, jlongArray sizeArray)

55
src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2013, 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
@ -61,7 +61,7 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
* @throws NullPointerException if {@code ids} is {@code null}
* @throws IllegalArgumentException if any element in the input array
* {@code ids} is {@code <=} {@code 0}.
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine implementation does not support CPU time
* measurement.
*
@ -95,7 +95,7 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
* @throws NullPointerException if {@code ids} is {@code null}
* @throws IllegalArgumentException if any element in the input array
* {@code ids} is {@code <=} {@code 0}.
* @throws UnsupportedOperationException if the Java
* @throws java.lang.UnsupportedOperationException if the Java
* virtual machine implementation does not support CPU time
* measurement.
*
@ -109,44 +109,13 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
/**
* Returns an approximation of the total amount of memory, in bytes,
* allocated in heap memory for the current thread.
* The returned value is an approximation because some Java virtual machine
* implementations may use object allocation mechanisms that result in a
* delay between the time an object is allocated and the time its size is
* recorded.
*
* <p>
* This is a convenience method for local management use and is
* equivalent to calling:
* <blockquote><pre>
* {@link #getThreadAllocatedBytes getThreadAllocatedBytes}(Thread.currentThread().getId());
* </pre></blockquote>
*
* @return an approximation of the total memory allocated, in bytes, in
* heap memory for the current thread
* if thread memory allocation measurement is enabled;
* {@code -1} otherwise.
*
* @throws UnsupportedOperationException if the Java virtual
* machine implementation does not support thread memory allocation
* measurement.
*
* @see #isThreadAllocatedMemorySupported
* @see #isThreadAllocatedMemoryEnabled
* @see #setThreadAllocatedMemoryEnabled
* @since 14
*/
public long getCurrentThreadAllocatedBytes();
/**
* Returns an approximation of the total amount of memory, in bytes,
* allocated in heap memory for the thread with the specified ID.
* allocated in heap memory for the thread of the specified ID.
* The returned value is an approximation because some Java virtual machine
* implementations may use object allocation mechanisms that result in a
* delay between the time an object is allocated and the time its size is
* recorded.
* <p>
* If the thread with the specified ID is not alive or does not exist,
* If the thread of the specified ID is not alive or does not exist,
* this method returns {@code -1}. If thread memory allocation measurement
* is disabled, this method returns {@code -1}.
* A thread is alive if it has been started and has not yet died.
@ -158,13 +127,13 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
*
* @param id the thread ID of a thread
* @return an approximation of the total memory allocated, in bytes, in
* heap memory for the thread with the specified ID
* if the thread with the specified ID exists, the thread is alive,
* heap memory for a thread of the specified ID
* if the thread of the specified ID exists, the thread is alive,
* and thread memory allocation measurement is enabled;
* {@code -1} otherwise.
*
* @throws IllegalArgumentException if {@code id} {@code <=} {@code 0}.
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine implementation does not support thread memory allocation
* measurement.
*
@ -196,7 +165,7 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
* @throws NullPointerException if {@code ids} is {@code null}
* @throws IllegalArgumentException if any element in the input array
* {@code ids} is {@code <=} {@code 0}.
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine implementation does not support thread memory allocation
* measurement.
*
@ -225,7 +194,7 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
* @return {@code true} if thread memory allocation measurement is enabled;
* {@code false} otherwise.
*
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine does not support thread memory allocation measurement.
*
* @see #isThreadAllocatedMemorySupported
@ -239,10 +208,10 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
* @param enable {@code true} to enable;
* {@code false} to disable.
*
* @throws UnsupportedOperationException if the Java virtual
* @throws java.lang.UnsupportedOperationException if the Java virtual
* machine does not support thread memory allocation measurement.
*
* @throws SecurityException if a security manager
* @throws java.lang.SecurityException if a security manager
* exists and the caller does not have
* ManagementPermission("control").
*

5
src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java
View File

@ -57,11 +57,6 @@ public class HotSpotThreadImpl extends ThreadImpl implements ThreadMXBean {
return super.getThreadUserTime(ids);
}
@Override
public long getCurrentThreadAllocatedBytes() {
return super.getCurrentThreadAllocatedBytes();
}
@Override
public long getThreadAllocatedBytes(long id) {
return super.getThreadAllocatedBytes(id);

173
test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/*
* @test
* @bug 6173675 8207266
* @bug 6173675
* @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
* @author Paul Hohensee
*/
@ -33,8 +33,9 @@ import java.lang.management.*;
public class ThreadAllocatedMemory {
private static com.sun.management.ThreadMXBean mbean =
(com.sun.management.ThreadMXBean)ManagementFactory.getThreadMXBean();
private static volatile boolean done = false;
private static volatile boolean done1 = false;
private static boolean testFailed = false;
private static boolean done = false;
private static boolean done1 = false;
private static Object obj = new Object();
private static final int NUM_THREADS = 10;
private static Thread[] threads = new Thread[NUM_THREADS];
@ -43,22 +44,6 @@ public class ThreadAllocatedMemory {
public static void main(String[] argv)
throws Exception {
testSupportEnableDisable();
// Test current thread two ways
testGetCurrentThreadAllocatedBytes();
testCurrentThreadGetThreadAllocatedBytes();
// Test a single thread that is not this one
testGetThreadAllocatedBytes();
// Test many threads that are not this one
testGetThreadsAllocatedBytes();
System.out.println("Test passed");
}
private static void testSupportEnableDisable() {
if (!mbean.isThreadAllocatedMemorySupported()) {
return;
}
@ -73,7 +58,10 @@ public class ThreadAllocatedMemory {
"ThreadAllocatedMemory is expected to be disabled");
}
long s = mbean.getCurrentThreadAllocatedBytes();
Thread curThread = Thread.currentThread();
long id = curThread.getId();
long s = mbean.getThreadAllocatedBytes(id);
if (s != -1) {
throw new RuntimeException(
"Invalid ThreadAllocatedBytes returned = " +
@ -89,106 +77,63 @@ public class ThreadAllocatedMemory {
throw new RuntimeException(
"ThreadAllocatedMemory is expected to be enabled");
}
}
private static void testGetCurrentThreadAllocatedBytes() {
long size = mbean.getCurrentThreadAllocatedBytes();
ensureValidSize(size);
// do some more allocation
doit();
checkResult(Thread.currentThread(), size,
mbean.getCurrentThreadAllocatedBytes());
}
private static void testCurrentThreadGetThreadAllocatedBytes() {
Thread curThread = Thread.currentThread();
long id = curThread.getId();
long size = mbean.getThreadAllocatedBytes(id);
ensureValidSize(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);
}
// do some more allocation
doit();
checkResult(curThread, size, mbean.getThreadAllocatedBytes(id));
}
private static void testGetThreadAllocatedBytes()
throws Exception {
// start a thread
done = false; done1 = false;
Thread curThread = new MyThread("MyThread");
curThread.start();
long id = curThread.getId();
// wait for thread to block after doing some allocation
waitUntilThreadBlocked(curThread);
long size = mbean.getThreadAllocatedBytes(id);
ensureValidSize(size);
// let thread go to do some more allocation
synchronized (obj) {
done = true;
obj.notifyAll();
// Expected to be size1 >= size
long size1 = mbean.getThreadAllocatedBytes(id);
if (size1 < size) {
throw new RuntimeException("Allocated bytes " + size1 +
" expected >= " + size);
}
System.out.println(curThread.getName() +
" Current thread allocated bytes = " + size +
" allocated bytes = " + size1);
// wait for thread to get going again. we don't care if we
// catch it in mid-execution or if it hasn't
// restarted after we're done sleeping.
goSleep(400);
checkResult(curThread, size, mbean.getThreadAllocatedBytes(id));
// let thread exit
synchronized (obj) {
done1 = true;
obj.notifyAll();
}
try {
curThread.join();
} catch (InterruptedException e) {
System.out.println("Unexpected exception is thrown.");
e.printStackTrace(System.out);
}
}
private static void testGetThreadsAllocatedBytes()
throws Exception {
// start threads
done = false; done1 = false;
// start threads, wait for them to block
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();
// threads block after doing some allocation
waitUntilThreadBlocked();
for (int i = 0; i < NUM_THREADS; i++) {
sizes[i] = mbean.getThreadAllocatedBytes(threads[i].getId());
ensureValidSize(sizes[i]);
}
// let threads go to do some more allocation
// let threads go and do some more allocation
synchronized (obj) {
done = true;
obj.notifyAll();
}
// wait for threads to get going again. we don't care if we
// 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);
for (int i = 0; i < NUM_THREADS; i++) {
checkResult(threads[i], sizes[i],
mbean.getThreadAllocatedBytes(threads[i].getId()));
long newSize = mbean.getThreadAllocatedBytes(threads[i].getId());
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);
}
// let threads exit
@ -203,30 +148,17 @@ public class ThreadAllocatedMemory {
} catch (InterruptedException e) {
System.out.println("Unexpected exception is thrown.");
e.printStackTrace(System.out);
testFailed = true;
break;
}
}
if (testFailed) {
throw new RuntimeException("TEST FAILED");
}
System.out.println("Test passed");
}
private static void ensureValidSize(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);
}
}
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);
}
System.out.println(curThread.getName() +
" Previous allocated bytes = " + prev_size +
" Current allocated bytes = " + curr_size);
}
private static void goSleep(long ms) throws Exception {
try {
@ -237,18 +169,7 @@ public class ThreadAllocatedMemory {
}
}
private static void waitUntilThreadBlocked(Thread thread)
throws Exception {
while (true) {
goSleep(100);
ThreadInfo info = mbean.getThreadInfo(thread.getId());
if (info.getThreadState() == Thread.State.WAITING) {
break;
}
}
}
private static void waitUntilThreadsBlocked()
private static void waitUntilThreadBlocked()
throws Exception {
int count = 0;
while (count != NUM_THREADS) {
@ -289,6 +210,7 @@ public class ThreadAllocatedMemory {
} catch (InterruptedException e) {
System.out.println("Unexpected exception is thrown.");
e.printStackTrace(System.out);
testFailed = true;
break;
}
}
@ -303,7 +225,7 @@ public class ThreadAllocatedMemory {
" ThreadAllocatedBytes = " + size2);
if (size1 > size2) {
throw new RuntimeException(getName() +
throw new RuntimeException("TEST FAILED: " + getName() +
" ThreadAllocatedBytes = " + size1 +
" > ThreadAllocatedBytes = " + size2);
}
@ -315,6 +237,7 @@ public class ThreadAllocatedMemory {
} catch (InterruptedException e) {
System.out.println("Unexpected exception is thrown.");
e.printStackTrace(System.out);
testFailed = true;
break;
}
}