src/hotspot/share/gc/z/zCollectedHeap.cpp

@@ -23,17 +23,21 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zDirector.hpp"
+#include "gc/z/zDriver.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zNMethod.hpp"
 #include "gc/z/zObjArrayAllocator.hpp"
 #include "gc/z/zOop.inline.hpp"
 #include "gc/z/zServiceability.hpp"
 #include "gc/z/zStat.hpp"
+#include "gc/z/zUncommitter.hpp"
+#include "gc/z/zUnmapper.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/universe.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/align.hpp"

@@ -50,10 +54,11 @@
     _barrier_set(),
     _initialize(&_barrier_set),
     _heap(),
     _director(new ZDirector()),
     _driver(new ZDriver()),
+    _unmapper(new ZUnmapper()),
     _uncommitter(new ZUncommitter()),
     _stat(new ZStat()),
     _runtime_workers() {}
 
 CollectedHeap::Name ZCollectedHeap::kind() const {

@@ -79,10 +84,11 @@
 }
 
 void ZCollectedHeap::stop() {
   _director->stop();
   _driver->stop();
+  _unmapper->stop();
   _uncommitter->stop();
   _stat->stop();
 }
 
 SoftRefPolicy* ZCollectedHeap::soft_ref_policy() {

@@ -276,10 +282,11 @@
 }
 
 void ZCollectedHeap::gc_threads_do(ThreadClosure* tc) const {
   tc->do_thread(_director);
   tc->do_thread(_driver);
+  tc->do_thread(_unmapper);
   tc->do_thread(_uncommitter);
   tc->do_thread(_stat);
   _heap.worker_threads_do(tc);
   _runtime_workers.threads_do(tc);
 }

@@ -328,10 +335,12 @@
 void ZCollectedHeap::print_gc_threads_on(outputStream* st) const {
   _director->print_on(st);
   st->cr();
   _driver->print_on(st);
   st->cr();
+  _unmapper->print_on(st);
+  st->cr();
   _uncommitter->print_on(st);
   st->cr();
   _stat->print_on(st);
   st->cr();
   _heap.print_worker_threads_on(st);