src/share/vm/memory/generationSpec.cpp

rev 7215 : imported patch remove_levels

*** 34,55 ****
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
  #include "gc_implementation/parNew/parNewGeneration.hpp"
  #endif // INCLUDE_ALL_GCS
  
! Generation* GenerationSpec::init(ReservedSpace rs, int level,
!                                  GenRemSet* remset) {
    switch (name()) {
      case Generation::DefNew:
!       return new DefNewGeneration(rs, init_size(), level);
  
      case Generation::MarkSweepCompact:
!       return new TenuredGeneration(rs, init_size(), level, remset);
  
  #if INCLUDE_ALL_GCS
      case Generation::ParNew:
!       return new ParNewGeneration(rs, init_size(), level);
  
      case Generation::ConcurrentMarkSweep: {
        assert(UseConcMarkSweepGC, "UseConcMarkSweepGC should be set");
        CardTableRS* ctrs = remset->as_CardTableRS();
        if (ctrs == NULL) {
--- 34,54 ----
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
  #include "gc_implementation/parNew/parNewGeneration.hpp"
  #endif // INCLUDE_ALL_GCS
  
! Generation* GenerationSpec::init(ReservedSpace rs, GenRemSet* remset) {
    switch (name()) {
      case Generation::DefNew:
!       return new DefNewGeneration(rs, init_size());
  
      case Generation::MarkSweepCompact:
!       return new TenuredGeneration(rs, init_size(), remset);
  
  #if INCLUDE_ALL_GCS
      case Generation::ParNew:
!       return new ParNewGeneration(rs, init_size());
  
      case Generation::ConcurrentMarkSweep: {
        assert(UseConcMarkSweepGC, "UseConcMarkSweepGC should be set");
        CardTableRS* ctrs = remset->as_CardTableRS();
        if (ctrs == NULL) {
*** 59,69 ****
        // The constructor creates the CMSCollector if needed,
        // else registers with an existing CMSCollector
  
        ConcurrentMarkSweepGeneration* g = NULL;
        g = new ConcurrentMarkSweepGeneration(rs,
!                  init_size(), level, ctrs, UseCMSAdaptiveFreeLists,
                   (FreeBlockDictionary<FreeChunk>::DictionaryChoice)CMSDictionaryChoice);
  
        g->initialize_performance_counters();
  
        return g;
--- 58,68 ----
        // The constructor creates the CMSCollector if needed,
        // else registers with an existing CMSCollector
  
        ConcurrentMarkSweepGeneration* g = NULL;
        g = new ConcurrentMarkSweepGeneration(rs,
!                  init_size(), ctrs, UseCMSAdaptiveFreeLists,
                   (FreeBlockDictionary<FreeChunk>::DictionaryChoice)CMSDictionaryChoice);
  
        g->initialize_performance_counters();
  
        return g;