src/share/vm/classfile/sharedPathsMiscInfo.cpp

rev 13180 : imported patch 8181917-refactor-ul-logstream

*** 25,34 ****
--- 25,35 ----
  #include "precompiled.hpp"
  #include "classfile/classLoader.hpp"
  #include "classfile/classLoaderData.inline.hpp"
  #include "classfile/sharedPathsMiscInfo.hpp"
  #include "logging/log.hpp"
+ #include "logging/logStream.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
  #include "runtime/arguments.hpp"
  #include "utilities/ostream.hpp"
*** 71,83 ****
    ClassLoader::trace_class_path(msg, name);
    MetaspaceShared::set_archive_loading_failed();
    return false;
  }
  
! void SharedPathsMiscInfo::print_path(int type, const char* path) {
!   ResourceMark rm;
!   outputStream* out = Log(class, path)::info_stream();
    switch (type) {
    case BOOT:
      out->print("Expecting BOOT path=%s", path);
      break;
    case NON_EXIST:
--- 72,82 ----
    ClassLoader::trace_class_path(msg, name);
    MetaspaceShared::set_archive_loading_failed();
    return false;
  }
  
! void SharedPathsMiscInfo::print_path(outputStream* out, int type, const char* path) {
    switch (type) {
    case BOOT:
      out->print("Expecting BOOT path=%s", path);
      break;
    case NON_EXIST:
*** 104,115 ****
      const char* path = _cur_ptr;
      _cur_ptr += strlen(path) + 1;
      if (!read_jint(&type)) {
        return fail("Corrupted archive file header");
      }
!     log_info(class, path)("type=%s ", type_name(type));
!     print_path(type, path);
      if (!check(type, path)) {
        if (!PrintSharedArchiveAndExit) {
          return false;
        }
      } else {
--- 103,119 ----
      const char* path = _cur_ptr;
      _cur_ptr += strlen(path) + 1;
      if (!read_jint(&type)) {
        return fail("Corrupted archive file header");
      }
!     LogTarget(Info, class, path) lt;
!     if (lt.is_enabled()) {
!       lt.print("type=%s ", type_name(type));
!       LogStream ls(lt);
!       print_path(&ls, type, path);
!       ls.cr();
!     }
      if (!check(type, path)) {
        if (!PrintSharedArchiveAndExit) {
          return false;
        }
      } else {