# HG changeset patch
# User jwha
# Date 1446584584 28800
#      Tue Nov 03 13:03:04 2015 -0800
# Node ID 5cc12d29907e3f4a7ea42ff8f6e38e3822fdba1a
# Parent  3bef2d08010ee290cdaed385bf2d946cafd6ef3d
JDK-8141356: Explicitly stop CMS threads during VM termination.
Summary: GenCollectedHeap::stop() is not implemented which is supposed to stop
CMS threads during VM termination.

diff --git a/src/share/vm/gc/shared/genCollectedHeap.hpp b/src/share/vm/gc/shared/genCollectedHeap.hpp
--- a/src/share/vm/gc/shared/genCollectedHeap.hpp
+++ b/src/share/vm/gc/shared/genCollectedHeap.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
 #define SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
 
+#include "gc/cms/concurrentMarkSweepThread.hpp"
 #include "gc/shared/adaptiveSizePolicy.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorPolicy.hpp"
@@ -499,6 +500,13 @@
 protected:
   void gc_prologue(bool full);
   void gc_epilogue(bool full);
+
+public:
+  void stop() {
+    if (UseConcMarkSweepGC) {
+      ConcurrentMarkSweepThread::stop();
+    }
+  }
 };
 
 #endif // SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP