src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

rev 7318 : imported patch foreground
rev 7319 : [mq]: foreground-review-stefank
rev 7320 : [mq]: foreground-review-kim
rev 7321 : [mq]: remove-RotateCMSCollectionTypes

*** 190,200 ****
       ReservedSpace rs, size_t initial_byte_size, int level,
       CardTableRS* ct, bool use_adaptive_freelists,
       FreeBlockDictionary<FreeChunk>::DictionaryChoice dictionaryChoice) :
    CardGeneration(rs, initial_byte_size, level, ct),
    _dilatation_factor(((double)MinChunkSize)/((double)(CollectedHeap::min_fill_size()))),
-   _debug_concurrent_cycle(true),
    _did_compact(false)
  {
    HeapWord* bottom = (HeapWord*) _virtual_space.low();
    HeapWord* end    = (HeapWord*) _virtual_space.high();
  
--- 190,199 ----
*** 1243,1260 ****
                               " gc request (or gc_locker)");
      }
      return true;
    }
  
-   // For debugging purposes, change the type of collection.
-   // Rotate between concurrent and stop-the-world full GCs.
-   NOT_PRODUCT(
-     if (RotateCMSCollectionTypes) {
-       return _cmsGen->debug_concurrent_cycle();
-     }
-   )
- 
    FreelistLocker x(this);
    // ------------------------------------------------------------------
    // Print out lots of information which affects the initiation of
    // a collection.
    if (PrintCMSInitiationStatistics && stats().valid()) {
--- 1242,1251 ----
*** 5820,5840 ****
      // Gather statistics on the young generation collection.
      collector()->stats().record_gc0_end(used());
    }
  }
  
- void ConcurrentMarkSweepGeneration::rotate_debug_collection_type() {
-   if (PrintGCDetails && Verbose) {
-     if (_debug_concurrent_cycle) {
-       gclog_or_tty->print_cr("Rotate from concurrent to STW collections");
-     } else {
-       gclog_or_tty->print_cr("Rotate from STW to concurrent collections");
-     }
-   }
-   _debug_concurrent_cycle = !_debug_concurrent_cycle;
- }
- 
  void CMSCollector::sweepWork(ConcurrentMarkSweepGeneration* gen) {
    // We iterate over the space(s) underlying this generation,
    // checking the mark bit map to see if the bits corresponding
    // to specific blocks are marked or not. Blocks that are
    // marked are live and are not swept up. All remaining blocks
--- 5811,5820 ----
*** 5951,5966 ****
      assert_lock_strong(bitMapLock());
      _markBitMap.clear_all();
      _collectorState = Idling;
    }
  
-   NOT_PRODUCT(
-     if (RotateCMSCollectionTypes) {
-       _cmsGen->rotate_debug_collection_type();
-     }
-   )
- 
    register_gc_end();
  }
  
  void CMSCollector::do_CMS_operation(CMS_op_type op, GCCause::Cause gc_cause) {
    gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps);
--- 5931,5940 ----