Skip to content

SapMachine (17) #2323: Improve stability of himem tests #2324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RealCLanger merged 1 commit into from
Jul 6, 2026
+12 −12
Merged

SapMachine (17) #2323: Improve stability of himem tests #2324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions test/hotspot/jtreg/runtime/Vitals/TestHiMemReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ static void testPrint() throws Exception {
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:+HiMemReport", "-XX:HiMemReportMax=128m",
"-XX:NativeMemoryTracking=summary",
"-Xlog:vitals", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-Xmx128m", "-Xms128m", "-XX:+AlwaysPreTouch",
"-Xlog:vitals=trace", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-Xmx128m", "-Xms64m", "-XX:+AlwaysPreTouch",
TestHiMemReport.class.getName(),
"sleep", "2" // num seconds to sleep to give the reporter thread time to generate output
);
Expand All @@ -118,9 +118,9 @@ static void testDump() throws Exception {
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:+HiMemReport", "-XX:HiMemReportMax=128m",
"-XX:NativeMemoryTracking=summary",
"-Xlog:vitals", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-Xlog:vitals=trace", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-XX:HiMemReportDir=himemreport-1",
"-Xmx128m", "-Xms128m", "-XX:+AlwaysPreTouch",
"-Xmx128m", "-Xms64m", "-XX:+AlwaysPreTouch",
TestHiMemReport.class.getName(),
"sleep", "2" // num seconds to sleep to give the reporter thread time to generate output
);
Expand Down Expand Up @@ -150,9 +150,9 @@ static void testDumpWithExecToReportDir() throws Exception {
String reportDirName = "himemreport-2";
// Here we not only dump, but we also execute several jcmds. Therefore we take some more seconds to sleep
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:+HiMemReport", "-XX:HiMemReportMax=128m",
"-XX:+HiMemReport", "-XX:HiMemReportMax=64m",
"-XX:HiMemReportDir=himemreport-2",
"-Xlog:vitals", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-Xlog:vitals=trace", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-XX:HiMemReportExec=VM.flags -all;VM.metaspace show-loaders;GC.heap_dump",
"-XX:NativeMemoryTracking=summary",
"-Xmx128m", "-Xms128m", "-XX:+AlwaysPreTouch",
Expand Down Expand Up @@ -207,7 +207,7 @@ static void testDumpWithExecToReportDir() throws Exception {
".*HiMemReport *= *true.*",
".*HiMemReportDir *= *himemreport-2.*",
".*HiMemReportExec *= *VM.flags.*VM.metaspace.*GC.heap_dump.*",
".*HiMemReportMax *= *134217728.*"
".*HiMemReportMax *= *67108864.*"
});

// "VM.metaspace":
Expand Down Expand Up @@ -258,9 +258,9 @@ static void testDumpWithExecToReportDir() throws Exception {
// Test multiple Execs, with the output of the commands going to stderr
static void testDumpWithExecToStderr() throws Exception {
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:+HiMemReport", "-XX:HiMemReportMax=128m",
"-XX:+HiMemReport", "-XX:HiMemReportMax=64m",
"-XX:HiMemReportExec=VM.flags -all;VM.metaspace show-loaders",
"-Xlog:vitals", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-Xlog:vitals=trace", "-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-XX:NativeMemoryTracking=summary",
"-Xmx128m", "-Xms128m", "-XX:+AlwaysPreTouch",
TestHiMemReport.class.getName(),
Expand All @@ -280,7 +280,7 @@ static void testDumpWithExecToStderr() throws Exception {
// ... as well as the output of VM.flags
line = VitalsUtils.matchPatterns(lines, line + 1, new String [] {
".*HiMemReport *= *true.*",
".*HiMemReportMax *= *134217728.*",
".*HiMemReportMax *= *67108864.*",
"HiMemReport: Successfully executed \"VM.flags -all\" \\(\\d+ ms\\)"
});

Expand All @@ -307,7 +307,7 @@ static void testDumpWithExecToStderr() throws Exception {
static void testHasNaturalMax() throws IOException {
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:+PrintVitalsAtExit", "-XX:VitalsSampleInterval=1",
"-XX:+HiMemReport", "-Xlog:vitals", "-Xmx64m", "-version");
"-XX:+HiMemReport", "-Xlog:vitals=trace", "-Xmx64m", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.shouldNotMatch("HiMemReport.*limit could not be established");
Expand All @@ -326,7 +326,7 @@ else if (args[0].equals("natural-max"))
testHasNaturalMax();
else if (args[0].equals("sleep")) {
int numSeconds = Integer.parseInt(args[1]);
Thread.sleep(numSeconds * 1000 * 4); // TODO: Remove the additional time factor of 4 later.
Thread.sleep(numSeconds * 1000);
} else
throw new RuntimeException("Invalid test " + args[0]);
}
Expand Down
Loading