src/share/vm/memory/universe.cpp

rev 8396 : imported patch epsilon-base

*** 75,84 ****
--- 75,86 ----
  #include "utilities/preserveException.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
  #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
+ #include "gc_implementation/epsilon/epsilonCollectedHeap.hpp"
+ #include "gc_implementation/epsilon/epsilonCollectorPolicy.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1CollectorPolicy_ext.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
  #endif // INCLUDE_ALL_GCS
  
*** 813,822 ****
--- 815,833 ----
      Universe::_collectedHeap = g1h;
  #else  // INCLUDE_ALL_GCS
      fatal("UseG1GC not supported in java kernel vm.");
  #endif // INCLUDE_ALL_GCS
  
+   } else if (UseEpsilonGC) {
+ #if INCLUDE_ALL_GCS
+     EpsilonCollectorPolicy* gc_policy = new EpsilonCollectorPolicy();
+     gc_policy->initialize_all();
+     Universe::_collectedHeap = new EpsilonCollectedHeap(gc_policy);
+ #else  // INCLUDE_ALL_GCS
+     fatal("UseEpsilonGC not supported in java kernel vm.");
+ #endif // INCLUDE_ALL_GCS
+ 
    } else {
      GenCollectorPolicy *gc_policy;
  
      if (UseSerialGC) {
        gc_policy = new MarkSweepPolicy();