8205541: serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java fails with Should not have any events stored yet

Fix StatArray and StatObject tests from the HeapMonitor package

Reviewed-by: amenkov, sspitsyn
This commit is contained in:
Jean Christophe Beyler 2018-07-17 15:09:27 -07:00 committed by Jean Christophe Beyler
parent a1dda2a3fa
commit 6f9cb3f9ca
4 changed files with 9 additions and 8 deletions

View File

@ -81,7 +81,6 @@ runtime/CompressedOops/UseCompressedOops.java 8079353 generic-all
serviceability/sa/TestRevPtrsForInvokeDynamic.java 8191270 generic-all
serviceability/sa/sadebugd/SADebugDTest.java 8163805 generic-all
serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java 8205541 generic-all
serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java 8205652 generic-all
#############################################################################

View File

@ -46,8 +46,6 @@ public class HeapMonitorStatArrayCorrectnessTest {
public static void main(String[] args) {
int sizes[] = {1000, 10000, 100000};
HeapMonitor.enableSamplingEvents();
for (int currentSize : sizes) {
System.out.println("Testing size " + currentSize);
@ -56,12 +54,16 @@ public class HeapMonitorStatArrayCorrectnessTest {
throw new RuntimeException("Should not have any events stored yet.");
}
HeapMonitor.enableSamplingEvents();
// 111 is as good a number as any.
final int samplingMultiplier = 111;
HeapMonitor.setSamplingRate(samplingMultiplier * currentSize);
allocate(currentSize);
HeapMonitor.disableSamplingEvents();
// For simplifications, we ignore the array memory usage for array internals (with the array
// sizes requested, it should be a negligible oversight).
//

View File

@ -41,9 +41,13 @@ public class HeapMonitorStatObjectCorrectnessTest {
private native static boolean statsHaveExpectedNumberSamples(int expected, int percentError);
private static void allocate() {
emptyStorage();
HeapMonitor.enableSamplingEvents();
for (int j = 0; j < maxIteration; j++) {
obj = new BigObject();
}
HeapMonitor.disableSamplingEvents();
}
private static void testBigAllocationRate() {
@ -53,7 +57,6 @@ public class HeapMonitorStatObjectCorrectnessTest {
final int samplingMultiplier = 111;
HeapMonitor.setSamplingRate(samplingMultiplier * sizeObject);
emptyStorage();
allocate();
// For simplifications, the code is allocating:
@ -96,7 +99,6 @@ public class HeapMonitorStatObjectCorrectnessTest {
// 0 means sample every allocation.
HeapMonitor.setSamplingRate(0);
emptyStorage();
allocate();
double expected = maxIteration;
@ -111,8 +113,6 @@ public class HeapMonitorStatObjectCorrectnessTest {
}
public static void main(String[] args) {
HeapMonitor.enableSamplingEvents();
testBigAllocationRate();
testEveryAllocationSampled();
}

View File

@ -45,7 +45,7 @@ extern "C" {
#define TRUE 1
#define FALSE 0
#define PRINT_OUT 0
#define PRINT_OUT 1
static jvmtiEnv *jvmti = NULL;
static jvmtiEnv *second_jvmti = NULL;