8292269: Replace FileMapInfo::fail_continue() with Unified Logging

Reviewed-by: iklam, dholmes, ccheung

Author: Matias Saavedra Silva

src/hotspot/share/cds/dynamicArchive.cpp

@@ -420,14 +420,14 @@ bool DynamicArchive::validate(FileMapInfo* dynamic_info) {
 
   // Check the header crc
   if (dynamic_header->base_header_crc() != base_info->crc()) {
-    FileMapInfo::fail_continue("Dynamic archive cannot be used: static archive header checksum verification failed.");
+    log_warning(cds)("Dynamic archive cannot be used: static archive header checksum verification failed.");
     return false;
   }
 
   // Check each space's crc
   for (int i = 0; i < MetaspaceShared::n_regions; i++) {
     if (dynamic_header->base_region_crc(i) != base_info->region_crc(i)) {
-      FileMapInfo::fail_continue("Dynamic archive cannot be used: static archive region #%d checksum verification failed.", i);
+      log_warning(cds)("Dynamic archive cannot be used: static archive region #%d checksum verification failed.", i);
       return false;
     }
   }

src/hotspot/share/cds/filemap.cpp

@@ -484,9 +484,6 @@ class FileMapInfo : public CHeapObj<mtInternal> {
 
   // Errors.
   static void fail_stop(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
-  static void fail_continue(const char *msg, ...) ATTRIBUTE_PRINTF(1, 2);
-  static void fail_continue(LogLevelType level, const char *msg, ...) ATTRIBUTE_PRINTF(2, 3);
-  static void fail_continue_impl(LogLevelType level, const char *msg, va_list ap) ATTRIBUTE_PRINTF(2, 0);
   static bool memory_mapping_failed() {
     CDS_ONLY(return _memory_mapping_failed;)
     NOT_CDS(return false;)

src/hotspot/share/cds/filemap.hpp

@@ -947,18 +947,27 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
     // The base archive cannot be mapped. We cannot dump the dynamic shared archive.
     AutoCreateSharedArchive = false;
     DynamicDumpSharedSpaces = false;
-    FileMapInfo::fail_continue("Unable to map shared spaces");
+    log_info(cds)("Unable to map shared spaces");
     if (PrintSharedArchiveAndExit) {
       vm_exit_during_initialization("Unable to use shared archive.");
+    } else if (RequireSharedSpaces) {
+      FileMapInfo::fail_stop("Unable to map shared spaces");
     }
   }
 
+  // If mapping failed and -XShare:on, the vm should exit
+  bool has_failed = false;
   if (static_mapinfo != nullptr && !static_mapinfo->is_mapped()) {
+    has_failed = true;
     delete static_mapinfo;
   }
   if (dynamic_mapinfo != nullptr && !dynamic_mapinfo->is_mapped()) {
+    has_failed = true;
     delete dynamic_mapinfo;
   }
+  if (RequireSharedSpaces && has_failed) {
+      FileMapInfo::fail_stop("Unable to map shared spaces");
+  }
 }
 
 FileMapInfo* MetaspaceShared::open_static_archive() {
@@ -984,6 +993,9 @@ FileMapInfo* MetaspaceShared::open_dynamic_archive() {
   FileMapInfo* mapinfo = new FileMapInfo(dynamic_archive, false);
   if (!mapinfo->initialize()) {
     delete(mapinfo);
+    if (RequireSharedSpaces) {
+      FileMapInfo::fail_stop("Failed to initialize dynamic archive");
+    }
     return nullptr;
   }
   return mapinfo;

src/hotspot/share/cds/metaspaceShared.cpp

@@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception {
             throw new RuntimeException("Test error: cds file already exists");
 
         CDSOptions opts = (new CDSOptions()).setArchiveName(fileName);
-
+        opts.addPrefix("-Xlog:cds");
         // -Xshare=on
         OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
         CDSTestUtils.checkMappingFailure(out);

test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java

@@ -48,7 +48,7 @@ private static void createAndLoadSharedArchive(String create, String load)
 
         CDSTestUtils.createArchiveAndCheck(createCompactStringsArgument);
 
-        OutputAnalyzer out = CDSTestUtils.runWithArchive(loadCompactStringsArgument);
+        OutputAnalyzer out = CDSTestUtils.runWithArchive("-Xlog:cds", loadCompactStringsArgument);
         CDSTestUtils.checkMappingFailure(out);
 
         out.shouldMatch("The shared archive file's CompactStrings " +

test/hotspot/jtreg/runtime/cds/CdsDifferentCompactStrings.java

@@ -63,7 +63,7 @@ public static void main(String[] args) throws Exception {
 
         CDSTestUtils.createArchiveAndCheck(createAlignmentArgument);
 
-        OutputAnalyzer out = CDSTestUtils.runWithArchive(loadAlignmentArgument);
+        OutputAnalyzer out = CDSTestUtils.runWithArchive("-Xlog:cds", loadAlignmentArgument);
         CDSTestUtils.checkExecExpectError(out, 1, expectedErrorMsg);
     }
 }

test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java

@@ -114,7 +114,7 @@ public static void main(String[] args) throws Exception {
     TestCommon.run(
         "-cp", cp,
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "[Timestamp mismatch]"));
+      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "Timestamp mismatch"));
 
     log("Even if hello.jar is out of date, we should still be able to print the dictionary.");
     TestCommon.run(
@@ -128,7 +128,7 @@ public static void main(String[] args) throws Exception {
     TestCommon.run(
         "-cp", cp,
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "[Required classpath entry does not exist: " + appJar + "]"));
+      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "Required classpath entry does not exist: " + appJar));
 
     log("Execution with major errors -- with 'major' errors like the JSA file\n" +
         "is missing, we should stop immediately to avoid crashing the JVM.");

test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java

@@ -221,6 +221,7 @@ static void testset_1(String jar, String[] noAppClasses, String[] appClasses, Te
                 runtime_arg1 = runtime_arg2 = runtime_arg3 = runtime_setting;
             }
             TestCommon.run("-cp", jar,
+                           "-Xlog:cds",
                            runtime_arg1, runtime_arg2, runtime_arg3,
                            "VerifierTest0")
                 .ifNoMappingFailure(output -> checkRuntimeOutput(output, expected_output_str));
@@ -301,6 +302,7 @@ static void testset_2(String jarName_greet, String jarName_hi) throws Exception
                 runtime_arg1 = runtime_arg2 = runtime_arg3 = runtime_setting;
             }
             TestCommon.run("-cp", jar,
+                           "-Xlog:cds",
                            runtime_arg1, runtime_arg2, runtime_arg3,
                            "Hi")
                 .ifNoMappingFailure(output -> checkRuntimeOutput(output, expected_output_str));