From 7d18ebd870bb6aa409fd4e7b622400fd9a8f7d30 Mon Sep 17 00:00:00 2001 From: Axel Boldt-Christmas Date: Fri, 19 Aug 2022 08:29:36 +0000 Subject: [PATCH] 8292606: G1 and Epsilon header cleanup for JDK-8282729 Reviewed-by: ayang, shade, tschatzl --- src/hotspot/share/gc/epsilon/epsilonHeap.hpp | 7 ++++--- src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp | 1 + src/hotspot/share/gc/g1/g1FullGCScope.cpp | 1 + src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp | 3 ++- src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp | 3 ++- src/hotspot/share/gc/g1/g1MemoryPool.cpp | 1 + src/hotspot/share/gc/g1/g1NUMA.cpp | 1 + src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp | 3 ++- src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp | 1 + 9 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp index 54d35669496..a3f60d2fb09 100644 --- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Red Hat, Inc. All rights reserved. + * Copyright (c) 2017, 2022, Red Hat, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,11 +25,12 @@ #ifndef SHARE_GC_EPSILON_EPSILONHEAP_HPP #define SHARE_GC_EPSILON_EPSILONHEAP_HPP +#include "gc/epsilon/epsilonBarrierSet.hpp" +#include "gc/epsilon/epsilonMonitoringSupport.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/softRefPolicy.hpp" #include "gc/shared/space.hpp" -#include "gc/epsilon/epsilonMonitoringSupport.hpp" -#include "gc/epsilon/epsilonBarrierSet.hpp" +#include "memory/virtualspace.hpp" #include "services/memoryManager.hpp" class EpsilonHeap : public CollectedHeap { diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp index e8894323d65..266da565e09 100644 --- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp +++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp @@ -26,6 +26,7 @@ #define SHARE_GC_G1_G1COLLECTIONSETCHOOSER_HPP #include "gc/g1/heapRegion.hpp" +#include "gc/shared/gc_globals.hpp" #include "memory/allStatic.hpp" #include "runtime/globals.hpp" diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.cpp b/src/hotspot/share/gc/g1/g1FullGCScope.cpp index 38752db1bff..de3beb4c278 100644 --- a/src/hotspot/share/gc/g1/g1FullGCScope.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCScope.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "gc/g1/g1FullGCScope.hpp" +#include "gc/shared/gc_globals.hpp" G1FullGCJFRTracerMark::G1FullGCJFRTracerMark(STWGCTimer* timer, GCTracer* tracer) : G1JFRTracerMark(timer, tracer) { diff --git a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp index 66eb77fa9d3..19433e39c32 100644 --- a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp @@ -24,8 +24,9 @@ #include "precompiled.hpp" #include "gc/g1/g1CollectedHeap.hpp" +#include "gc/g1/g1HeapRegionEventSender.hpp" #include "gc/g1/heapRegion.hpp" -#include "g1HeapRegionEventSender.hpp" +#include "gc/shared/gc_globals.hpp" #include "jfr/jfrEvents.hpp" #include "runtime/vmThread.hpp" diff --git a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp index 401afbb1195..1a7c11a685b 100644 --- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp +++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp @@ -23,9 +23,10 @@ */ #include "precompiled.hpp" +#include "gc/g1/g1Analytics.hpp" #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1HeapSizingPolicy.hpp" -#include "gc/g1/g1Analytics.hpp" +#include "gc/shared/gc_globals.hpp" #include "logging/log.hpp" #include "runtime/globals.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/g1/g1MemoryPool.cpp b/src/hotspot/share/gc/g1/g1MemoryPool.cpp index af8f517f433..428d2db212e 100644 --- a/src/hotspot/share/gc/g1/g1MemoryPool.cpp +++ b/src/hotspot/share/gc/g1/g1MemoryPool.cpp @@ -26,6 +26,7 @@ #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1MemoryPool.hpp" #include "gc/g1/heapRegion.hpp" +#include "gc/shared/gc_globals.hpp" G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h, const char* name, diff --git a/src/hotspot/share/gc/g1/g1NUMA.cpp b/src/hotspot/share/gc/g1/g1NUMA.cpp index f8a90fae419..10ebfa40103 100644 --- a/src/hotspot/share/gc/g1/g1NUMA.cpp +++ b/src/hotspot/share/gc/g1/g1NUMA.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "gc/g1/g1NUMA.hpp" +#include "gc/shared/gc_globals.hpp" #include "logging/logStream.hpp" #include "runtime/globals.hpp" #include "runtime/os.hpp" diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp index b8f1f5de153..6ad7df29ece 100644 --- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp +++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ #include "gc/g1/g1BiasedArray.hpp" #include "gc/g1/g1NUMA.hpp" #include "gc/g1/g1RegionToSpaceMapper.hpp" +#include "gc/shared/gc_globals.hpp" #include "memory/allocation.inline.hpp" #include "memory/virtualspace.hpp" #include "runtime/mutexLocker.hpp" diff --git a/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp b/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp index 5bef0caca0b..24f89c3bd46 100644 --- a/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp +++ b/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp @@ -29,6 +29,7 @@ #include "gc/g1/g1SegmentedArrayFreeMemoryTask.hpp" #include "gc/g1/g1_globals.hpp" #include "gc/g1/heapRegionRemSet.hpp" +#include "gc/shared/gc_globals.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/suspendibleThreadSet.hpp" #include "runtime/os.hpp"