src/share/vm/runtime/java.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -71,14 +71,10 @@
 #include "utilities/dtrace.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/histogram.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc/cms/concurrentMarkSweepThread.hpp"
-#include "gc/parallel/psScavenge.hpp"
-#endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #endif
 #ifdef COMPILER2

@@ -471,11 +467,11 @@
   // shut down the StatSampler task
   StatSampler::disengage();
   StatSampler::destroy();
 
   // Stop concurrent GC threads
-  Universe::heap()->stop();
+  GC::gc()->heap()->stop();
 
   // Print GC/heap related information.
   Log(gc, heap, exit) log;
   if (log.is_info()) {
     ResourceMark rm;

@@ -502,11 +498,11 @@
   // Terminate the signal thread
   // Note: we don't wait until it actually dies.
   os::terminate_signal_thread();
 
   print_statistics();
-  Universe::heap()->print_tracing_info();
+  GC::gc()->heap()->print_tracing_info();
 
   { MutexLocker ml(BeforeExit_lock);
     _before_exit_status = BEFORE_EXIT_DONE;
     BeforeExit_lock->notify_all();
   }