From 2d38a1b7a58385ead155baa97be8a0693ef07c3c Mon Sep 17 00:00:00 2001 From: Lei Zaakjyu Date: Thu, 1 Feb 2024 11:56:10 +0800 Subject: [PATCH] rename --- .../aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp | 2 +- .../cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp | 2 +- .../cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp | 2 +- .../cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp | 2 +- .../cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp | 2 +- .../cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp | 2 +- src/hotspot/share/cds/archiveHeapWriter.cpp | 2 +- src/hotspot/share/cds/filemap.cpp | 2 +- src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp | 2 +- src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp | 2 +- src/hotspot/share/gc/g1/g1AllocRegion.hpp | 2 +- src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1Allocator.cpp | 6 +++--- src/hotspot/share/gc/g1/g1Arguments.cpp | 6 +++--- src/hotspot/share/gc/g1/g1BarrierSet.cpp | 2 +- src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp | 2 +- .../share/gc/g1/g1BlockOffsetTable.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1CardSet.cpp | 2 +- src/hotspot/share/gc/g1/g1CardTable.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp | 4 ++-- src/hotspot/share/gc/g1/g1CodeRootSet.cpp | 2 +- src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 6 +++--- src/hotspot/share/gc/g1/g1CollectedHeap.hpp | 4 ++-- src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp | 8 ++++---- src/hotspot/share/gc/g1/g1CollectionSet.cpp | 6 +++--- .../share/gc/g1/g1CollectionSetCandidates.cpp | 2 +- src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp | 2 +- src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp | 2 +- src/hotspot/share/gc/g1/g1ConcurrentMark.cpp | 8 ++++---- src/hotspot/share/gc/g1/g1ConcurrentMark.hpp | 2 +- src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp | 4 ++-- src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp | 2 +- .../gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp | 2 +- .../share/gc/g1/g1ConcurrentRebuildAndScrub.cpp | 4 ++-- src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp | 4 ++-- .../share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp | 2 +- src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp | 2 +- src/hotspot/share/gc/g1/g1EdenRegions.hpp | 2 +- src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp | 2 +- src/hotspot/share/gc/g1/g1FullCollector.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp | 2 +- src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp | 2 +- src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp | 2 +- src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp | 2 +- src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp | 2 +- src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp | 2 +- .../share/gc/g1/g1FullGCOopClosures.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp | 2 +- src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp | 2 +- .../share/gc/g1/g1FullGCPrepareTask.inline.hpp | 2 +- .../share/gc/g1/g1FullGCResetMetadataTask.hpp | 2 +- src/hotspot/share/gc/g1/g1HRPrinter.cpp | 2 +- src/hotspot/share/gc/g1/g1HRPrinter.hpp | 2 +- .../share/gc/g1/{heapRegion.cpp => g1HeapRegion.cpp} | 10 +++++----- .../share/gc/g1/{heapRegion.hpp => g1HeapRegion.hpp} | 10 +++++----- ...heapRegion.inline.hpp => g1HeapRegion.inline.hpp} | 8 ++++---- src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp | 2 +- .../{heapRegionBounds.hpp => g1HeapRegionBounds.hpp} | 6 +++--- ...unds.inline.hpp => g1HeapRegionBounds.inline.hpp} | 8 ++++---- src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp | 2 +- ...heapRegionManager.cpp => g1HeapRegionManager.cpp} | 6 +++--- ...heapRegionManager.hpp => g1HeapRegionManager.hpp} | 8 ++++---- ...ger.inline.hpp => g1HeapRegionManager.inline.hpp} | 12 ++++++------ .../{heapRegionRemSet.cpp => g1HeapRegionRemSet.cpp} | 4 ++-- .../{heapRegionRemSet.hpp => g1HeapRegionRemSet.hpp} | 6 +++--- ...mSet.inline.hpp => g1HeapRegionRemSet.inline.hpp} | 10 +++++----- .../gc/g1/{heapRegionSet.cpp => g1HeapRegionSet.cpp} | 4 ++-- .../gc/g1/{heapRegionSet.hpp => g1HeapRegionSet.hpp} | 8 ++++---- ...gionSet.inline.hpp => g1HeapRegionSet.inline.hpp} | 8 ++++---- .../{heapRegionTracer.cpp => g1HeapRegionTracer.cpp} | 2 +- .../{heapRegionTracer.hpp => g1HeapRegionTracer.hpp} | 6 +++--- .../g1/{heapRegionType.cpp => g1HeapRegionType.cpp} | 2 +- .../g1/{heapRegionType.hpp => g1HeapRegionType.hpp} | 6 +++--- src/hotspot/share/gc/g1/g1HeapVerifier.cpp | 4 ++-- src/hotspot/share/gc/g1/g1HeapVerifier.hpp | 2 +- src/hotspot/share/gc/g1/g1MemoryPool.cpp | 2 +- .../share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp | 2 +- .../share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp | 2 +- src/hotspot/share/gc/g1/g1NUMA.hpp | 2 +- .../share/gc/g1/g1OldGenAllocationTracker.hpp | 2 +- src/hotspot/share/gc/g1/g1OopClosures.inline.hpp | 4 ++-- src/hotspot/share/gc/g1/g1Policy.cpp | 4 ++-- src/hotspot/share/gc/g1/g1RegionPinCache.hpp | 2 +- src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp | 2 +- src/hotspot/share/gc/g1/g1RemSet.cpp | 6 +++--- src/hotspot/share/gc/g1/g1RemSet.hpp | 2 +- src/hotspot/share/gc/g1/g1RemSetSummary.cpp | 4 ++-- src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp | 4 ++-- src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp | 4 ++-- src/hotspot/share/gc/g1/g1RootProcessor.cpp | 2 +- src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp | 2 +- src/hotspot/share/gc/g1/g1SurvRateGroup.cpp | 2 +- src/hotspot/share/gc/g1/g1SurvivorRegions.cpp | 2 +- .../share/gc/g1/g1YoungGCPostEvacuateTasks.cpp | 4 ++-- src/hotspot/share/gc/g1/g1YoungGenSizer.cpp | 2 +- src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp | 2 +- src/hotspot/share/gc/g1/vmStructs_g1.hpp | 4 ++-- src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 2 +- src/hotspot/share/opto/runtime.cpp | 2 +- src/hotspot/share/prims/whitebox.cpp | 4 ++-- test/hotspot/gtest/gc/g1/test_freeRegionList.cpp | 4 ++-- test/hotspot/gtest/gc/g1/test_g1CardSet.cpp | 2 +- .../hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp | 2 +- test/hotspot/gtest/gc/g1/test_heapRegion.cpp | 2 +- 104 files changed, 179 insertions(+), 179 deletions(-) rename src/hotspot/share/gc/g1/{heapRegion.cpp => g1HeapRegion.cpp} (99%) rename src/hotspot/share/gc/g1/{heapRegion.hpp => g1HeapRegion.hpp} (99%) rename src/hotspot/share/gc/g1/{heapRegion.inline.hpp => g1HeapRegion.inline.hpp} (99%) rename src/hotspot/share/gc/g1/{heapRegionBounds.hpp => g1HeapRegionBounds.hpp} (94%) rename src/hotspot/share/gc/g1/{heapRegionBounds.inline.hpp => g1HeapRegionBounds.inline.hpp} (87%) rename src/hotspot/share/gc/g1/{heapRegionManager.cpp => g1HeapRegionManager.cpp} (99%) rename src/hotspot/share/gc/g1/{heapRegionManager.hpp => g1HeapRegionManager.hpp} (98%) rename src/hotspot/share/gc/g1/{heapRegionManager.inline.hpp => g1HeapRegionManager.inline.hpp} (91%) rename src/hotspot/share/gc/g1/{heapRegionRemSet.cpp => g1HeapRegionRemSet.cpp} (97%) rename src/hotspot/share/gc/g1/{heapRegionRemSet.hpp => g1HeapRegionRemSet.hpp} (97%) rename src/hotspot/share/gc/g1/{heapRegionRemSet.inline.hpp => g1HeapRegionRemSet.inline.hpp} (95%) rename src/hotspot/share/gc/g1/{heapRegionSet.cpp => g1HeapRegionSet.cpp} (99%) rename src/hotspot/share/gc/g1/{heapRegionSet.hpp => g1HeapRegionSet.hpp} (98%) rename src/hotspot/share/gc/g1/{heapRegionSet.inline.hpp => g1HeapRegionSet.inline.hpp} (97%) rename src/hotspot/share/gc/g1/{heapRegionTracer.cpp => g1HeapRegionTracer.cpp} (97%) rename src/hotspot/share/gc/g1/{heapRegionTracer.hpp => g1HeapRegionTracer.hpp} (92%) rename src/hotspot/share/gc/g1/{heapRegionType.cpp => g1HeapRegionType.cpp} (98%) rename src/hotspot/share/gc/g1/{heapRegionType.hpp => g1HeapRegionType.hpp} (97%) diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp index 42081d422c869..e82d1778bb3e5 100644 --- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp @@ -29,7 +29,7 @@ #include "gc/g1/g1BarrierSetRuntime.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/collectedHeap.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/javaThread.hpp" diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp index 3aa71dca8cbf0..4cee82b278cdb 100644 --- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp +++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp @@ -30,7 +30,7 @@ #include "gc/g1/g1ThreadLocalData.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp index cd2fd355bbb97..c9821fb13b66b 100644 --- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp @@ -32,7 +32,7 @@ #include "gc/g1/g1DirtyCardQueue.hpp" #include "gc/g1/g1SATBMarkQueueSet.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/jniHandles.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp index 5d0b0fb472934..7c9be6c398ffa 100644 --- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp @@ -30,7 +30,7 @@ #include "gc/g1/g1BarrierSetRuntime.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/collectedHeap.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/javaThread.hpp" diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp index 3ed99f68c475c..8e89092b04b44 100644 --- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp +++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp @@ -33,7 +33,7 @@ #include "gc/g1/g1DirtyCardQueue.hpp" #include "gc/g1/g1SATBMarkQueueSet.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/jniHandles.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp index f609846f00d6c..76a6df694dbc4 100644 --- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp @@ -29,7 +29,7 @@ #include "gc/g1/g1BarrierSetRuntime.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/sharedRuntime.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp index 3e7d42dd8f157..131b43307d5c6 100644 --- a/src/hotspot/share/cds/archiveHeapWriter.cpp +++ b/src/hotspot/share/cds/archiveHeapWriter.cpp @@ -44,7 +44,7 @@ #if INCLUDE_G1GC #include "gc/g1/g1CollectedHeap.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #endif #if INCLUDE_CDS_JAVA_HEAP diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp index 5a0bf2e61b5d0..7cd8e40d611e3 100644 --- a/src/hotspot/share/cds/filemap.cpp +++ b/src/hotspot/share/cds/filemap.cpp @@ -71,7 +71,7 @@ #include "utilities/ostream.hpp" #if INCLUDE_G1GC #include "gc/g1/g1CollectedHeap.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #endif # include diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp index ef2f23633b9ad..3f7098f11e375 100644 --- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp +++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp @@ -29,7 +29,7 @@ #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1BarrierSetAssembler.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "utilities/macros.hpp" #ifdef ASSERT diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp index 4d45c227f8c07..06be2fd7606e5 100644 --- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp +++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp @@ -29,7 +29,7 @@ #include "gc/g1/g1BarrierSetRuntime.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "opto/arraycopynode.hpp" #include "opto/compile.hpp" #include "opto/escape.hpp" diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp index 600d155125936..bfed7d1160b2c 100644 --- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp +++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_G1_G1ALLOCREGION_HPP #define SHARE_GC_G1_G1ALLOCREGION_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/g1/g1EvacStats.hpp" #include "gc/g1/g1HeapRegionAttr.hpp" #include "gc/g1/g1NUMA.hpp" diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp index 33c402b00871e..00ef254e84c37 100644 --- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp @@ -27,7 +27,7 @@ #include "gc/g1/g1AllocRegion.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #define assert_alloc_region(p, message) \ do { \ diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp index ffd2b65f555e7..fc2c54395f4bd 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.cpp +++ b/src/hotspot/share/gc/g1/g1Allocator.cpp @@ -30,9 +30,9 @@ #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1NUMA.hpp" #include "gc/g1/g1Policy.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" -#include "gc/g1/heapRegionType.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegionType.hpp" #include "gc/shared/tlab_globals.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/g1/g1Arguments.cpp b/src/hotspot/share/gc/g1/g1Arguments.cpp index 5f022bfdc3ced..79b6752a59dd4 100644 --- a/src/hotspot/share/gc/g1/g1Arguments.cpp +++ b/src/hotspot/share/gc/g1/g1Arguments.cpp @@ -30,9 +30,9 @@ #include "gc/g1/g1CardSetContainers.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1HeapVerifier.hpp" -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionBounds.inline.hpp" -#include "gc/g1/heapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionBounds.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" #include "gc/shared/cardTable.hpp" #include "gc/shared/gcArguments.hpp" #include "gc/shared/workerPolicy.hpp" diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp index c2bc7bf5425b0..ecd3d2b358ae1 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp @@ -30,7 +30,7 @@ #include "gc/g1/g1RegionPinCache.inline.hpp" #include "gc/g1/g1SATBMarkQueueSet.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/satbMarkQueue.hpp" #include "logging/log.hpp" #include "oops/access.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp index 71107387564a2..af47ce92dc511 100644 --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1BlockOffsetTable.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "logging/log.hpp" #include "nmt/memTracker.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp index a29050c04b34f..80697d38f7d4b 100644 --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp @@ -27,7 +27,7 @@ #include "gc/g1/g1BlockOffsetTable.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/memset_with_concurrent_readers.hpp" #include "runtime/atomic.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1CardSet.cpp b/src/hotspot/share/gc/g1/g1CardSet.cpp index e6b2d5029e5f6..101822dbc4428 100644 --- a/src/hotspot/share/gc/g1/g1CardSet.cpp +++ b/src/hotspot/share/gc/g1/g1CardSet.cpp @@ -26,7 +26,7 @@ #include "gc/g1/g1CardSet.inline.hpp" #include "gc/g1/g1CardSetContainers.inline.hpp" #include "gc/g1/g1CardSetMemory.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/gcLogPrecious.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "memory/allocation.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp index d48fce6cb9ed1..0585b68e33644 100644 --- a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp @@ -27,7 +27,7 @@ #include "gc/g1/g1CardTable.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" inline uint G1CardTable::region_idx_for(CardValue* p) { size_t const card_idx = pointer_delta(p, _byte_map, sizeof(CardValue)); diff --git a/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp index 77211af436444..5e99b91e76a50 100644 --- a/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp +++ b/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp @@ -27,8 +27,8 @@ #include "gc/g1/g1CodeBlobClosure.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMark.inline.hpp" -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/barrierSetNMethod.hpp" #include "oops/access.inline.hpp" #include "oops/compressedOops.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1CodeRootSet.cpp b/src/hotspot/share/gc/g1/g1CodeRootSet.cpp index a1eb7b8543af2..135c1bca2e305 100644 --- a/src/hotspot/share/gc/g1/g1CodeRootSet.cpp +++ b/src/hotspot/share/gc/g1/g1CodeRootSet.cpp @@ -27,7 +27,7 @@ #include "code/codeCache.hpp" #include "code/nmethod.hpp" #include "gc/g1/g1CodeRootSet.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp index 10e5b1d8b58ee..ae388f4fd2a91 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp @@ -72,9 +72,9 @@ #include "gc/g1/g1VMOperations.hpp" #include "gc/g1/g1YoungCollector.hpp" #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" #include "gc/shared/classUnloadingContext.hpp" #include "gc/shared/concurrentGCBreakpoints.hpp" #include "gc/shared/gcBehaviours.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp index 4245fb1b0cbfb..421746853f7ee 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp @@ -45,8 +45,8 @@ #include "gc/g1/g1NUMA.hpp" #include "gc/g1/g1SurvivorRegions.hpp" #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp" -#include "gc/g1/heapRegionManager.hpp" -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "gc/shared/barrierSet.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/gcHeapSummary.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp index 537b6863fb94a..9c50fdbdcea76 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp @@ -34,10 +34,10 @@ #include "gc/g1/g1Policy.hpp" #include "gc/g1/g1RegionPinCache.inline.hpp" #include "gc/g1/g1RemSet.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionManager.inline.hpp" -#include "gc/g1/heapRegionRemSet.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionManager.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" #include "gc/shared/markBitMap.inline.hpp" #include "gc/shared/taskqueue.inline.hpp" #include "oops/stackChunkOop.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.cpp b/src/hotspot/share/gc/g1/g1CollectionSet.cpp index 30787adbe543b..17ab61ce30200 100644 --- a/src/hotspot/share/gc/g1/g1CollectionSet.cpp +++ b/src/hotspot/share/gc/g1/g1CollectionSet.cpp @@ -30,9 +30,9 @@ #include "gc/g1/g1CollectorState.hpp" #include "gc/g1/g1ParScanThreadState.hpp" #include "gc/g1/g1Policy.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "logging/logStream.hpp" #include "runtime/orderAccess.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp index 9f903bc924f1e..b4649414b10e6 100644 --- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp +++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectionSetCandidates.hpp" #include "gc/g1/g1CollectionSetChooser.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "utilities/bitMap.inline.hpp" #include "utilities/growableArray.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp index f19488a49a8ae..ca7f2b373985b 100644 --- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp +++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp @@ -26,7 +26,7 @@ #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1CollectionSetCandidates.hpp" #include "gc/g1/g1CollectionSetChooser.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/space.inline.hpp" #include "runtime/atomic.hpp" #include "utilities/quickSort.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp index 5b005205551b3..62f9b2a5cef02 100644 --- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp +++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_G1_G1COLLECTIONSETCHOOSER_HPP #define SHARE_GC_G1_G1COLLECTIONSETCHOOSER_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/gc_globals.hpp" #include "memory/allStatic.hpp" #include "runtime/globals.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp index cb7f90b08477c..dccc7ff2deca2 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp @@ -40,10 +40,10 @@ #include "gc/g1/g1RegionMarkStatsCache.inline.hpp" #include "gc/g1/g1ThreadLocalData.hpp" #include "gc/g1/g1Trace.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionManager.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" #include "gc/shared/gcId.hpp" #include "gc/shared/gcTimer.hpp" #include "gc/shared/gcTraceTime.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp index a4315ec5f6c48..b2c7c982a2249 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp @@ -29,7 +29,7 @@ #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp" #include "gc/g1/g1HeapVerifier.hpp" #include "gc/g1/g1RegionMarkStatsCache.hpp" -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "gc/shared/gcCause.hpp" #include "gc/shared/taskTerminator.hpp" #include "gc/shared/taskqueue.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp index 3601f4529a336..6be669efbcac0 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp @@ -34,8 +34,8 @@ #include "gc/g1/g1Policy.hpp" #include "gc/g1/g1RegionMarkStatsCache.inline.hpp" #include "gc/g1/g1RemSetTrackingPolicy.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/suspendibleThreadSet.hpp" #include "gc/shared/taskqueue.inline.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp index e2ace6c8c0a97..438b58c2c02c7 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/virtualspace.hpp" G1CMBitMap::G1CMBitMap() : MarkBitMap(), _listener() { diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp index 80acada04726f..84823f8bf830d 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp @@ -26,7 +26,7 @@ #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMark.inline.hpp" #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/gc_globals.hpp" #include "memory/memRegion.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp index 8cf7601d65a25..d9f04cdbf003d 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp @@ -29,8 +29,8 @@ #include "gc/g1/g1ConcurrentMark.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1_globals.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionManager.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionManager.inline.hpp" #include "gc/shared/suspendibleThreadSet.hpp" #include "gc/shared/workerThread.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp index b2ac4b25e9065..a8a7b730e9f57 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp @@ -29,8 +29,8 @@ #include "gc/g1/g1ConcurrentRefineThread.hpp" #include "gc/g1/g1DirtyCardQueue.hpp" #include "gc/g1/g1Policy.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/gc_globals.hpp" #include "logging/log.hpp" #include "memory/allocation.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp index 8767f8e1da99b..33943eb5113ab 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThreadsNeeded.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1Analytics.hpp" #include "gc/g1/g1ConcurrentRefineThreadsNeeded.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/g1/g1Policy.hpp" #include "utilities/globalDefinitions.hpp" #include diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp index 93ff09134bfa6..51899b96cdef8 100644 --- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp +++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp @@ -33,7 +33,7 @@ #include "gc/g1/g1RedirtyCardsQueue.hpp" #include "gc/g1/g1RemSet.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/bufferNode.hpp" #include "gc/shared/bufferNodeList.hpp" #include "gc/shared/suspendibleThreadSet.hpp" diff --git a/src/hotspot/share/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp index 23b97785ad358..c76099c284a19 100644 --- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp +++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_G1_G1EDENREGIONS_HPP #include "gc/g1/g1RegionsOnNodes.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "runtime/globals.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp index a308fe7a3934a..845868c3e2415 100644 --- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp +++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp @@ -27,7 +27,7 @@ #include "gc/g1/g1BatchedTask.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1EvacFailureRegions.inline.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" #include "runtime/atomic.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp index 9150d2f2ccdfe..7aa04449bcf7b 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp @@ -28,7 +28,7 @@ #include "gc/g1/g1FullCollector.hpp" #include "gc/g1/g1FullGCHeapRegionAttr.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "oops/oopsHierarchy.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp index 76aebeb7a8334..3eca766b2fcf7 100644 --- a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp @@ -32,7 +32,7 @@ #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCMarker.hpp" #include "gc/g1/g1FullGCOopClosures.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/referenceProcessor.hpp" #include "gc/shared/weakProcessor.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp index c9b190acd0659..a9c18c99e34a5 100644 --- a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp @@ -28,7 +28,7 @@ #include "gc/g1/g1FullGCOopClosures.hpp" #include "gc/g1/g1FullGCTask.hpp" #include "gc/g1/g1RootProcessor.hpp" -#include "gc/g1/heapRegionManager.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" #include "gc/shared/weakProcessor.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp index 2ed6ccd4735fb..5e3a9687f9808 100644 --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp @@ -28,7 +28,7 @@ #include "gc/g1/g1FullCollector.inline.hpp" #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCCompactTask.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "logging/log.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp index a7e2ea38c1775..7f7f144397baf 100644 --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp @@ -28,7 +28,7 @@ #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCScope.hpp" #include "gc/g1/g1FullGCTask.hpp" -#include "gc/g1/heapRegionManager.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" #include "gc/shared/referenceProcessor.hpp" class G1CollectedHeap; diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp index a1db2aa87ba2e..7b19aa431beb1 100644 --- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1FullCollector.inline.hpp" #include "gc/g1/g1FullGCCompactionPoint.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/preservedMarks.inline.hpp" #include "oops/oop.inline.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp b/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp index 5e45b65c65faf..e248ab10bf24c 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp @@ -29,7 +29,7 @@ #include "gc/g1/g1FullGCScope.hpp" #include "gc/g1/g1FullGCTask.hpp" #include "gc/g1/g1RootProcessor.hpp" -#include "gc/g1/heapRegionManager.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" #include "gc/shared/referenceProcessor.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp index aa194d16203b7..a8aab3be779c3 100644 --- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp @@ -31,7 +31,7 @@ #include "gc/g1/g1FullCollector.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1FullGCMarker.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "memory/iterator.inline.hpp" #include "memory/universe.hpp" #include "oops/access.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp index 7cef60293974c..e116367133d91 100644 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp @@ -30,7 +30,7 @@ #include "gc/g1/g1FullGCMarker.hpp" #include "gc/g1/g1FullGCOopClosures.inline.hpp" #include "gc/g1/g1FullGCPrepareTask.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/referenceProcessor.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp index 7f09f0553e9f7..9618986dcdd0c 100644 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_G1_G1FULLGCPREPARETASK_HPP #include "gc/g1/g1FullGCTask.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" class G1CollectedHeap; diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp index 2a2add76f48c6..5cff8e5f412a1 100644 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp @@ -31,7 +31,7 @@ #include "gc/g1/g1FullCollector.hpp" #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCScope.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" void G1DetermineCompactionQueueClosure::free_empty_humongous_region(HeapRegion* hr) { _g1h->free_humongous_region(hr, nullptr); diff --git a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp index 25745ff0abcc4..f424906d56377 100644 --- a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_G1_G1FULLGCRESETMETADATATASK_HPP #define SHARE_GC_G1_G1FULLGCRESETMETADATATASK_HPP #include "gc/g1/g1FullGCTask.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" class G1FullGCResetMetadataTask : public G1FullGCTask { G1FullCollector* _collector; diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.cpp b/src/hotspot/share/gc/g1/g1HRPrinter.cpp index af83284f0618d..2bfc536f238ec 100644 --- a/src/hotspot/share/gc/g1/g1HRPrinter.cpp +++ b/src/hotspot/share/gc/g1/g1HRPrinter.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1HRPrinter.hpp" -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" void G1HRPrinter::cleanup(FreeRegionList* cleanup_list) { if (is_active()) { diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp index 876be95f0746c..9d6d151084fbd 100644 --- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp +++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_G1_G1HRPRINTER_HPP #define SHARE_GC_G1_G1HRPRINTER_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "logging/log.hpp" #define SKIP_RETIRED_FULL_REGIONS 1 diff --git a/src/hotspot/share/gc/g1/heapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp similarity index 99% rename from src/hotspot/share/gc/g1/heapRegion.cpp rename to src/hotspot/share/gc/g1/g1HeapRegion.cpp index 69040028d98c5..96bbd6095284f 100644 --- a/src/hotspot/share/gc/g1/heapRegion.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp @@ -32,11 +32,11 @@ #include "gc/g1/g1HeapRegionTraceType.hpp" #include "gc/g1/g1NUMA.hpp" #include "gc/g1/g1OopClosures.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionBounds.inline.hpp" -#include "gc/g1/heapRegionManager.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" -#include "gc/g1/heapRegionTracer.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionBounds.inline.hpp" +#include "gc/g1/g1HeapRegionManager.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionTracer.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" #include "memory/iterator.inline.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.hpp similarity index 99% rename from src/hotspot/share/gc/g1/heapRegion.hpp rename to src/hotspot/share/gc/g1/g1HeapRegion.hpp index 85f4a9e5f9ffb..bf7407e968f26 100644 --- a/src/hotspot/share/gc/g1/heapRegion.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegion.hpp @@ -22,14 +22,14 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGION_HPP -#define SHARE_GC_G1_HEAPREGION_HPP +#ifndef SHARE_GC_G1_G1HEAPREGION_HPP +#define SHARE_GC_G1_G1HEAPREGION_HPP #include "gc/g1/g1BlockOffsetTable.hpp" #include "gc/g1/g1HeapRegionTraceType.hpp" #include "gc/g1/g1SurvRateGroup.hpp" -#include "gc/g1/heapRegionTracer.hpp" -#include "gc/g1/heapRegionType.hpp" +#include "gc/g1/g1HeapRegionTracer.hpp" +#include "gc/g1/g1HeapRegionType.hpp" #include "gc/shared/ageTable.hpp" #include "gc/shared/spaceDecorator.hpp" #include "gc/shared/verifyOption.hpp" @@ -622,4 +622,4 @@ class HeapRegionIndexClosure : public StackObj { bool is_complete() { return _is_complete; } }; -#endif // SHARE_GC_G1_HEAPREGION_HPP +#endif // SHARE_GC_G1_G1HEAPREGION_HPP diff --git a/src/hotspot/share/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp similarity index 99% rename from src/hotspot/share/gc/g1/heapRegion.inline.hpp rename to src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp index 608cc2025a2a8..146f5aff86680 100644 --- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp @@ -22,10 +22,10 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGION_INLINE_HPP -#define SHARE_GC_G1_HEAPREGION_INLINE_HPP +#ifndef SHARE_GC_G1_G1HEAPREGION_INLINE_HPP +#define SHARE_GC_G1_G1HEAPREGION_INLINE_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "classfile/vmClasses.hpp" #include "gc/g1/g1BlockOffsetTable.inline.hpp" @@ -559,4 +559,4 @@ inline void HeapRegion::add_pinned_object_count(size_t value) { Atomic::add(&_pinned_object_count, value, memory_order_relaxed); } -#endif // SHARE_GC_G1_HEAPREGION_INLINE_HPP +#endif // SHARE_GC_G1_G1HEAPREGION_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp index e5a10858ed126..c3c7b94e287b7 100644 --- a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_G1_G1HEAPREGIONATTR_HPP #include "gc/g1/g1BiasedArray.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" // Per-region attributes often used during garbage collection to avoid costly // lookups for that information all over the place. diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.hpp b/src/hotspot/share/gc/g1/g1HeapRegionBounds.hpp similarity index 94% rename from src/hotspot/share/gc/g1/heapRegionBounds.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionBounds.hpp index 5a6db9fac3b14..3cde2f77d4a5b 100644 --- a/src/hotspot/share/gc/g1/heapRegionBounds.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionBounds.hpp @@ -22,8 +22,8 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_HPP -#define SHARE_GC_G1_HEAPREGIONBOUNDS_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONBOUNDS_HPP +#define SHARE_GC_G1_G1HEAPREGIONBOUNDS_HPP #include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" @@ -55,4 +55,4 @@ class HeapRegionBounds : public AllStatic { static inline size_t target_number(); }; -#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONBOUNDS_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegionBounds.inline.hpp similarity index 87% rename from src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionBounds.inline.hpp index 73a44bcf1794f..473057144d30c 100644 --- a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionBounds.inline.hpp @@ -22,10 +22,10 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP -#define SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONBOUNDS_INLINE_HPP +#define SHARE_GC_G1_G1HEAPREGIONBOUNDS_INLINE_HPP -#include "gc/g1/heapRegionBounds.hpp" +#include "gc/g1/g1HeapRegionBounds.hpp" size_t HeapRegionBounds::min_size() { return MIN_REGION_SIZE; @@ -43,4 +43,4 @@ size_t HeapRegionBounds::target_number() { return TARGET_REGION_NUMBER; } -#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONBOUNDS_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp index 19433e39c3235..51b3b8314caa9 100644 --- a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1HeapRegionEventSender.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/gc_globals.hpp" #include "jfr/jfrEvents.hpp" #include "runtime/vmThread.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp similarity index 99% rename from src/hotspot/share/gc/g1/heapRegionManager.cpp rename to src/hotspot/share/gc/g1/g1HeapRegionManager.cpp index 455aacc0931a1..bb662492c745d 100644 --- a/src/hotspot/share/gc/g1/heapRegionManager.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp @@ -28,9 +28,9 @@ #include "gc/g1/g1ConcurrentRefine.hpp" #include "gc/g1/g1CommittedRegionMap.inline.hpp" #include "gc/g1/g1NUMAStats.hpp" -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionManager.inline.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionManager.inline.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" #include "jfr/jfrEvents.hpp" #include "logging/logStream.hpp" #include "memory/allocation.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegionManager.hpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp similarity index 98% rename from src/hotspot/share/gc/g1/heapRegionManager.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionManager.hpp index 0a84010e73c55..b7365b63ba2a0 100644 --- a/src/hotspot/share/gc/g1/heapRegionManager.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp @@ -22,13 +22,13 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_HPP -#define SHARE_GC_G1_HEAPREGIONMANAGER_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONMANAGER_HPP +#define SHARE_GC_G1_G1HEAPREGIONMANAGER_HPP #include "gc/g1/g1BiasedArray.hpp" #include "gc/g1/g1CommittedRegionMap.hpp" #include "gc/g1/g1RegionToSpaceMapper.hpp" -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "memory/allocation.hpp" #include "services/memoryUsage.hpp" @@ -326,4 +326,4 @@ class HeapRegionClaimer : public StackObj { // Claim the given region, returns true if successfully claimed. bool claim_region(uint region_index); }; -#endif // SHARE_GC_G1_HEAPREGIONMANAGER_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONMANAGER_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp similarity index 91% rename from src/hotspot/share/gc/g1/heapRegionManager.inline.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp index 1bcba292ffa2b..9768ee358baae 100644 --- a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp @@ -22,14 +22,14 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP -#define SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONMANAGER_INLINE_HPP +#define SHARE_GC_G1_G1HEAPREGIONMANAGER_INLINE_HPP -#include "gc/g1/heapRegionManager.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" #include "gc/g1/g1CommittedRegionMap.inline.hpp" -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" inline bool HeapRegionManager::is_available(uint region) const { return _committed_map.active(region); @@ -83,4 +83,4 @@ inline HeapRegion* HeapRegionManager::allocate_free_regions_starting_at(uint fir return start; } -#endif // SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONMANAGER_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp similarity index 97% rename from src/hotspot/share/gc/g1/heapRegionRemSet.cpp rename to src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp index 19b383a08a39c..88a3e09bd8e9e 100644 --- a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp @@ -29,8 +29,8 @@ #include "gc/g1/g1CardSetContainers.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentRefine.hpp" -#include "gc/g1/heapRegionManager.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionManager.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "memory/allocation.hpp" #include "memory/padded.inline.hpp" #include "oops/oop.inline.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp similarity index 97% rename from src/hotspot/share/gc/g1/heapRegionRemSet.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp index 2e5ae7b1c3076..7e76965835b6b 100644 --- a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp @@ -22,8 +22,8 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONREMSET_HPP -#define SHARE_GC_G1_HEAPREGIONREMSET_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONREMSET_HPP +#define SHARE_GC_G1_G1HEAPREGIONREMSET_HPP #include "gc/g1/g1CardSet.hpp" #include "gc/g1/g1CardSetMemory.hpp" @@ -185,4 +185,4 @@ class HeapRegionRemSet : public CHeapObj { #endif }; -#endif // SHARE_GC_G1_HEAPREGIONREMSET_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONREMSET_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp similarity index 95% rename from src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp index ca8f675e6dfd7..78153cc0c3023 100644 --- a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp @@ -22,14 +22,14 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP -#define SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP +#ifndef SHARE_VM_GC_G1_G1HEAPREGIONREMSET_INLINE_HPP +#define SHARE_VM_GC_G1_G1HEAPREGIONREMSET_INLINE_HPP -#include "gc/g1/heapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" #include "gc/g1/g1CardSet.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "runtime/atomic.hpp" #include "utilities/bitMap.inline.hpp" @@ -144,4 +144,4 @@ void HeapRegionRemSet::print_info(outputStream* st, OopOrNarrowOopStar from) { _card_set.print_info(st, to_card(from)); } -#endif // SHARE_VM_GC_G1_HEAPREGIONREMSET_INLINE_HPP +#endif // SHARE_VM_GC_G1_G1HEAPREGIONREMSET_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionSet.cpp b/src/hotspot/share/gc/g1/g1HeapRegionSet.cpp similarity index 99% rename from src/hotspot/share/gc/g1/heapRegionSet.cpp rename to src/hotspot/share/gc/g1/g1HeapRegionSet.cpp index 7243677ede8e2..679506ed494d4 100644 --- a/src/hotspot/share/gc/g1/heapRegionSet.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionSet.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1NUMA.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" -#include "gc/g1/heapRegionSet.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionSet.inline.hpp" uint FreeRegionList::_unrealistically_long_length = 0; diff --git a/src/hotspot/share/gc/g1/heapRegionSet.hpp b/src/hotspot/share/gc/g1/g1HeapRegionSet.hpp similarity index 98% rename from src/hotspot/share/gc/g1/heapRegionSet.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionSet.hpp index 5db2fbb696aa7..bfc60992c3d40 100644 --- a/src/hotspot/share/gc/g1/heapRegionSet.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionSet.hpp @@ -22,10 +22,10 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONSET_HPP -#define SHARE_GC_G1_HEAPREGIONSET_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONSET_HPP +#define SHARE_GC_G1_G1HEAPREGIONSET_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "utilities/macros.hpp" #define assert_heap_region_set(p, message) \ @@ -271,4 +271,4 @@ class FreeRegionListIterator : public StackObj { } }; -#endif // SHARE_GC_G1_HEAPREGIONSET_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONSET_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegionSet.inline.hpp similarity index 97% rename from src/hotspot/share/gc/g1/heapRegionSet.inline.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionSet.inline.hpp index 0d7c7ed315d13..fbd19466d9f9a 100644 --- a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionSet.inline.hpp @@ -22,10 +22,10 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP -#define SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONSET_INLINE_HPP +#define SHARE_GC_G1_G1HEAPREGIONSET_INLINE_HPP -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "gc/g1/g1NUMA.hpp" @@ -271,4 +271,4 @@ inline uint FreeRegionList::length(uint node_index) const { } } -#endif // SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONSET_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionTracer.cpp b/src/hotspot/share/gc/g1/g1HeapRegionTracer.cpp similarity index 97% rename from src/hotspot/share/gc/g1/heapRegionTracer.cpp rename to src/hotspot/share/gc/g1/g1HeapRegionTracer.cpp index e039ae219a11e..c66ae0cb06941 100644 --- a/src/hotspot/share/gc/g1/heapRegionTracer.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionTracer.cpp @@ -23,7 +23,7 @@ */ #include "precompiled.hpp" -#include "gc/g1/heapRegionTracer.hpp" +#include "gc/g1/g1HeapRegionTracer.hpp" #include "jfr/jfrEvents.hpp" void HeapRegionTracer::send_region_type_change(uint index, diff --git a/src/hotspot/share/gc/g1/heapRegionTracer.hpp b/src/hotspot/share/gc/g1/g1HeapRegionTracer.hpp similarity index 92% rename from src/hotspot/share/gc/g1/heapRegionTracer.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionTracer.hpp index 647744d0d5e23..137bc6189aed0 100644 --- a/src/hotspot/share/gc/g1/heapRegionTracer.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionTracer.hpp @@ -22,8 +22,8 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONTRACER_HPP -#define SHARE_GC_G1_HEAPREGIONTRACER_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONTRACER_HPP +#define SHARE_GC_G1_G1HEAPREGIONTRACER_HPP #include "gc/g1/g1HeapRegionTraceType.hpp" #include "memory/allStatic.hpp" @@ -38,4 +38,4 @@ class HeapRegionTracer : AllStatic { size_t used); }; -#endif // SHARE_GC_G1_HEAPREGIONTRACER_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONTRACER_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionType.cpp b/src/hotspot/share/gc/g1/g1HeapRegionType.cpp similarity index 98% rename from src/hotspot/share/gc/g1/heapRegionType.cpp rename to src/hotspot/share/gc/g1/g1HeapRegionType.cpp index bb5c4e9392c79..e55759b3bf38d 100644 --- a/src/hotspot/share/gc/g1/heapRegionType.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionType.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "gc/g1/g1HeapRegionTraceType.hpp" -#include "gc/g1/heapRegionType.hpp" +#include "gc/g1/g1HeapRegionType.hpp" const HeapRegionType HeapRegionType::Eden = HeapRegionType(EdenTag); const HeapRegionType HeapRegionType::Survivor = HeapRegionType(SurvTag); diff --git a/src/hotspot/share/gc/g1/heapRegionType.hpp b/src/hotspot/share/gc/g1/g1HeapRegionType.hpp similarity index 97% rename from src/hotspot/share/gc/g1/heapRegionType.hpp rename to src/hotspot/share/gc/g1/g1HeapRegionType.hpp index 85a89f77a9405..b62699cc3fb9e 100644 --- a/src/hotspot/share/gc/g1/heapRegionType.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionType.hpp @@ -22,8 +22,8 @@ * */ -#ifndef SHARE_GC_G1_HEAPREGIONTYPE_HPP -#define SHARE_GC_G1_HEAPREGIONTYPE_HPP +#ifndef SHARE_GC_G1_G1HEAPREGIONTYPE_HPP +#define SHARE_GC_G1_G1HEAPREGIONTYPE_HPP #include "gc/g1/g1HeapRegionTraceType.hpp" #include "utilities/globalDefinitions.hpp" @@ -167,4 +167,4 @@ friend class VMStructs; static const HeapRegionType Humongous; }; -#endif // SHARE_GC_G1_HEAPREGIONTYPE_HPP +#endif // SHARE_GC_G1_G1HEAPREGIONTYPE_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp index 6cca6e8b05610..7e115760653d7 100644 --- a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp +++ b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp @@ -31,8 +31,8 @@ #include "gc/g1/g1Policy.hpp" #include "gc/g1/g1RemSet.hpp" #include "gc/g1/g1RootProcessor.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" #include "gc/shared/tlab_globals.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp index f10787c528e36..221ae9576489e 100644 --- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp +++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_G1_G1HEAPVERIFIER_HPP #define SHARE_GC_G1_G1HEAPVERIFIER_HPP -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "gc/shared/verifyOption.hpp" #include "memory/allocation.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/g1/g1MemoryPool.cpp b/src/hotspot/share/gc/g1/g1MemoryPool.cpp index 428d2db212e2e..ae4a6c13a3f7f 100644 --- a/src/hotspot/share/gc/g1/g1MemoryPool.cpp +++ b/src/hotspot/share/gc/g1/g1MemoryPool.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1MemoryPool.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/gc_globals.hpp" G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h, diff --git a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp index 4ba4469bd964f..aaff181f789c9 100644 --- a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp +++ b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp @@ -29,7 +29,7 @@ #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp" #include "gc/g1/g1MonotonicArenaFreePool.hpp" #include "gc/g1/g1_globals.hpp" -#include "gc/g1/heapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" #include "gc/shared/gc_globals.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/suspendibleThreadSet.hpp" diff --git a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp index 88611c63b5c10..b45a02008a7df 100644 --- a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp +++ b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.hpp @@ -28,7 +28,7 @@ #include "gc/g1/g1CardSetMemory.hpp" #include "gc/g1/g1MonotonicArenaFreePool.hpp" #include "gc/g1/g1ServiceThread.hpp" -#include "gc/g1/heapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" #include "utilities/growableArray.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/gc/g1/g1NUMA.hpp b/src/hotspot/share/gc/g1/g1NUMA.hpp index acf5a114aebd4..5b77680b493dd 100644 --- a/src/hotspot/share/gc/g1/g1NUMA.hpp +++ b/src/hotspot/share/gc/g1/g1NUMA.hpp @@ -26,7 +26,7 @@ #define SHARE_VM_GC_G1_NUMA_HPP #include "gc/g1/g1NUMAStats.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" #include "runtime/os.hpp" diff --git a/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp b/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp index 13890c026b2d6..eb86b81d2abbd 100644 --- a/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp +++ b/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_VM_GC_G1_G1OLDGENALLOCATIONTRACKER_HPP #define SHARE_VM_GC_G1_G1OLDGENALLOCATIONTRACKER_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" class G1AdaptiveIHOPControl; diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp index ea7f690d325fc..63d14941df75f 100644 --- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp @@ -31,8 +31,8 @@ #include "gc/g1/g1ConcurrentMark.inline.hpp" #include "gc/g1/g1ParScanThreadState.inline.hpp" #include "gc/g1/g1RemSet.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" #include "memory/iterator.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp index 9e22acc73ca33..f8c540faaf183 100644 --- a/src/hotspot/share/gc/g1/g1Policy.cpp +++ b/src/hotspot/share/gc/g1/g1Policy.cpp @@ -39,8 +39,8 @@ #include "gc/g1/g1Policy.hpp" #include "gc/g1/g1SurvivorRegions.hpp" #include "gc/g1/g1YoungGenSizer.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/concurrentGCBreakpoints.hpp" #include "gc/shared/gcPolicyCounters.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/g1/g1RegionPinCache.hpp b/src/hotspot/share/gc/g1/g1RegionPinCache.hpp index 6df1c1793c285..1c04936930a8f 100644 --- a/src/hotspot/share/gc/g1/g1RegionPinCache.hpp +++ b/src/hotspot/share/gc/g1/g1RegionPinCache.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_G1_G1REGIONPINCACHE_HPP #define SHARE_GC_G1_G1REGIONPINCACHE_HPP -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp b/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp index 5ec3c759369ce..a22d96386a8e5 100644 --- a/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp +++ b/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1NUMA.hpp" #include "gc/g1/g1RegionsOnNodes.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" G1RegionsOnNodes::G1RegionsOnNodes() : _count_per_node(nullptr), _numa(G1NUMA::numa()) { _count_per_node = NEW_C_HEAP_ARRAY(uint, _numa->num_active_nodes(), mtGC); diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp index ac445850085cd..77e8e702b7659 100644 --- a/src/hotspot/share/gc/g1/g1RemSet.cpp +++ b/src/hotspot/share/gc/g1/g1RemSet.cpp @@ -40,9 +40,9 @@ #include "gc/g1/g1RootClosures.hpp" #include "gc/g1/g1RemSet.hpp" #include "gc/g1/g1_globals.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionManager.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionManager.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/bufferNode.hpp" #include "gc/shared/bufferNodeList.hpp" #include "gc/shared/gcTraceTime.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1RemSet.hpp b/src/hotspot/share/gc/g1/g1RemSet.hpp index 053fc39aa8365..7a4e5171d8e7d 100644 --- a/src/hotspot/share/gc/g1/g1RemSet.hpp +++ b/src/hotspot/share/gc/g1/g1RemSet.hpp @@ -29,7 +29,7 @@ #include "gc/g1/g1OopClosures.hpp" #include "gc/g1/g1GCPhaseTimes.hpp" #include "gc/g1/g1RemSetSummary.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "memory/allocation.hpp" #include "memory/iterator.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/gc/g1/g1RemSetSummary.cpp b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp index 4156e85fbfa00..2285b21fec636 100644 --- a/src/hotspot/share/gc/g1/g1RemSetSummary.cpp +++ b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp @@ -31,8 +31,8 @@ #include "gc/g1/g1DirtyCardQueue.hpp" #include "gc/g1/g1RemSet.hpp" #include "gc/g1/g1RemSetSummary.hpp" -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "memory/allocation.inline.hpp" #include "memory/iterator.hpp" #include "runtime/javaThread.hpp" diff --git a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp index c227b625b8de6..b34233bfe8407 100644 --- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp +++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectionSetChooser.hpp" #include "gc/g1/g1RemSetTrackingPolicy.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "runtime/safepoint.hpp" bool G1RemSetTrackingPolicy::needs_scan_for_rebuild(HeapRegion* r) const { diff --git a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp index 2c2734d4abf4a..94ff2734fbf8e 100644 --- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp +++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp @@ -25,8 +25,8 @@ #ifndef SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP #define SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionType.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionType.hpp" #include "memory/allocation.hpp" // The remembered set tracking policy determines for a given region the state of diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp index 3a9e30ec4034d..2d172763d96a4 100644 --- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp +++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp @@ -36,7 +36,7 @@ #include "gc/g1/g1Policy.hpp" #include "gc/g1/g1RootClosures.hpp" #include "gc/g1/g1RootProcessor.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageSet.hpp" #include "gc/shared/oopStorageSetParState.inline.hpp" diff --git a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp index f1cf554ca462a..8fe09b06d3e77 100644 --- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp +++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp @@ -27,7 +27,7 @@ #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1SATBMarkQueueSet.hpp" #include "gc/g1/g1ThreadLocalData.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/satbMarkQueue.hpp" #include "oops/oop.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp index 2b09dfc668b59..837334df26768 100644 --- a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp +++ b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp @@ -26,7 +26,7 @@ #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1Predictions.hpp" #include "gc/g1/g1SurvRateGroup.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "logging/log.hpp" #include "memory/allocation.hpp" diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp index dc821b135148f..1d174d984145b 100644 --- a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp +++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "gc/g1/g1SurvivorRegions.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "utilities/growableArray.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp index 377f5f550d17e..efd373d927972 100644 --- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp +++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp @@ -38,8 +38,8 @@ #include "gc/g1/g1ParScanThreadState.hpp" #include "gc/g1/g1RemSet.hpp" #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #include "gc/shared/bufferNode.hpp" #include "gc/shared/preservedMarks.inline.hpp" #include "jfr/jfrEvents.hpp" diff --git a/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp index 13bbb22252cb9..e90641fa1fee1 100644 --- a/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp +++ b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/g1/g1Arguments.hpp" #include "gc/g1/g1YoungGenSizer.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "logging/log.hpp" #include "runtime/globals_extension.hpp" diff --git a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp index b04c02a3fc978..46c850cb643a4 100644 --- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp +++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp @@ -23,7 +23,7 @@ */ #include "precompiled.hpp" -#include "gc/g1/heapRegionBounds.inline.hpp" +#include "gc/g1/g1HeapRegionBounds.inline.hpp" #include "gc/g1/jvmFlagConstraintsG1.hpp" #include "gc/shared/bufferNode.hpp" #include "gc/shared/ptrQueue.hpp" diff --git a/src/hotspot/share/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp index 9ce61531989ee..62d91fe310099 100644 --- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp +++ b/src/hotspot/share/gc/g1/vmStructs_g1.hpp @@ -26,8 +26,8 @@ #define SHARE_GC_G1_VMSTRUCTS_G1_HPP #include "gc/g1/g1CollectedHeap.hpp" -#include "gc/g1/heapRegion.hpp" -#include "gc/g1/heapRegionManager.hpp" +#include "gc/g1/g1HeapRegion.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" #include "utilities/macros.hpp" #define VM_STRUCTS_G1GC(nonstatic_field, \ diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp index 2ad442db93483..4338351c6061a 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -42,7 +42,7 @@ #include "runtime/vm_version.hpp" #if INCLUDE_G1GC #include "gc/g1/g1CardTable.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/g1/g1ThreadLocalData.hpp" #endif diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp index 8f3367ce0003c..331baf7c87fb3 100644 --- a/src/hotspot/share/opto/runtime.cpp +++ b/src/hotspot/share/opto/runtime.cpp @@ -35,7 +35,7 @@ #include "code/vtableStubs.hpp" #include "compiler/compileBroker.hpp" #include "compiler/oopMap.hpp" -#include "gc/g1/heapRegion.hpp" +#include "gc/g1/g1HeapRegion.hpp" #include "gc/shared/barrierSet.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/gcLocker.hpp" diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index 99ed98cdfac4c..6c71639919320 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -105,8 +105,8 @@ #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMark.hpp" #include "gc/g1/g1ConcurrentMarkThread.inline.hpp" -#include "gc/g1/heapRegionManager.hpp" -#include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/g1/g1HeapRegionManager.hpp" +#include "gc/g1/g1HeapRegionRemSet.inline.hpp" #endif // INCLUDE_G1GC #if INCLUDE_PARALLELGC #include "gc/parallel/parallelScavengeHeap.inline.hpp" diff --git a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp index 1ad21b0d9a0ca..71adcc7381df0 100644 --- a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp +++ b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp @@ -26,8 +26,8 @@ #include "gc/g1/g1CardSet.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1RegionToSpaceMapper.hpp" -#include "gc/g1/heapRegion.inline.hpp" -#include "gc/g1/heapRegionSet.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" +#include "gc/g1/g1HeapRegionSet.hpp" #include "memory/allocation.hpp" #include "memory/memRegion.hpp" #include "memory/virtualspace.hpp" diff --git a/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp index c455deacb26c1..b19f0067cbbe4 100644 --- a/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp +++ b/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp @@ -26,7 +26,7 @@ #include "gc/g1/g1CardSetContainers.hpp" #include "gc/g1/g1CardSetMemory.hpp" #include "gc/g1/g1MonotonicArenaFreePool.hpp" -#include "gc/g1/heapRegionRemSet.hpp" +#include "gc/g1/g1HeapRegionRemSet.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/workerThread.hpp" #include "logging/log.hpp" diff --git a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp index 0ad3aed18ccee..21ae6e9c1da04 100644 --- a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp +++ b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp @@ -23,7 +23,7 @@ #include "precompiled.hpp" #include "gc/g1/g1CardSetContainers.inline.hpp" -#include "gc/g1/heapRegionBounds.inline.hpp" +#include "gc/g1/g1HeapRegionBounds.inline.hpp" #include "gc/shared/cardTable.hpp" #include "memory/allocation.inline.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp index 80ebe1b0c2165..e329a2b80ae50 100644 --- a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp +++ b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp @@ -25,7 +25,7 @@ #include "gc/g1/g1BlockOffsetTable.hpp" #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" -#include "gc/g1/heapRegion.inline.hpp" +#include "gc/g1/g1HeapRegion.inline.hpp" #include "gc/shared/referenceProcessor.hpp" #include "runtime/interfaceSupport.inline.hpp" #include "runtime/vmOperations.hpp"