8244737: Shenandoah: move mode code to gc/shenandoah/mode

Reviewed-by: rkennke
openjdk · May 11, 2020 · e3138f8cba92fcc072f0973a276c25fb57bec52d · e3138f8
1 parent f37b72c
commit e3138f8cba92fcc072f0973a276c25fb57bec52d
diff --git a/.../share/gc/shenandoah/shenandoahIUMode.cpp → ...e/gc/shenandoah/mode/shenandoahIUMode.cpp b/.../share/gc/shenandoah/shenandoahIUMode.cpp → ...e/gc/shenandoah/mode/shenandoahIUMode.cpp
@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 #include "gc/shenandoah/shenandoahConcurrentRoots.hpp"
-#include "gc/shenandoah/shenandoahIUMode.hpp"
 #include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahIUMode.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
 

diff --git a/.../share/gc/shenandoah/shenandoahIUMode.hpp → ...e/gc/shenandoah/mode/shenandoahIUMode.hpp b/.../share/gc/shenandoah/shenandoahIUMode.hpp → ...e/gc/shenandoah/mode/shenandoahIUMode.hpp
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHIUMODE_HPP
-#define SHARE_GC_SHENANDOAH_SHENANDOAHIUMODE_HPP
+#ifndef SHARE_GC_SHENANDOAH_MODE_SHENANDOAHIUMODE_HPP
+#define SHARE_GC_SHENANDOAH_MODE_SHENANDOAHIUMODE_HPP
 
-#include "gc/shenandoah/shenandoahNormalMode.hpp"
+#include "gc/shenandoah/mode/shenandoahNormalMode.hpp"
 
 class ShenandoahHeuristics;
 
@@ -38,4 +38,4 @@ class ShenandoahIUMode : public ShenandoahNormalMode {
   virtual bool is_experimental() { return true; }
 };
 
-#endif // SHARE_GC_SHENANDOAH_SHENANDOAHIUMODE_HPP
+#endif // SHARE_GC_SHENANDOAH_MODE_SHENANDOAHIUMODE_HPP
diff --git a/...ot/share/gc/shenandoah/shenandoahMode.hpp → ...are/gc/shenandoah/mode/shenandoahMode.hpp b/...ot/share/gc/shenandoah/shenandoahMode.hpp → ...are/gc/shenandoah/mode/shenandoahMode.hpp
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMODE_HPP
-#define SHARE_GC_SHENANDOAH_SHENANDOAHMODE_HPP
+#ifndef SHARE_GC_SHENANDOAH_MODE_SHENANDOAHMODE_HPP
+#define SHARE_GC_SHENANDOAH_MODE_SHENANDOAHMODE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -54,4 +54,4 @@ class ShenandoahMode : public CHeapObj<mtGC> {
   virtual bool is_experimental() = 0;
 };
 
-#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMODE_HPP
+#endif // SHARE_GC_SHENANDOAH_MODE_SHENANDOAHMODE_HPP
diff --git a/...re/gc/shenandoah/shenandoahNormalMode.cpp → .../shenandoah/mode/shenandoahNormalMode.cpp b/...re/gc/shenandoah/shenandoahNormalMode.cpp → .../shenandoah/mode/shenandoahNormalMode.cpp
@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 #include "gc/shenandoah/shenandoahConcurrentRoots.hpp"
-#include "gc/shenandoah/shenandoahNormalMode.hpp"
 #include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahNormalMode.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
 

diff --git a/...re/gc/shenandoah/shenandoahNormalMode.hpp → .../shenandoah/mode/shenandoahNormalMode.hpp b/...re/gc/shenandoah/shenandoahNormalMode.hpp → .../shenandoah/mode/shenandoahNormalMode.hpp
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHNORMALMODE_HPP
-#define SHARE_GC_SHENANDOAH_SHENANDOAHNORMALMODE_HPP
+#ifndef SHARE_GC_SHENANDOAH_MODE_SHENANDOAHNORMALMODE_HPP
+#define SHARE_GC_SHENANDOAH_MODE_SHENANDOAHNORMALMODE_HPP
 
-#include "gc/shenandoah/shenandoahMode.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 
 class ShenandoahHeuristics;
 
@@ -38,4 +38,4 @@ class ShenandoahNormalMode : public ShenandoahMode {
   virtual bool is_experimental() { return false; }
 };
 
-#endif // SHARE_GC_SHENANDOAH_SHENANDOAHNORMALMODE_HPP
+#endif // SHARE_GC_SHENANDOAH_MODE_SHENANDOAHNORMALMODE_HPP
diff --git a/...e/gc/shenandoah/shenandoahPassiveMode.cpp → ...shenandoah/mode/shenandoahPassiveMode.cpp b/...e/gc/shenandoah/shenandoahPassiveMode.cpp → ...shenandoah/mode/shenandoahPassiveMode.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/shenandoah/shenandoahPassiveMode.hpp"
 #include "gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahPassiveMode.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
 

diff --git a/...e/gc/shenandoah/shenandoahPassiveMode.hpp → ...shenandoah/mode/shenandoahPassiveMode.hpp b/...e/gc/shenandoah/shenandoahPassiveMode.hpp → ...shenandoah/mode/shenandoahPassiveMode.hpp
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPASSIVEMODE_HPP
-#define SHARE_GC_SHENANDOAH_SHENANDOAHPASSIVEMODE_HPP
+#ifndef SHARE_GC_SHENANDOAH_MODE_SHENANDOAHPASSIVEMODE_HPP
+#define SHARE_GC_SHENANDOAH_MODE_SHENANDOAHPASSIVEMODE_HPP
 
-#include "gc/shenandoah/shenandoahNormalMode.hpp"
+#include "gc/shenandoah/mode/shenandoahNormalMode.hpp"
 
 class ShenandoahPassiveMode : public ShenandoahNormalMode {
 public:
@@ -37,4 +37,4 @@ class ShenandoahPassiveMode : public ShenandoahNormalMode {
   virtual bool is_experimental() { return false; }
 };
 
-#endif // SHARE_GC_SHENANDOAH_SHENANDOAHNORMALMODE_HPP
+#endif // SHARE_GC_SHENANDOAH_MODE_SHENANDOAHPASSIVEMODE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -46,18 +46,15 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
-#include "gc/shenandoah/shenandoahIUMode.hpp"
 #include "gc/shenandoah/shenandoahMarkCompact.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahMemoryPool.hpp"
 #include "gc/shenandoah/shenandoahMetrics.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
-#include "gc/shenandoah/shenandoahNormalMode.hpp"
 #include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahPacer.inline.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "gc/shenandoah/shenandoahParallelCleaning.inline.hpp"
-#include "gc/shenandoah/shenandoahPassiveMode.hpp"
 #include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
 #include "gc/shenandoah/shenandoahStringDedup.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.hpp"
@@ -67,6 +64,9 @@
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
 #include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
+#include "gc/shenandoah/mode/shenandoahIUMode.hpp"
+#include "gc/shenandoah/mode/shenandoahNormalMode.hpp"
+#include "gc/shenandoah/mode/shenandoahPassiveMode.hpp"
 #if INCLUDE_JFR
 #include "gc/shenandoah/shenandoahJfrSupport.hpp"
 #endif