src/hotspot/share/gc/shared/generationSpec.cpp

*** 21,52 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/serial/defNewGeneration.hpp"
- #include "gc/serial/tenuredGeneration.hpp"
  #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/generationSpec.hpp"
  #include "memory/binaryTreeDictionary.hpp"
  #include "memory/filemap.hpp"
  #include "runtime/java.hpp"
  #include "utilities/macros.hpp"
! #if INCLUDE_ALL_GCS
  #include "gc/cms/concurrentMarkSweepGeneration.hpp"
  #include "gc/cms/parNewGeneration.hpp"
! #endif // INCLUDE_ALL_GCS
  
  Generation* GenerationSpec::init(ReservedSpace rs, CardTableRS* 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");
--- 21,56 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/generationSpec.hpp"
  #include "memory/binaryTreeDictionary.hpp"
  #include "memory/filemap.hpp"
  #include "runtime/java.hpp"
  #include "utilities/macros.hpp"
! #if INCLUDE_CMSGC
  #include "gc/cms/concurrentMarkSweepGeneration.hpp"
  #include "gc/cms/parNewGeneration.hpp"
! #endif
! #if INCLUDE_SERIALGC
! #include "gc/serial/defNewGeneration.hpp"
! #include "gc/serial/tenuredGeneration.hpp"
! #endif
  
  Generation* GenerationSpec::init(ReservedSpace rs, CardTableRS* remset) {
    switch (name()) {
+ #if INCLUDE_SERIALGC
      case Generation::DefNew:
        return new DefNewGeneration(rs, init_size());
  
      case Generation::MarkSweepCompact:
        return new TenuredGeneration(rs, init_size(), remset);
+ #endif
  
! #if INCLUDE_CMSGC
      case Generation::ParNew:
        return new ParNewGeneration(rs, init_size());
  
      case Generation::ConcurrentMarkSweep: {
        assert(UseConcMarkSweepGC, "UseConcMarkSweepGC should be set");
*** 62,72 ****
  
        g->initialize_performance_counters();
  
        return g;
      }
! #endif // INCLUDE_ALL_GCS
  
      default:
        guarantee(false, "unrecognized GenerationName");
        return NULL;
    }
--- 66,76 ----
  
        g->initialize_performance_counters();
  
        return g;
      }
! #endif // INCLUDE_CMSGC
  
      default:
        guarantee(false, "unrecognized GenerationName");
        return NULL;
    }