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

*** 617,628 ****
      _eden_chunk_array = NEW_C_HEAP_ARRAY(HeapWord*, _eden_chunk_capacity, mtGC);
    }
  
    // Support for parallelizing survivor space rescan
    if ((CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) || CMSParallelInitialMarkEnabled) {
!     const size_t max_plab_samples =
!       ((DefNewGeneration*)_young_gen)->max_survivor_size() / plab_sample_minimum_size();
  
      _survivor_plab_array  = NEW_C_HEAP_ARRAY(ChunkArray, ParallelGCThreads, mtGC);
      _survivor_chunk_array = NEW_C_HEAP_ARRAY(HeapWord*, 2*max_plab_samples, mtGC);
      _cursor               = NEW_C_HEAP_ARRAY(size_t, ParallelGCThreads, mtGC);
      _survivor_chunk_capacity = 2*max_plab_samples;
--- 617,629 ----
      _eden_chunk_array = NEW_C_HEAP_ARRAY(HeapWord*, _eden_chunk_capacity, mtGC);
    }
  
    // Support for parallelizing survivor space rescan
    if ((CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) || CMSParallelInitialMarkEnabled) {
!     // The 2*K (default MinTLABSize) is large enough to allow smooth striping of work
!     // and avoids being linked to unusual MinTLABSize set on the command line
!     const size_t max_plab_samples = ((DefNewGeneration*)_young_gen)->max_survivor_size() / (2 * K);
  
      _survivor_plab_array  = NEW_C_HEAP_ARRAY(ChunkArray, ParallelGCThreads, mtGC);
      _survivor_chunk_array = NEW_C_HEAP_ARRAY(HeapWord*, 2*max_plab_samples, mtGC);
      _cursor               = NEW_C_HEAP_ARRAY(size_t, ParallelGCThreads, mtGC);
      _survivor_chunk_capacity = 2*max_plab_samples;
*** 639,654 ****
    _gc_counters = new CollectorCounters("CMS", 1);
    _completed_initialization = true;
    _inter_sweep_timer.start();  // start of time
  }
  
- size_t CMSCollector::plab_sample_minimum_size() {
-   // The default value of MinTLABSize is 2k, but there is
-   // no way to get the default value if the flag has been overridden.
-   return MAX2(ThreadLocalAllocBuffer::min_size() * HeapWordSize, 2 * K);
- }
- 
  const char* ConcurrentMarkSweepGeneration::name() const {
    return "concurrent mark-sweep generation";
  }
  void ConcurrentMarkSweepGeneration::update_counters() {
    if (UsePerfData) {
--- 640,649 ----