From 8a9c4d5266bd40962e388ca666a9879fa317e5f5 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Wed, 11 Oct 2023 14:31:41 +0000 Subject: [PATCH] 8317675: Serial: Move gc/shared/generation to serial folder Reviewed-by: mli, tschatzl --- src/hotspot/share/gc/serial/cardTableRS.cpp | 2 +- src/hotspot/share/gc/serial/defNewGeneration.hpp | 2 +- src/hotspot/share/gc/serial/genMarkSweep.cpp | 2 +- src/hotspot/share/gc/{shared => serial}/generation.cpp | 2 +- src/hotspot/share/gc/{shared => serial}/generation.hpp | 2 +- src/hotspot/share/gc/serial/tenuredGeneration.hpp | 2 +- src/hotspot/share/gc/shared/genArguments.cpp | 2 +- src/hotspot/share/gc/shared/genCollectedHeap.hpp | 2 +- src/hotspot/share/gc/shared/genMemoryPools.cpp | 2 +- src/hotspot/share/gc/shared/generationSpec.hpp | 2 +- src/hotspot/share/gc/shared/space.inline.hpp | 2 +- src/hotspot/share/gc/shared/vmStructs_gc.hpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/hotspot/share/gc/{shared => serial}/generation.cpp (99%) rename src/hotspot/share/gc/{shared => serial}/generation.hpp (99%) diff --git a/src/hotspot/share/gc/serial/cardTableRS.cpp b/src/hotspot/share/gc/serial/cardTableRS.cpp index 2d9ad2723ab..2c189da2747 100644 --- a/src/hotspot/share/gc/serial/cardTableRS.cpp +++ b/src/hotspot/share/gc/serial/cardTableRS.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "classfile/classLoaderDataGraph.hpp" #include "gc/serial/cardTableRS.hpp" +#include "gc/serial/generation.hpp" #include "gc/serial/serialHeap.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/space.inline.hpp" #include "memory/allocation.inline.hpp" #include "memory/iterator.inline.hpp" diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp index bdd99ec234c..e9586993e54 100644 --- a/src/hotspot/share/gc/serial/defNewGeneration.hpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp @@ -26,10 +26,10 @@ #define SHARE_GC_SERIAL_DEFNEWGENERATION_HPP #include "gc/serial/cSpaceCounters.hpp" +#include "gc/serial/generation.hpp" #include "gc/shared/ageTable.hpp" #include "gc/shared/copyFailedInfo.hpp" #include "gc/shared/gc_globals.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/generationCounters.hpp" #include "gc/shared/preservedMarks.hpp" #include "gc/shared/stringdedup/stringDedup.hpp" diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp index 1facabefd48..6200a1894f5 100644 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp @@ -34,6 +34,7 @@ #include "compiler/oopMap.hpp" #include "gc/serial/cardTableRS.hpp" #include "gc/serial/defNewGeneration.hpp" +#include "gc/serial/generation.hpp" #include "gc/serial/genMarkSweep.hpp" #include "gc/serial/serialGcRefProcProxyTask.hpp" #include "gc/serial/serialHeap.hpp" @@ -42,7 +43,6 @@ #include "gc/shared/gcTimer.hpp" #include "gc/shared/gcTrace.hpp" #include "gc/shared/gcTraceTime.inline.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/modRefBarrierSet.hpp" #include "gc/shared/preservedMarks.inline.hpp" #include "gc/shared/referencePolicy.hpp" diff --git a/src/hotspot/share/gc/shared/generation.cpp b/src/hotspot/share/gc/serial/generation.cpp similarity index 99% rename from src/hotspot/share/gc/shared/generation.cpp rename to src/hotspot/share/gc/serial/generation.cpp index 5339bd677a0..32f70f08c65 100644 --- a/src/hotspot/share/gc/shared/generation.cpp +++ b/src/hotspot/share/gc/serial/generation.cpp @@ -24,13 +24,13 @@ #include "precompiled.hpp" #include "gc/serial/cardTableRS.hpp" +#include "gc/serial/generation.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "gc/shared/continuationGCSupport.inline.hpp" #include "gc/shared/gcLocker.hpp" #include "gc/shared/gcTimer.hpp" #include "gc/shared/gcTrace.hpp" #include "gc/shared/genCollectedHeap.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/generationSpec.hpp" #include "gc/shared/space.inline.hpp" #include "gc/shared/spaceDecorator.inline.hpp" diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp similarity index 99% rename from src/hotspot/share/gc/shared/generation.hpp rename to src/hotspot/share/gc/serial/generation.hpp index 18f682eedd4..b005abc7a61 100644 --- a/src/hotspot/share/gc/shared/generation.hpp +++ b/src/hotspot/share/gc/serial/generation.hpp @@ -377,4 +377,4 @@ public: }; -#endif // SHARE_GC_SHARED_GENERATION_HPP +#endif // SHARE_GC_SERIAL_GENERATION_HPP diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp index 32c0bd98f47..99eb72660b3 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_SERIAL_TENUREDGENERATION_HPP #include "gc/serial/cSpaceCounters.hpp" -#include "gc/shared/generation.hpp" +#include "gc/serial/generation.hpp" #include "gc/shared/gcStats.hpp" #include "gc/shared/generationCounters.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/shared/genArguments.cpp b/src/hotspot/share/gc/shared/genArguments.cpp index c53fb72c459..8e8abc6fb96 100644 --- a/src/hotspot/share/gc/shared/genArguments.cpp +++ b/src/hotspot/share/gc/shared/genArguments.cpp @@ -23,9 +23,9 @@ */ #include "precompiled.hpp" +#include "gc/serial/generation.hpp" #include "gc/shared/cardTable.hpp" #include "gc/shared/genArguments.hpp" -#include "gc/shared/generation.hpp" #include "logging/log.hpp" #include "runtime/globals_extension.hpp" #include "runtime/java.hpp" diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp index 62dabcd0af7..bdeeede64b8 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp @@ -25,8 +25,8 @@ #ifndef SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP #define SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP +#include "gc/serial/generation.hpp" #include "gc/shared/collectedHeap.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/oopStorageParState.hpp" #include "gc/shared/preGCValues.hpp" #include "gc/shared/softRefPolicy.hpp" diff --git a/src/hotspot/share/gc/shared/genMemoryPools.cpp b/src/hotspot/share/gc/shared/genMemoryPools.cpp index 5eeff9168aa..9158e42a1b9 100644 --- a/src/hotspot/share/gc/shared/genMemoryPools.cpp +++ b/src/hotspot/share/gc/shared/genMemoryPools.cpp @@ -23,7 +23,7 @@ */ #include "precompiled.hpp" -#include "gc/shared/generation.hpp" +#include "gc/serial/generation.hpp" #include "gc/shared/genMemoryPools.hpp" #include "gc/shared/space.hpp" #if INCLUDE_SERIALGC diff --git a/src/hotspot/share/gc/shared/generationSpec.hpp b/src/hotspot/share/gc/shared/generationSpec.hpp index f943d83c477..662e24d4e04 100644 --- a/src/hotspot/share/gc/shared/generationSpec.hpp +++ b/src/hotspot/share/gc/shared/generationSpec.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_SHARED_GENERATIONSPEC_HPP #define SHARE_GC_SHARED_GENERATIONSPEC_HPP -#include "gc/shared/generation.hpp" +#include "gc/serial/generation.hpp" #include "utilities/align.hpp" // The specification of a generation. This class also encapsulates diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp index 17ab4c88bf4..e1a3e66c146 100644 --- a/src/hotspot/share/gc/shared/space.inline.hpp +++ b/src/hotspot/share/gc/shared/space.inline.hpp @@ -27,8 +27,8 @@ #include "gc/shared/space.hpp" +#include "gc/serial/generation.hpp" #include "gc/shared/collectedHeap.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/spaceDecorator.hpp" #include "oops/oop.inline.hpp" #include "oops/oopsHierarchy.hpp" diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp index 2e2e7cbf837..13f23d5d439 100644 --- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp +++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp @@ -29,7 +29,6 @@ #include "gc/shared/cardTable.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/genCollectedHeap.hpp" -#include "gc/shared/generation.hpp" #include "gc/shared/generationSpec.hpp" #include "gc/shared/oopStorage.hpp" #include "gc/shared/space.hpp" @@ -44,6 +43,7 @@ #endif #if INCLUDE_SERIALGC #include "gc/serial/defNewGeneration.hpp" +#include "gc/serial/generation.hpp" #include "gc/serial/vmStructs_serial.hpp" #endif #if INCLUDE_SHENANDOAHGC