Skip to content
Closed
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,20 @@ private static class MacOSPatterns implements MapPatterns {

static final String macow = "cow";
static final String macprivate = "pvt";
static final String macprivate_or_shared = "(pvt|tsh|cow|p/a)";
static final String macprivate_or_shared = "(pvt|shr)";
static final String macmem = "(pvt|tsh|cow|p/a)";
static final String macprivatealiased = "p/a";

static final String macOSbase = range + space + someSize + space + macprot + space;

static final String shouldMatchUnconditionally_macOS[] = {
// java launcher
macOSbase + macow + space + someNumber + space + "/.*/bin/java",
// we should see the hs-perf data file, and it should appear as shared as well as committed
macOSbase + macprivate + space + someNumber + space + ".*/.*/hsperfdata_.*"
/*
* We should see the hs-perf data file, and it should appear as shared as well as committed.
* In the jtreg tests this segment appears private.
*/
macOSbase + macprivate_or_shared + space + someNumber + space + ".*/.*/hsperfdata_.*"
};

static final String shouldMatch_macOS_libjvm[] = {
Expand All @@ -198,7 +202,7 @@ private static class MacOSPatterns implements MapPatterns {

static final String shouldMatchIfNMTIsEnabled_macOS[] = {
// heap is private with G1GC, shared with ZGC
macOSbase + macprivate_or_shared + space + someNumber + space + "JAVAHEAP.*",
macOSbase + macmem + space + someNumber + space + "JAVAHEAP.*",
// metaspace
macOSbase + macprivate + space + someNumber + space + "META.*",
// code cache
Expand Down