Skip to content

Commit

Permalink
Merge pull request #16915 from pshipton/mxbean0.37
Browse files Browse the repository at this point in the history 
(0.37) Implement methods in com.sun.management.ThreadMXBean
  • Loading branch information
@keithc-ca
keithc-ca authored Mar 14, 2023
2 parents 3b4f8c9 + b975c9d commit d81f336
Show file tree
Hide file tree
Showing 4 changed files with 225 additions and 48 deletions.
4 changes: 2 additions & 2 deletions jcl/src/jdk.management/share/classes/com/ibm/lang/management/ThreadMXBean.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*[INCLUDE-IF Sidecar18-SE]*/
/*******************************************************************************
* Copyright (c) 2015, 2020 IBM Corp. and others
* Copyright (c) 2015, 2023 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -28,7 +28,7 @@
* APIs specific to {@link com.ibm.lang.management}, exposing additional
* information than what the standard ThreadMXBean does.
*/
public interface ThreadMXBean extends java.lang.management.ThreadMXBean
public interface ThreadMXBean extends com.sun.management.ThreadMXBean
{
/**
* Fetches an array of the native (operating system assigned) identifiers
Expand Down
93 changes: 92 additions & 1 deletion ...k.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadMXBeanImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*[INCLUDE-IF Sidecar18-SE]*/
/*******************************************************************************
* Copyright (c) 2007, 2016 IBM Corp. and others
* Copyright (c) 2007, 2023 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -67,4 +67,95 @@ public ExtendedThreadInfo[] dumpAllExtendedThreads(boolean lockedMonitors, boole
return resultArray;
}

/**
* {@inheritDoc}
*/
@Override
public long getThreadAllocatedBytes(long threadId) {
throw new UnsupportedOperationException();
}

/**
* {@inheritDoc}
*/
@Override
public long[] getThreadAllocatedBytes(long[] threadIds) {
throw new UnsupportedOperationException();
}

/**
* {@inheritDoc}
*/
@Override
public long[] getThreadCpuTime(long[] threadIds) {
long[] result = new long[threadIds.length];
for (int i = 0; i < threadIds.length; i++) {
if (threadIds[i] <= 0) {
/*[MSG "K05F7", "Thread id must be greater than 0."]*/
throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString("K05F7")); //$NON-NLS-1$
}
result[i] = -1;
}
if (isCurrentThreadCpuTimeSupported()) {
if (isThreadCpuTimeEnabled()) {
for (int i = 0; i < threadIds.length; i++) {
result[i] = getThreadCpuTime(threadIds[i]);
}
}
} else {
/*[MSG "K05F6", "CPU time measurement is not supported on this virtual machine."]*/
throw new UnsupportedOperationException(com.ibm.oti.util.Msg.getString("K05F6")); //$NON-NLS-1$
}
return result;
}

/**
* {@inheritDoc}
*/
@Override
public long[] getThreadUserTime(long[] threadIds) {
long[] result = new long[threadIds.length];
for (int i = 0; i < threadIds.length; i++) {
if (threadIds[i] <= 0) {
/*[MSG "K05F7", "Thread id must be greater than 0."]*/
throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString("K05F7")); //$NON-NLS-1$
}
result[i] = -1;
}
if (isCurrentThreadCpuTimeSupported()) {
if (isThreadCpuTimeEnabled()) {
for (int i = 0; i < threadIds.length; i++) {
result[i] = getThreadUserTime(threadIds[i]);
}
}
} else {
/*[MSG "K05F6", "CPU time measurement is not supported on this virtual machine."]*/
throw new UnsupportedOperationException(com.ibm.oti.util.Msg.getString("K05F6")); //$NON-NLS-1$
}
return result;
}

/**
* {@inheritDoc}
*/
@Override
public boolean isThreadAllocatedMemorySupported() {
return false;
}

/**
* {@inheritDoc}
*/
@Override
public boolean isThreadAllocatedMemoryEnabled() {
throw new UnsupportedOperationException();
}

/**
* {@inheritDoc}
*/
@Override
public void setThreadAllocatedMemoryEnabled(boolean value) {
throw new UnsupportedOperationException();
}
}
23 changes: 0 additions & 23 deletions jcl/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java
View file

This file was deleted.

153 changes: 131 additions & 22 deletions test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestThreadMXBean.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2005, 2020 IBM Corp. and others
* Copyright (c) 2005, 2023 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -70,20 +70,23 @@ public class TestThreadMXBean {
ignoredAttributes.add("ObjectName");
attribs = new Hashtable<String, AttributeData>();
attribs.put("AllThreadIds", new AttributeData("[J", true, false, false));
attribs.put("CurrentThreadAllocatedBytes", new AttributeData(Long.TYPE.getName(), true, false, false));
attribs.put("CurrentThreadCpuTime", new AttributeData(Long.TYPE.getName(), true, false, false));
attribs.put("CurrentThreadCpuTimeSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("CurrentThreadUserTime", new AttributeData(Long.TYPE.getName(), true, false, false));
attribs.put("DaemonThreadCount", new AttributeData(Integer.TYPE.getName(), true, false, false));
attribs.put("ObjectMonitorUsageSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("PeakThreadCount", new AttributeData(Integer.TYPE.getName(), true, false, false));
attribs.put("ThreadCount", new AttributeData(Integer.TYPE.getName(), true, false, false));
attribs.put("TotalStartedThreadCount", new AttributeData(Long.TYPE.getName(), true, false, false));
attribs.put("CurrentThreadCpuTimeSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("SynchronizerUsageSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("ThreadAllocatedMemoryEnabled", new AttributeData(Boolean.TYPE.getName(), true, true, true));
attribs.put("ThreadAllocatedMemorySupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("ThreadContentionMonitoringEnabled", new AttributeData(Boolean.TYPE.getName(), true, true, true));
attribs.put("ThreadContentionMonitoringSupported",
new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("ThreadCount", new AttributeData(Integer.TYPE.getName(), true, false, false));
attribs.put("ThreadCpuTimeEnabled", new AttributeData(Boolean.TYPE.getName(), true, true, true));
attribs.put("ThreadCpuTimeSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("ObjectMonitorUsageSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("SynchronizerUsageSupported", new AttributeData(Boolean.TYPE.getName(), true, false, true));
attribs.put("TotalStartedThreadCount", new AttributeData(Long.TYPE.getName(), true, false, false));
} // end static initializer

private ThreadMXBean tb;
Expand Down Expand Up @@ -350,16 +353,70 @@ public final void testGetThreadCpuTime() {
AssertJUnit.assertTrue(e instanceof IllegalArgumentException);
}

// test getThreadCpuTime(long[])
try {
tb.getThreadCpuTime(null);
Assert.fail("Should have thrown NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
long[] badIds = new long[] {-1};
tb.getThreadCpuTime(badIds);
Assert.fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
Object sync = new Object();
Thread t1 = new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(100);
synchronized (sync) {
sync.notify();
sync.wait();
}
} catch (InterruptedException e) {
// ignore
}
}
});
try {
synchronized (sync) {
t1.start();
sync.wait();
}
long[] ids = new long[] {Thread.currentThread().getId(), t1.getId()};
long[] times = tb.getThreadCpuTime(ids);
AssertJUnit.assertEquals(2, times.length);
for (int i = 0; i < times.length; i++) {
AssertJUnit.assertTrue(ids[i] > -1);
}
synchronized (sync) {
sync.notify();
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
} else {
// Should return -1 if CPU time measurement is currently
// disabled.
AssertJUnit.assertTrue(tb.getThreadCpuTime(Thread.currentThread().getId()) == -1);
AssertJUnit.assertTrue(tb.getThreadCpuTime(new long[] {Thread.currentThread().getId()})[0] == -1);
}
} else {
try {
long tmp = tb.getThreadCpuTime(100);
Assert.fail("Should have thrown an exception!");
Assert.fail("getThreadCpuTime(long) should have thrown UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
}
try {
long[] tmp = tb.getThreadCpuTime(new long[] {100});
Assert.fail("getThreadCpuTime(long[]) should have thrown UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
}
}
}
Expand Down Expand Up @@ -524,17 +581,70 @@ public final void testGetThreadUserTime() {
AssertJUnit.assertTrue(e instanceof IllegalArgumentException);
}

// test getThreadUserTime(long[])
try {
tb.getThreadUserTime(null);
Assert.fail("Should have thrown NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
long[] badIds = new long[] {-1};
tb.getThreadUserTime(badIds);
Assert.fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
Object sync = new Object();
Thread t1 = new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(100);
synchronized (sync) {
sync.notify();
sync.wait();
}
} catch (InterruptedException e) {
// ignore
}
}
});
try {
synchronized (sync) {
t1.start();
sync.wait();
}
long[] ids = new long[]{Thread.currentThread().getId(), t1.getId()};
long[] times = tb.getThreadUserTime(ids);
AssertJUnit.assertEquals(2, times.length);
for (int i = 0; i < times.length; i++) {
AssertJUnit.assertTrue(ids[i] > -1);
}
synchronized (sync) {
sync.notify();
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
} else {
// Should return -1 if CPU time measurement is currently
// disabled.
AssertJUnit.assertTrue(tb.getThreadUserTime(Thread.currentThread().getId()) == -1);
AssertJUnit.assertTrue(tb.getThreadUserTime(new long[] {Thread.currentThread().getId()})[0] == -1);
}
} else {
try {
long tmp = tb.getThreadUserTime(100);
Assert.fail("Should have thrown an exception!");
} catch (Exception e) {
AssertJUnit.assertTrue(e instanceof UnsupportedOperationException);
Assert.fail("getThreadUserTime(long) should have thrown UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
}
try {
long[] tmp = tb.getThreadUserTime(new long[] {100});
Assert.fail("getThreadUserTime(long[]) should have thrown UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
}
}
}
Expand Down Expand Up @@ -1318,13 +1428,7 @@ public final void testGetMBeanInfo() {
AssertJUnit.assertNotNull(constructors);
AssertJUnit.assertEquals(0, constructors.length);

int opNbr;
if (org.openj9.test.util.VersionCheck.major() >= 10) {
opNbr = 16;
} else {
// Java 8 - 9
opNbr = 14;
}
int opNbr = 20;
MBeanOperationInfo[] operations = mbi.getOperations();
AssertJUnit.assertNotNull(operations);
AssertJUnit.assertEquals(opNbr, operations.length);
Expand All @@ -1337,15 +1441,20 @@ public final void testGetMBeanInfo() {
// Print description and the class name (not necessarily identical).
logger.debug("MBean description for " + tb.getClass().getName() + ": " + mbi.getDescription());

// 14 attributes
MBeanAttributeInfo[] attributes = mbi.getAttributes();
AssertJUnit.assertNotNull(attributes);
AssertJUnit.assertEquals(15, attributes.length);
for (int i = 0; i < attributes.length; i++) {
MBeanAttributeInfo info = attributes[i];
AssertJUnit.assertEquals(18, attributes.length);
HashSet<String> attributeNames = new HashSet<>();
for (MBeanAttributeInfo info : attributes) {
AssertJUnit.assertNotNull(info);
AllManagementTests.validateAttributeInfo(info, TestThreadMXBean.ignoredAttributes, attribs);
} // end for
attributeNames.add(info.getName());
}
for (String name : attribs.keySet()) {
if (!attributeNames.contains(name)) {
Assert.fail("Missing attribute name: " + name);
}
}
}

// /**
Expand Down

0 comments on commit d81f336

Please sign in to comment.