OpenJDK / jdk / jdk
changeset 57294:66211c44e126
8235490: AppCDS DynamicArchiveRelocationTest.java failed: 'always map archive(s) at an alternative address' missing
Reviewed-by: coleenp, ccheung
| author | iklam |
|---|---|
| date | Mon, 09 Dec 2019 09:59:03 -0800 |
| parents | e6ed9bef5f8f |
| children | 8d507e815358 |
| files | src/hotspot/share/memory/metaspaceShared.cpp test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/memory/metaspaceShared.cpp Mon Dec 09 13:02:05 2019 -0500 +++ b/src/hotspot/share/memory/metaspaceShared.cpp Mon Dec 09 09:59:03 2019 -0800 @@ -2052,6 +2052,7 @@ if (result == MAP_ARCHIVE_MMAP_FAILURE) { // Mapping has failed (probably due to ASLR). Let's map at an address chosen // by the OS. + log_info(cds)("Try to map archive(s) at an alternative address"); result = map_archives(static_mapinfo, dynamic_mapinfo, false); } }
--- a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java Mon Dec 09 13:02:05 2019 -0500 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java Mon Dec 09 09:59:03 2019 -0800 @@ -80,7 +80,7 @@ TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg, mainClass) .assertNormalExit(output -> { if (run_reloc) { - output.shouldContain("ArchiveRelocationMode == 1: always map archive(s) at an alternative address"); + output.shouldContain("Try to map archive(s) at an alternative address"); } }); }
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java Mon Dec 09 13:02:05 2019 -0500 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java Mon Dec 09 09:59:03 2019 -0800 @@ -88,7 +88,7 @@ String baseArchiveName = getNewArchiveName("base"); String topArchiveName = getNewArchiveName("top"); - String runtimeMsg = "ArchiveRelocationMode == 1: always map archive(s) at an alternative address"; + String runtimeMsg = "Try to map archive(s) at an alternative address"; String unlockArg = "-XX:+UnlockDiagnosticVMOptions"; // (1) Dump base archive (static)