src/share/vm/gc/parallel/psMarkSweep.cpp

rev 13233 : 8179268: Factor out AdaptiveSizePolicy from top-level interfaces CollectorPolicy and CollectedHeap

*** 96,106 ****
    if (ScavengeBeforeFullGC) {
      PSScavenge::invoke_no_policy();
    }
  
    const bool clear_all_soft_refs =
!     heap->collector_policy()->should_clear_all_soft_refs();
  
    uint count = maximum_heap_compaction ? 1 : MarkSweepAlwaysCompactCount;
    UIntFlagSetting flag_setting(MarkSweepAlwaysCompactCount, count);
    PSMarkSweep::invoke_no_policy(clear_all_soft_refs || maximum_heap_compaction);
  }
--- 96,106 ----
    if (ScavengeBeforeFullGC) {
      PSScavenge::invoke_no_policy();
    }
  
    const bool clear_all_soft_refs =
!     heap->collector_policy()->as_generation_policy()->should_clear_all_soft_refs();
  
    uint count = maximum_heap_compaction ? 1 : MarkSweepAlwaysCompactCount;
    UIntFlagSetting flag_setting(MarkSweepAlwaysCompactCount, count);
    PSMarkSweep::invoke_no_policy(clear_all_soft_refs || maximum_heap_compaction);
  }
*** 124,134 ****
  
    PSAdaptiveSizePolicy* size_policy = heap->size_policy();
  
    // The scope of casr should end after code that can change
    // CollectorPolicy::_should_clear_all_soft_refs.
!   ClearedAllSoftRefs casr(clear_all_softrefs, heap->collector_policy());
  
    PSYoungGen* young_gen = heap->young_gen();
    PSOldGen* old_gen = heap->old_gen();
  
    // Increment the invocation count
--- 124,134 ----
  
    PSAdaptiveSizePolicy* size_policy = heap->size_policy();
  
    // The scope of casr should end after code that can change
    // CollectorPolicy::_should_clear_all_soft_refs.
!   ClearedAllSoftRefs casr(clear_all_softrefs, heap->collector_policy()->as_generation_policy());
  
    PSYoungGen* young_gen = heap->young_gen();
    PSOldGen* old_gen = heap->old_gen();
  
    // Increment the invocation count
*** 312,322 ****
                                               eden_live,
                                               max_old_gen_size,
                                               max_eden_size,
                                               true /* full gc*/,
                                               gc_cause,
!                                              heap->collector_policy());
  
          size_policy->decay_supplemental_growth(true /* full gc*/);
  
          heap->resize_old_gen(size_policy->calculated_old_free_size_in_bytes());
  
--- 312,322 ----
                                               eden_live,
                                               max_old_gen_size,
                                               max_eden_size,
                                               true /* full gc*/,
                                               gc_cause,
!                                              heap->collector_policy()->as_generation_policy());
  
          size_policy->decay_supplemental_growth(true /* full gc*/);
  
          heap->resize_old_gen(size_policy->calculated_old_free_size_in_bytes());