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
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 3806b61..ccfc007 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -81,7 +81,6 @@
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
#############################################################################
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java
index a651efb..33a3226 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java
@@ -46,8 +46,6 @@
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 @@
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).
//
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java
index 36fdecf..e51fe64 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java
@@ -41,9 +41,13 @@
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 @@
final int samplingMultiplier = 111;
HeapMonitor.setSamplingRate(samplingMultiplier * sizeObject);
- emptyStorage();
allocate();
// For simplifications, the code is allocating:
@@ -96,7 +99,6 @@
// 0 means sample every allocation.
HeapMonitor.setSamplingRate(0);
- emptyStorage();
allocate();
double expected = maxIteration;
@@ -111,8 +113,6 @@
}
public static void main(String[] args) {
- HeapMonitor.enableSamplingEvents();
-
testBigAllocationRate();
testEveryAllocationSampled();
}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c
index 0ff03ff..41df828 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c
@@ -45,7 +45,7 @@
#define TRUE 1
#define FALSE 0
-#define PRINT_OUT 0
+#define PRINT_OUT 1
static jvmtiEnv *jvmti = NULL;
static jvmtiEnv *second_jvmti = NULL;
