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

rev 6345 : 8027643: Merge GenCollectorPolicy and TwoGenerationCollectorPolicy
Summary: Merged the two calsses GenCollectorPolicy and TwoGenerationCollectorPolicy
Reviewed-by:

*** 1558,1568 ****
  
    // We start a collection if we believe an incremental collection may fail;
    // this is not likely to be productive in practice because it's probably too
    // late anyway.
    GenCollectedHeap* gch = GenCollectedHeap::heap();
!   assert(gch->collector_policy()->is_two_generation_policy(),
           "You may want to check the correctness of the following");
    if (gch->incremental_collection_will_fail(true /* consult_young */)) {
      if (Verbose && PrintGCDetails) {
        gclog_or_tty->print("CMSCollector: collect because incremental collection will fail ");
      }
--- 1558,1568 ----
  
    // We start a collection if we believe an incremental collection may fail;
    // this is not likely to be productive in practice because it's probably too
    // late anyway.
    GenCollectedHeap* gch = GenCollectedHeap::heap();
!   assert(gch->collector_policy()->is_generation_policy(),
           "You may want to check the correctness of the following");
    if (gch->incremental_collection_will_fail(true /* consult_young */)) {
      if (Verbose && PrintGCDetails) {
        gclog_or_tty->print("CMSCollector: collect because incremental collection will fail ");
      }
*** 1962,1972 ****
    // flag is set, and we have either requested a System.gc() or
    // the number of full gc's since the last concurrent cycle
    // has exceeded the threshold set by CMSFullGCsBeforeCompaction,
    // or if an incremental collection has failed
    GenCollectedHeap* gch = GenCollectedHeap::heap();
!   assert(gch->collector_policy()->is_two_generation_policy(),
           "You may want to check the correctness of the following");
    // Inform cms gen if this was due to partial collection failing.
    // The CMS gen may use this fact to determine its expansion policy.
    if (gch->incremental_collection_will_fail(false /* don't consult_young */)) {
      assert(!_cmsGen->incremental_collection_failed(),
--- 1962,1972 ----
    // flag is set, and we have either requested a System.gc() or
    // the number of full gc's since the last concurrent cycle
    // has exceeded the threshold set by CMSFullGCsBeforeCompaction,
    // or if an incremental collection has failed
    GenCollectedHeap* gch = GenCollectedHeap::heap();
!   assert(gch->collector_policy()->is_generation_policy(),
           "You may want to check the correctness of the following");
    // Inform cms gen if this was due to partial collection failing.
    // The CMS gen may use this fact to determine its expansion policy.
    if (gch->incremental_collection_will_fail(false /* don't consult_young */)) {
      assert(!_cmsGen->incremental_collection_failed(),