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

@@ -30,32 +30,31 @@
  #include "gc/shenandoah/shenandoahHeap.inline.hpp"
  #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
  #include "logging/log.hpp"
  #include "logging/logTag.hpp"
  
- ShenandoahStaticHeuristics::ShenandoahStaticHeuristics() : ShenandoahHeuristics() {
+ ShenandoahStaticHeuristics::ShenandoahStaticHeuristics(ShenandoahSpaceInfo* space_info) :
+   ShenandoahHeuristics(space_info) {
    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();
+   size_t max_capacity = _space_info->max_capacity();
+   size_t capacity = _space_info->soft_max_capacity();
+   size_t available = _space_info->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;
  
    size_t threshold_available = capacity / 100 * ShenandoahMinFreeThreshold;
  
    if (available < threshold_available) {
-     log_info(gc)("Trigger: Free (" SIZE_FORMAT "%s) is below minimum threshold (" SIZE_FORMAT "%s)",
+     log_trigger("Free (" SIZE_FORMAT "%s) is below minimum threshold (" SIZE_FORMAT "%s)",
                   byte_size_in_proper_unit(available),           proper_unit_for_byte_size(available),
                   byte_size_in_proper_unit(threshold_available), proper_unit_for_byte_size(threshold_available));
      return true;
    }
    return ShenandoahHeuristics::should_start_gc();

@@ -65,11 +64,11 @@
                                                                         RegionData* data, size_t size,
                                                                         size_t free) {
    size_t threshold = ShenandoahHeapRegion::region_size_bytes() * ShenandoahGarbageThreshold / 100;
  
    for (size_t idx = 0; idx < size; idx++) {
-     ShenandoahHeapRegion* r = data[idx]._region;
+     ShenandoahHeapRegion* r = data[idx].get_region();
      if (r->garbage() > threshold) {
        cset->add_region(r);
      }
    }
  }