src/hotspot/share/gc/shenandoah/shenandoahInitLogger.cpp

*** 1,7 ***
--- 1,8 ---
  /*
   * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 27,39 ***
  #include "gc/shenandoah/shenandoahHeapRegion.hpp"
  #include "gc/shenandoah/shenandoahInitLogger.hpp"
  #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
  #include "gc/shenandoah/mode/shenandoahMode.hpp"
  #include "logging/log.hpp"
- #include "runtime/globals.hpp"
  #include "utilities/globalDefinitions.hpp"
  
  void ShenandoahInitLogger::print_heap() {
    GCInitLogger::print_heap();
  
!   ShenandoahHeap* heap = ShenandoahHeap::heap();
! 
!   log_info(gc, init)("Mode: %s",
-                      heap->mode()->name());
- 
-   log_info(gc, init)("Heuristics: %s",
-                      heap->heuristics()->name());
- 
-   log_info(gc, init)("Heap Region Count: " SIZE_FORMAT,
-                      ShenandoahHeapRegion::region_count());
- 
-   log_info(gc, init)("Heap Region Size: " SIZE_FORMAT "%s",
-                      byte_size_in_exact_unit(ShenandoahHeapRegion::region_size_bytes()),
-                      exact_unit_for_byte_size(ShenandoahHeapRegion::region_size_bytes()));
- 
-   log_info(gc, init)("TLAB Size Max: " SIZE_FORMAT "%s",
-                      byte_size_in_exact_unit(ShenandoahHeapRegion::max_tlab_size_bytes()),
-                      exact_unit_for_byte_size(ShenandoahHeapRegion::max_tlab_size_bytes()));
- 
-   log_info(gc, init)("Humongous Object Threshold: " SIZE_FORMAT "%s",
-           byte_size_in_exact_unit(ShenandoahHeapRegion::humongous_threshold_bytes()),
-           exact_unit_for_byte_size(ShenandoahHeapRegion::humongous_threshold_bytes()));
  }
  
! void ShenandoahInitLogger::print() {
!   ShenandoahInitLogger init_log;
!   init_log.print_all();
  }
--- 28,27 ---
  #include "gc/shenandoah/shenandoahHeapRegion.hpp"
  #include "gc/shenandoah/shenandoahInitLogger.hpp"
  #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
  #include "gc/shenandoah/mode/shenandoahMode.hpp"
  #include "logging/log.hpp"
  #include "utilities/globalDefinitions.hpp"
  
+ void ShenandoahInitLogger::print() {
+   ShenandoahInitLogger init_log;
+   init_log.print_all();
+ }
+ 
  void ShenandoahInitLogger::print_heap() {
    GCInitLogger::print_heap();
  
!   log_info(gc, init)("Heap Region Count: " SIZE_FORMAT, ShenandoahHeapRegion::region_count());
!   log_info(gc, init)("Heap Region Size: " EXACTFMT, EXACTFMTARGS(ShenandoahHeapRegion::region_size_bytes()));
!   log_info(gc, init)("TLAB Size Max: " EXACTFMT, EXACTFMTARGS(ShenandoahHeapRegion::max_tlab_size_bytes()));
  }
  
! void ShenandoahInitLogger::print_gc_specific() {
!   GCInitLogger::print_gc_specific();
! 
+   ShenandoahHeap* heap = ShenandoahHeap::heap();
+   log_info(gc, init)("Mode: %s", heap->mode()->name());
+   log_info(gc, init)("Heuristics: %s", heap->heuristics()->name());
  }