diff -r ee37c9b2eb61 -r 778fc2dcbdaa test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java --- a/test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java Wed Sep 18 17:31:35 2019 -0400 +++ b/test/jdk/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java Wed Sep 18 20:49:13 2019 -0400 @@ -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 @@ 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 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 @@ "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 @@ 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)); - } + // 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); - private static void testGetThreadAllocatedBytes() - throws Exception { - // start a thread - done = false; done1 = false; - Thread curThread = new MyThread("MyThread"); - curThread.start(); - long id = curThread.getId(); + // 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 thread to block after doing some allocation - waitUntilThreadBlocked(curThread); + // threads block after doing some allocation + waitUntilThreadBlocked(); - long size = mbean.getThreadAllocatedBytes(id); - ensureValidSize(size); + for (int i = 0; i < NUM_THREADS; i++) { + sizes[i] = mbean.getThreadAllocatedBytes(threads[i].getId()); + } - // let thread go to do some more allocation + // let threads go and do some more allocation synchronized (obj) { done = true; obj.notifyAll(); } - // 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; - 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(); - - 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 - 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 @@ } catch (InterruptedException e) { System.out.println("Unexpected exception is thrown."); e.printStackTrace(System.out); + testFailed = true; break; } } - } + if (testFailed) { + throw new RuntimeException("TEST FAILED"); + } - 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); - } + System.out.println("Test passed"); } - 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 @@ } } - 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 @@ } catch (InterruptedException e) { System.out.println("Unexpected exception is thrown."); e.printStackTrace(System.out); + testFailed = true; break; } } @@ -303,7 +225,7 @@ " ThreadAllocatedBytes = " + size2); if (size1 > size2) { - throw new RuntimeException(getName() + + throw new RuntimeException("TEST FAILED: " + getName() + " ThreadAllocatedBytes = " + size1 + " > ThreadAllocatedBytes = " + size2); } @@ -315,6 +237,7 @@ } catch (InterruptedException e) { System.out.println("Unexpected exception is thrown."); e.printStackTrace(System.out); + testFailed = true; break; } }