# HG changeset patch
# User pliden
# Date 1397753235 -7200
# Node ID e4d318eea75a38bc9c3acd79df1f1419abdcabc3
# Parent  1772223a25a28bf4fbb913fdb56f63ac2a95713b
8040245: G1: VM hangs during shutdown
Summary: temporarily disable the shutdown of the concurrent GC threads introduced in JDK-8037112
Reviewed-by: brutisso, tschatzl, jmasa

diff -r 1772223a25a2 -r e4d318eea75a src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Apr 11 11:00:12 2014 +0200
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Apr 17 18:47:15 2014 +0200
@@ -2186,6 +2186,12 @@
 }
 
 void G1CollectedHeap::stop() {
+#if 0
+  // Stopping concurrent worker threads is currently disabled until
+  // some bugs in concurrent mark has been resolve. Without fixing
+  // those bugs first we risk haning during VM exit when trying to
+  // stop these threads.
+
   // Abort any ongoing concurrent root region scanning and stop all
   // concurrent threads. We do this to make sure these threads do
   // not continue to execute and access resources (e.g. gclog_or_tty)
@@ -2193,6 +2199,7 @@
   _cm->root_regions()->abort();
   _cm->root_regions()->wait_until_scan_finished();
   stop_conc_gc_threads();
+#endif
 }
 
 size_t G1CollectedHeap::conservative_max_heap_alignment() {