Skip to content

Commit

Permalink
Replace jdk8 OpenJ9 deprecated methods with equivalents
Browse files Browse the repository at this point in the history 
Otherwise the test code does not compile on jdk19 where the methods are
removed.
See eclipse-openj9/openj9#15127

Signed-off-by: Peter Shipton <[email protected]>
  • Loading branch information
@pshipton
pshipton committed May 30, 2022
1 parent f02eac9 commit d7bbc9c
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 98 deletions.
8 changes: 4 additions & 4 deletions ...test.jlm/src/test.jlm.ibm/net/openj9/test/extensions/OperatingSystemExtensionCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017, 2019 IBM Corp. and others
* Copyright (c) 2017, 2022 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 distribution
Expand Down Expand Up @@ -70,7 +70,7 @@ public void execute () {
com.ibm.lang.management.OperatingSystemMXBean ibmOsb = (com.ibm.lang.management.OperatingSystemMXBean) osBean;

long free_physical_memory = ibmOsb.getFreePhysicalMemorySize();
long process_virtual_memory = ibmOsb.getProcessVirtualMemorySize();
long process_virtual_memory = ibmOsb.getCommittedVirtualMemorySize();
long process_private_memory = ibmOsb.getProcessPrivateMemorySize();
long process_physical_memory = ibmOsb.getProcessPhysicalMemorySize();
long process_cpu_time = ibmOsb.getProcessCpuTime();
Expand All @@ -89,7 +89,7 @@ public void execute () {
com.ibm.lang.management.OperatingSystemMXBean.class);

long free_physical_memory_size = ibmOsb.getFreePhysicalMemorySize();
long process_virtual_memory_size = ibmOsb.getProcessVirtualMemorySize();
long process_virtual_memory_size = ibmOsb.getCommittedVirtualMemorySize();
long process_private_memory_size = ibmOsb.getProcessPrivateMemorySize();
long process_physical_memory_size = ibmOsb.getProcessPhysicalMemorySize();
long process_cpu_time = ibmOsb.getProcessCpuTime();
Expand All @@ -105,7 +105,7 @@ public void execute () {
try {
ObjectName srvOSBeanName = new ObjectName(ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME);
long free_physical_memory_size = (long)mbs.getAttribute(srvOSBeanName, "FreePhysicalMemorySize");
long process_virtual_memory_size = (long)mbs.getAttribute(srvOSBeanName, "ProcessVirtualMemorySize");
long process_virtual_memory_size = (long)mbs.getAttribute(srvOSBeanName, "CommittedVirtualMemorySize");
long process_private_memory_size = (long)mbs.getAttribute(srvOSBeanName, "ProcessPrivateMemorySize");
long process_physical_memory_size = (long)mbs.getAttribute(srvOSBeanName, "ProcessPhysicalMemorySize");
long process_cpu_time = (long)mbs.getAttribute(srvOSBeanName, "ProcessCpuTime");
Expand Down
94 changes: 47 additions & 47 deletions ...test.jlm/src/test.jlm.ibm/net/openj9/test/management/TestOperatingSystemMXBean_Local.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*******************************************************************************
* Copyright (c) 2017, 2019 IBM Corp. and others
* Copyright (c) 2017, 2022 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 distribution
* and is available at http://eclipse.org/legal/epl-2.0 or the Apache License,
* Version 2.0 which accompanies this distribution and is available at
* and is available at http://eclipse.org/legal/epl-2.0 or the Apache License,
* Version 2.0 which accompanies this distribution and is available at
* https://www.apache.org/licenses/LICENSE-2.0.
*
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception [1] and GNU General Public License,
* version 2 with the OpenJDK Assembly Exception [2].
*
*
* [1] https://www.gnu.org/software/classpath/license.html
* [2] http://openjdk.java.net/legal/assembly-exception.html
*
Expand Down Expand Up @@ -47,7 +47,7 @@ public class TestOperatingSystemMXBean_Local extends junit.framework.TestCase {
JMXConnector connector = null;
MBeanServerConnection mbeanConnection = null;
static com.ibm.lang.management.OperatingSystemMXBean osmxbean = null;
static String OSNAME = null;
static String OSNAME = null;
static String OSARCH = null;
static {
try {
Expand Down Expand Up @@ -86,19 +86,19 @@ public void test_SwapSpaceSizeAPIs() {
long freeSwap = 0;

totalSwap = osmxbean.getTotalSwapSpaceSize();
freeSwap = osmxbean.getFreeSwapSpaceSize();
freeSwap = osmxbean.getFreeSwapSpaceSize();
if ((-1 != totalSwap) && (-1 != freeSwap)) {
if (freeSwap <= totalSwap) {
//ok
} else {
fail("Invalid Swap Memory Info retrieved , Free Swap size cannot be" +
"greater than total Swap Size." +
" getTotalSwapSpaceSize() & getFreeSwapSpaceSize() API's failed "+"osmxbean.getFreeSwapSpaceSize()="+freeSwap+" osmxbean.getTotalSwapSpaceSize is "+ totalSwap);
"greater than total Swap Size." +
" getTotalSwapSpaceSize() & getFreeSwapSpaceSize() API's failed "+"osmxbean.getFreeSwapSpaceSize()="+freeSwap+" osmxbean.getTotalSwapSpaceSize is "+ totalSwap);

}
} else {
if (-1 == totalSwap) {
/*
/*
* An error has occurred since getTotalSwapSpaceSize() has returned -1.
* -1 can also mean it is not supported, but we exclude these tests on
* non-supported platforms(i.e System-Z). */
Expand All @@ -108,7 +108,7 @@ public void test_SwapSpaceSizeAPIs() {
}

if (-1 == freeSwap) {
/*
/*
* An error has occurred since getFreeSwapSpaceSize() has returned -1.
* -1 can also mean it is not supported, but we exclude these tests on
* non-supported platforms(i.e System-Z).*/
Expand All @@ -120,11 +120,11 @@ public void test_SwapSpaceSizeAPIs() {
}

/**
* Test the getTotalPhysicalMemory() & getFreePhysicalMemorySize() APIs of OperatingSystemMXBean
* Test the getTotalPhysicalMemorySize() & getFreePhysicalMemorySize() APIs of OperatingSystemMXBean
*/
public void test_PhysicalMemoryAPIs() {
long totalMemory = osmxbean.getTotalPhysicalMemory();
long freeMemory = osmxbean.getFreePhysicalMemorySize();
long totalMemory = osmxbean.getTotalPhysicalMemorySize();
long freeMemory = osmxbean.getFreePhysicalMemorySize();

if ((-1 != totalMemory) && (-1 != freeMemory)) {
// Check for the validity of the values from the API
Expand All @@ -133,25 +133,25 @@ public void test_PhysicalMemoryAPIs() {
} else {
fail("Invalid Physical Memory Info retrieved , Total Physical " +
"Memory cannot be 0 bytes and Free Physical Memory size cannot be" +
" greater than total Physical Memory Size." +
"\nError: getTotalPhysicalMemory() & getFreePhysicalMemorySize() API failed!!"+"totalMemory is:"+ totalMemory+ "freeMemory is:"+freeMemory);
" greater than total Physical Memory Size." +
"\nError: getTotalPhysicalMemorySize() & getFreePhysicalMemorySize() API failed!!"+"totalMemory is:"+ totalMemory+ "freeMemory is:"+freeMemory);
}
} else {
if (-1 == totalMemory) {
/*
* An error has occurred since getTotalPhysicalMemory() has returned -1.
/*
* An error has occurred since getTotalPhysicalMemorySize() has returned -1.
* -1 can also mean it is not supported, but we exclude these tests on
* non-supported platforms(i.e System-Z).
*/
fail("getTotalPhysicalMemory() API returned -1, test failed"+"totalMemory is:"+totalMemory);
fail("getTotalPhysicalMemorySize() API returned -1, test failed"+"totalMemory is:"+totalMemory);
} else if (totalMemory < -1){
fail("getTotalPhysicalMemory() API returned "+ totalMemory + ", test failed");
fail("getTotalPhysicalMemorySize() API returned "+ totalMemory + ", test failed");
} else {
//ok
}

if (-1 == freeMemory) {
/*
/*
* An error has occurred since getFreePhysicalMemorySize() has returned -1.
* -1 can also mean it is not supported, but we exclude these tests on
* non-supported platforms(i.e System-Z).
Expand All @@ -171,41 +171,41 @@ public void test_PhysicalMemoryAPIs() {
}

/**
* Test the getProcessVirtualMemorySize() APIs OperatingSystemMXBean
* Test the getCommittedVirtualMemorySize() APIs OperatingSystemMXBean
*/
public void test_getProcessVirtualMemorySize() {
long processVirtualMem = osmxbean.getProcessVirtualMemorySize();
String osname = osmxbean.getName();
public void test_getCommittedVirtualMemorySize() {
long processVirtualMem = osmxbean.getCommittedVirtualMemorySize();
String osname = osmxbean.getName();

if (-1 != processVirtualMem) {
if(processVirtualMem > 0) {
//ok
} else {
fail("Invalid Process Virtual Memory Size retrieved," +
"ProcessVirtualMemory cannot be less than 0" +
"\nError: getProcessVirtualMemorySize() API failed!!"+"processVirtualMem is: "+processVirtualMem);
"\nError: getCommittedVirtualMemorySize() API failed!!"+"processVirtualMem is: "+processVirtualMem);

}
} else if ((-1 == processVirtualMem) && ((true == osname.equals("AIX")) || (true == osname.equalsIgnoreCase("z/OS"))) ) {//CMVC#199325
/* API not supported on AIX for now, so we ignore the -1 */
} else {
/*
* An error has occurred since getProcessVirtualMemorySize() has returned -1.
/*
* An error has occurred since getCommittedVirtualMemorySize() has returned -1.
* -1 can also mean it is not supported, but we exclude these tests on
* non-supported platforms(i.e System-Z).
*/
fail("Error: getProcessVirtualMemorySize() returned -1, API failed!!"+ "processVirtualMem is:"+ processVirtualMem);
fail("Error: getCommittedVirtualMemorySize() returned -1, API failed!!"+ "processVirtualMem is:"+ processVirtualMem);
}
}

/**
* Test the getProcessCpuTimeByNS() API of OperatingSystemMXBean
* Test the getProcessCpuTime() API of OperatingSystemMXBean
*/
public void test_getProcessCpuTimeByNS() {
public void test_getProcessCpuTime() {
int i = 0;
long processCpuTime_old = 0;
long processCpuTime_new = 0;
processCpuTime_old = osmxbean.getProcessCpuTimeByNS();
processCpuTime_old = osmxbean.getProcessCpuTime();

if (-1 != processCpuTime_old) {
try {
Expand All @@ -223,9 +223,9 @@ public void test_getProcessCpuTimeByNS() {
busyObj[i].join();
}
}
processCpuTime_new = osmxbean.getProcessCpuTimeByNS();
processCpuTime_new = osmxbean.getProcessCpuTime();
if (-1 == processCpuTime_new) {
fail("Error: getProcessCpuTimeByNS() returned -1, API failed!!");
fail("Error: getProcessCpuTime() returned -1, API failed!!");
}

} catch(InterruptedException e) {
Expand All @@ -234,25 +234,25 @@ public void test_getProcessCpuTimeByNS() {

if (processCpuTime_new == processCpuTime_old) {
if(OSNAME.equalsIgnoreCase("z/OS")){
//ok
//ok
}else{
fail("Processor load did not increase. Reiterating ..."+"processCpuTime_new is:"+processCpuTime_new +" processCpuTime_old is"+ processCpuTime_old);
fail("Processor load did not increase. Reiterating ..."+"processCpuTime_new is:"+processCpuTime_new +" processCpuTime_old is"+ processCpuTime_old);
}
} else if (processCpuTime_new > processCpuTime_old) {
//ok
}
} else {
/*
* An error has occurred since getProcessCpuTimeByNS() has returned -1.
/*
* An error has occurred since getProcessCpuTime() has returned -1.
* -1 can also mean it is not supported, but we exclude these tests on
* non-supported platforms(i.e System-Z).
*/
fail("Error: getProcessCpuTimeByNS() returned -1, API failed!!"+ "processCpuTime_old is:"+processCpuTime_old);
fail("Error: getProcessCpuTime() returned -1, API failed!!"+ "processCpuTime_old is:"+processCpuTime_old);
}
}

/**
* Function tests the MemoryUsage retrieval functionality for sanity conditions as also prints
* Function tests the MemoryUsage retrieval functionality for sanity conditions as also prints
* out some basic memory usage statistics retrieved using the MXBean.
*
*/
Expand Down Expand Up @@ -314,7 +314,7 @@ public void test_memoryInfo() {
}

cached = memUsage.getCached();

if (-1 == cached) {
fail("Size of cached memory: <undefined for platform>"+"memUsage.getCached() : "+cached);
} else {
Expand All @@ -325,7 +325,7 @@ public void test_memoryInfo() {
if (-1 == buffered) {

if(OSNAME.contains("windows") || OSNAME.contains("aix")){
//ok
//ok
} else {
fail("Size of buffered memory: <undefined for platform>"+" memUsage.getBuffered() : "+ buffered);
}
Expand All @@ -350,12 +350,12 @@ public void test_memoryInfo() {
}

/**
* Function tests the ProcessorUsage retrieval functionality for sanity conditions as also prints
* Function tests the ProcessorUsage retrieval functionality for sanity conditions as also prints
* out processor usage statistics retrieved using the MBean.
*/
public void test_processorInfo()
{
if(OSNAME.equalsIgnoreCase("z/OS")){
if(OSNAME.equalsIgnoreCase("z/OS")){
//ok
} else {
ProcessorUsage procUsage = null;
Expand Down Expand Up @@ -435,12 +435,12 @@ public void test_processorInfo()
int id = procUsageArr[i].getId();
}
Thread.sleep(300);
}
}
} catch(ProcessorUsageRetrievalException pu) {
fail("Exception occurred retrieving processor usage: " + pu.getMessage());
} catch(java.lang.InterruptedException ie) {
fail("Exception occurred while sleeping thread: " + ie.getMessage());
} catch(Exception e) {
} catch(Exception e) {
e.printStackTrace();
fail("Unknown exception occurred:" + e.getMessage());

Expand Down
Loading

0 comments on commit d7bbc9c

Please sign in to comment.