src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp

*** 25,28 ***
  #include "precompiled.hpp"
  
  #include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
  #include "gc/shenandoah/shenandoahCollectionSet.hpp"
  #include "gc/shenandoah/shenandoahFreeSet.hpp"
- #include "gc/shenandoah/shenandoahHeap.inline.hpp"
  #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
  #include "logging/log.hpp"
  #include "logging/logTag.hpp"
  
! ShenandoahStaticHeuristics::ShenandoahStaticHeuristics() : ShenandoahHeuristics() {
    SHENANDOAH_ERGO_ENABLE_FLAG(ExplicitGCInvokesConcurrent);
    SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
  }
  
  ShenandoahStaticHeuristics::~ShenandoahStaticHeuristics() {}
  
  bool ShenandoahStaticHeuristics::should_start_gc() {
!   ShenandoahHeap* heap = ShenandoahHeap::heap();
! 
!   size_t max_capacity = heap->max_capacity();
-   size_t capacity = heap->soft_max_capacity();
-   size_t available = heap->free_set()->available();
  
    // Make sure the code below treats available without the soft tail.
    size_t soft_tail = max_capacity - capacity;
    available = (available > soft_tail) ? (available - soft_tail) : 0;
  
--- 25,27 ---
  #include "precompiled.hpp"
  
  #include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
  #include "gc/shenandoah/shenandoahCollectionSet.hpp"
  #include "gc/shenandoah/shenandoahFreeSet.hpp"
  #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
+ #include "gc/shenandoah/shenandoahGeneration.hpp"
  #include "logging/log.hpp"
  #include "logging/logTag.hpp"
  
! ShenandoahStaticHeuristics::ShenandoahStaticHeuristics(ShenandoahGeneration* generation) :
+   ShenandoahHeuristics(generation) {
    SHENANDOAH_ERGO_ENABLE_FLAG(ExplicitGCInvokesConcurrent);
    SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
  }
  
  ShenandoahStaticHeuristics::~ShenandoahStaticHeuristics() {}
  
  bool ShenandoahStaticHeuristics::should_start_gc() {
!   size_t max_capacity = _generation->max_capacity();
!   size_t capacity = _generation->soft_max_capacity();
!   size_t available = _generation->available();
  
    // Make sure the code below treats available without the soft tail.
    size_t soft_tail = max_capacity - capacity;
    available = (available > soft_tail) ? (available - soft_tail) : 0;