src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp

*** 44,53 ****
--- 44,54 ----
  #include "gc/shared/cardGeneration.inline.hpp"
  #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/collectorCounters.hpp"
  #include "gc/shared/collectorPolicy.hpp"
+ #include "gc/shared/fill.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "gc/shared/gcPolicyCounters.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
*** 205,215 ****
  };
  
  ConcurrentMarkSweepGeneration::ConcurrentMarkSweepGeneration(
       ReservedSpace rs, size_t initial_byte_size, CardTableRS* ct) :
    CardGeneration(rs, initial_byte_size, ct),
!   _dilatation_factor(((double)MinChunkSize)/((double)(CollectedHeap::min_fill_size()))),
    _did_compact(false)
  {
    HeapWord* bottom = (HeapWord*) _virtual_space.low();
    HeapWord* end    = (HeapWord*) _virtual_space.high();
  
--- 206,216 ----
  };
  
  ConcurrentMarkSweepGeneration::ConcurrentMarkSweepGeneration(
       ReservedSpace rs, size_t initial_byte_size, CardTableRS* ct) :
    CardGeneration(rs, initial_byte_size, ct),
!   _dilatation_factor(((double)MinChunkSize)/((double)(Fill::min_size()))),
    _did_compact(false)
  {
    HeapWord* bottom = (HeapWord*) _virtual_space.low();
    HeapWord* end    = (HeapWord*) _virtual_space.high();
  
*** 252,262 ****
    // factor as: MinChunkSize/(promoting_gen's min object size)
    // Since we do not have such a general query interface for the
    // promoting generation, we'll instead just use the minimum
    // object size (which today is a header's worth of space);
    // note that all arithmetic is in units of HeapWords.
!   assert(MinChunkSize >= CollectedHeap::min_fill_size(), "just checking");
    assert(_dilatation_factor >= 1.0, "from previous assert");
  }
  
  
  // The field "_initiating_occupancy" represents the occupancy percentage
--- 253,263 ----
    // factor as: MinChunkSize/(promoting_gen's min object size)
    // Since we do not have such a general query interface for the
    // promoting generation, we'll instead just use the minimum
    // object size (which today is a header's worth of space);
    // note that all arithmetic is in units of HeapWords.
!   assert(MinChunkSize >= Fill::min_size(), "just checking");
    assert(_dilatation_factor >= 1.0, "from previous assert");
  }
  
  
  // The field "_initiating_occupancy" represents the occupancy percentage