From 6d423eee28e1fd3d9bce4ef5797b6026491949d1 Mon Sep 17 00:00:00 2001 From: Lei Zaakjyu Date: Fri, 12 Jan 2024 22:30:18 +0800 Subject: [PATCH] fix header ordering --- src/hotspot/share/gc/serial/serialHeap.cpp | 24 +++++++++---------- src/hotspot/share/gc/serial/serialHeap.hpp | 5 ++-- .../share/gc/serial/serialVMOperations.hpp | 2 +- .../share/classes/sun/jvm/hotspot/HSDB.java | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp index 933dc12f59e1c..4e78129dea378 100644 --- a/src/hotspot/share/gc/serial/serialHeap.cpp +++ b/src/hotspot/share/gc/serial/serialHeap.cpp @@ -23,19 +23,6 @@ */ #include "precompiled.hpp" -#include "gc/serial/defNewGeneration.inline.hpp" -#include "gc/serial/serialHeap.hpp" -#include "gc/serial/tenuredGeneration.inline.hpp" -#include "gc/shared/gcLocker.inline.hpp" -#include "gc/shared/genMemoryPools.hpp" -#include "gc/shared/scavengableNMethods.hpp" -#include "gc/shared/strongRootsScope.hpp" -#include "gc/shared/suspendibleThreadSet.hpp" -#include "memory/universe.hpp" -#include "runtime/mutexLocker.hpp" -#include "services/memoryManager.hpp" -#include "serialVMOperations.hpp" - #include "classfile/classLoaderDataGraph.hpp" #include "classfile/stringTable.hpp" #include "classfile/symbolTable.hpp" @@ -44,8 +31,12 @@ #include "code/icBuffer.hpp" #include "compiler/oopMap.hpp" #include "gc/serial/cardTableRS.hpp" +#include "gc/serial/defNewGeneration.inline.hpp" #include "gc/serial/genMarkSweep.hpp" #include "gc/serial/markSweep.hpp" +#include "gc/serial/serialHeap.hpp" +#include "gc/serial/serialVMOperations.hpp" +#include "gc/serial/tenuredGeneration.inline.hpp" #include "gc/shared/cardTableBarrierSet.hpp" #include "gc/shared/classUnloadingContext.hpp" #include "gc/shared/collectedHeap.inline.hpp" @@ -53,27 +44,33 @@ #include "gc/shared/continuationGCSupport.inline.hpp" #include "gc/shared/gcId.hpp" #include "gc/shared/gcInitLogger.hpp" +#include "gc/shared/gcLocker.inline.hpp" #include "gc/shared/gcPolicyCounters.hpp" #include "gc/shared/gcTrace.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/gcVMOperations.hpp" #include "gc/shared/genArguments.hpp" +#include "gc/shared/genMemoryPools.hpp" #include "gc/shared/locationPrinter.inline.hpp" #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageParState.inline.hpp" #include "gc/shared/oopStorageSet.inline.hpp" #include "gc/shared/scavengableNMethods.hpp" #include "gc/shared/space.hpp" +#include "gc/shared/strongRootsScope.hpp" +#include "gc/shared/suspendibleThreadSet.hpp" #include "gc/shared/weakProcessor.hpp" #include "gc/shared/workerThread.hpp" #include "memory/iterator.hpp" #include "memory/metaspaceCounters.hpp" #include "memory/metaspaceUtils.hpp" #include "memory/resourceArea.hpp" +#include "memory/universe.hpp" #include "oops/oop.inline.hpp" #include "runtime/handles.hpp" #include "runtime/handles.inline.hpp" #include "runtime/java.hpp" +#include "runtime/mutexLocker.hpp" #include "runtime/threads.hpp" #include "runtime/vmThread.hpp" #include "services/memoryService.hpp" @@ -81,6 +78,7 @@ #include "utilities/debug.hpp" #include "utilities/formatBuffer.hpp" #include "utilities/macros.hpp" +#include "services/memoryManager.hpp" #include "utilities/stack.inline.hpp" #include "utilities/vmError.hpp" #if INCLUDE_JVMCI diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp index d0ed728dafb28..147c3ffb442bc 100644 --- a/src/hotspot/share/gc/serial/serialHeap.hpp +++ b/src/hotspot/share/gc/serial/serialHeap.hpp @@ -26,14 +26,13 @@ #define SHARE_GC_SERIAL_SERIALHEAP_HPP #include "gc/serial/defNewGeneration.hpp" -#include "gc/serial/tenuredGeneration.hpp" -#include "utilities/growableArray.hpp" - #include "gc/serial/generation.hpp" +#include "gc/serial/tenuredGeneration.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/oopStorageParState.hpp" #include "gc/shared/preGCValues.hpp" #include "gc/shared/softRefPolicy.hpp" +#include "utilities/growableArray.hpp" class CardTableRS; class GCPolicyCounters; diff --git a/src/hotspot/share/gc/serial/serialVMOperations.hpp b/src/hotspot/share/gc/serial/serialVMOperations.hpp index 149a103ab1e86..30edf5a894cdb 100644 --- a/src/hotspot/share/gc/serial/serialVMOperations.hpp +++ b/src/hotspot/share/gc/serial/serialVMOperations.hpp @@ -25,8 +25,8 @@ #ifndef SHARE_GC_SERIAL_SERIALVMOPERATIONS_HPP #define SHARE_GC_SERIAL_SERIALVMOPERATIONS_HPP -#include "gc/shared/gcVMOperations.hpp" #include "gc/serial/serialHeap.hpp" +#include "gc/shared/gcVMOperations.hpp" class VM_GenCollectForAllocation : public VM_CollectForAllocation { private: diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java index c59bebb5d11aa..bf14408e0fcaf 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java @@ -35,8 +35,8 @@ import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.gc.epsilon.*; import sun.jvm.hotspot.gc.parallel.*; -import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.gc.serial.*; +import sun.jvm.hotspot.gc.shared.*; import sun.jvm.hotspot.gc.shenandoah.*; import sun.jvm.hotspot.gc.g1.*; import sun.jvm.hotspot.gc.x.*;