src/hotspot/share/gc/z/zVirtualMemory.cpp

*** 20,51 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #include "precompiled.hpp"
  #include "gc/z/zAddressSpaceLimit.hpp"
  #include "gc/z/zGlobals.hpp"
  #include "gc/z/zVirtualMemory.inline.hpp"
- #include "logging/log.hpp"
  #include "services/memTracker.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/align.hpp"
  
  ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
      _manager(),
      _initialized(false) {
  
    // Check max supported heap size
    if (max_capacity > ZAddressOffsetMax) {
!     log_error(gc)("Java heap too large (max supported heap size is " SIZE_FORMAT "G)",
!                   ZAddressOffsetMax / G);
      return;
    }
  
    // Reserve address space
    if (!reserve(max_capacity)) {
!     log_error(gc)("Failed to reserve enough address space for Java heap");
      return;
    }
  
    // Initialize OS specific parts
    initialize_os();
--- 20,51 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #include "precompiled.hpp"
+ #include "gc/shared/gcLogPrecious.hpp"
  #include "gc/z/zAddressSpaceLimit.hpp"
  #include "gc/z/zGlobals.hpp"
  #include "gc/z/zVirtualMemory.inline.hpp"
  #include "services/memTracker.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/align.hpp"
  
  ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
      _manager(),
      _initialized(false) {
  
    // Check max supported heap size
    if (max_capacity > ZAddressOffsetMax) {
!     log_error_p(gc)("Java heap too large (max supported heap size is " SIZE_FORMAT "G)",
!                     ZAddressOffsetMax / G);
      return;
    }
  
    // Reserve address space
    if (!reserve(max_capacity)) {
!     log_error_p(gc)("Failed to reserve enough address space for Java heap");
      return;
    }
  
    // Initialize OS specific parts
    initialize_os();
*** 130,145 ****
      // Fall back to a discontiguous address space
      reserved = reserve_discontiguous(size);
      contiguous = false;
    }
  
!   log_info(gc, init)("Address Space Type: %s/%s/%s",
!                      (contiguous ? "Contiguous" : "Discontiguous"),
!                      (limit == ZAddressOffsetMax ? "Unrestricted" : "Restricted"),
!                      (reserved == size ? "Complete" : "Degraded"));
!   log_info(gc, init)("Address Space Size: " SIZE_FORMAT "M x " SIZE_FORMAT " = " SIZE_FORMAT "M",
!                      reserved / M, ZHeapViews, (reserved * ZHeapViews) / M);
  
    return reserved >= max_capacity;
  }
  
  void ZVirtualMemoryManager::nmt_reserve(uintptr_t start, size_t size) {
--- 130,145 ----
      // Fall back to a discontiguous address space
      reserved = reserve_discontiguous(size);
      contiguous = false;
    }
  
!   log_info_p(gc, init)("Address Space Type: %s/%s/%s",
!                        (contiguous ? "Contiguous" : "Discontiguous"),
!                        (limit == ZAddressOffsetMax ? "Unrestricted" : "Restricted"),
!                        (reserved == size ? "Complete" : "Degraded"));
!   log_info_p(gc, init)("Address Space Size: " SIZE_FORMAT "M x " SIZE_FORMAT " = " SIZE_FORMAT "M",
!                        reserved / M, ZHeapViews, (reserved * ZHeapViews) / M);
  
    return reserved >= max_capacity;
  }
  
  void ZVirtualMemoryManager::nmt_reserve(uintptr_t start, size_t size) {