From 7c70e7341438ce8a420021005a0f03fe917e5a26 Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi Date: Wed, 3 Sep 2025 06:45:02 +0000 Subject: [PATCH] 8366660: Sort share/nmt includes Reviewed-by: ayang, shade --- src/hotspot/share/nmt/arrayWithFreeList.hpp | 1 + src/hotspot/share/nmt/mallocLimit.cpp | 4 ++-- src/hotspot/share/nmt/mallocTracker.cpp | 2 +- src/hotspot/share/nmt/mallocTracker.inline.hpp | 3 ++- src/hotspot/share/nmt/memMapPrinter.cpp | 4 ++-- src/hotspot/share/nmt/memReporter.cpp | 7 +++---- src/hotspot/share/nmt/memTracker.hpp | 2 +- src/hotspot/share/nmt/memoryFileTracker.cpp | 2 +- src/hotspot/share/nmt/memoryFileTracker.hpp | 2 +- src/hotspot/share/nmt/nmtNativeCallStackStorage.hpp | 1 + src/hotspot/share/nmt/regionsTree.inline.hpp | 1 + src/hotspot/share/nmt/virtualMemoryTracker.cpp | 3 +-- src/hotspot/share/nmt/virtualMemoryTracker.hpp | 2 +- src/hotspot/share/nmt/vmatree.hpp | 2 +- test/hotspot/jtreg/sources/TestIncludesAreSorted.java | 1 + 15 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/hotspot/share/nmt/arrayWithFreeList.hpp b/src/hotspot/share/nmt/arrayWithFreeList.hpp index 2c1812dcc52..03a44f8c20b 100644 --- a/src/hotspot/share/nmt/arrayWithFreeList.hpp +++ b/src/hotspot/share/nmt/arrayWithFreeList.hpp @@ -26,6 +26,7 @@ #define SHARE_NMT_ARRAYWITHFREELIST_HPP #include "utilities/growableArray.hpp" + #include // A flat array of elements E, backed by C-heap, growing on-demand. It allows for diff --git a/src/hotspot/share/nmt/mallocLimit.cpp b/src/hotspot/share/nmt/mallocLimit.cpp index 2bce2e459e0..1751cb59ae7 100644 --- a/src/hotspot/share/nmt/mallocLimit.cpp +++ b/src/hotspot/share/nmt/mallocLimit.cpp @@ -26,11 +26,11 @@ #include "nmt/mallocLimit.hpp" #include "nmt/memTag.hpp" #include "nmt/nmtCommon.hpp" -#include "runtime/java.hpp" #include "runtime/globals.hpp" +#include "runtime/java.hpp" #include "utilities/globalDefinitions.hpp" -#include "utilities/parseInteger.hpp" #include "utilities/ostream.hpp" +#include "utilities/parseInteger.hpp" MallocLimitSet MallocLimitHandler::_limits; bool MallocLimitHandler::_have_limit = false; diff --git a/src/hotspot/share/nmt/mallocTracker.cpp b/src/hotspot/share/nmt/mallocTracker.cpp index d919f3ce873..ab3cb322107 100644 --- a/src/hotspot/share/nmt/mallocTracker.cpp +++ b/src/hotspot/share/nmt/mallocTracker.cpp @@ -40,10 +40,10 @@ #include "runtime/os.hpp" #include "runtime/safefetch.hpp" #include "utilities/debug.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" #include "utilities/ostream.hpp" #include "utilities/vmError.hpp" -#include "utilities/globalDefinitions.hpp" MallocMemorySnapshot MallocMemorySummary::_snapshot; diff --git a/src/hotspot/share/nmt/mallocTracker.inline.hpp b/src/hotspot/share/nmt/mallocTracker.inline.hpp index 51a7f28cf99..abf0a499a9d 100644 --- a/src/hotspot/share/nmt/mallocTracker.inline.hpp +++ b/src/hotspot/share/nmt/mallocTracker.inline.hpp @@ -26,8 +26,9 @@ #ifndef SHARE_NMT_MALLOCTRACKER_INLINE_HPP #define SHARE_NMT_MALLOCTRACKER_INLINE_HPP -#include "nmt/mallocLimit.hpp" #include "nmt/mallocTracker.hpp" + +#include "nmt/mallocLimit.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp index 41d977e9639..6086b1a6fd1 100644 --- a/src/hotspot/share/nmt/memMapPrinter.cpp +++ b/src/hotspot/share/nmt/memMapPrinter.cpp @@ -28,11 +28,11 @@ #include "gc/shared/collectedHeap.hpp" #include "logging/logAsyncWriter.hpp" #include "memory/allocation.hpp" -#include "memory/universe.hpp" #include "memory/resourceArea.hpp" +#include "memory/universe.hpp" +#include "nmt/memMapPrinter.hpp" #include "nmt/memTag.hpp" #include "nmt/memTagBitmap.hpp" -#include "nmt/memMapPrinter.hpp" #include "nmt/memTracker.hpp" #include "nmt/virtualMemoryTracker.hpp" #include "runtime/nonJavaThread.hpp" diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp index a7c564eff53..65d4d76942b 100644 --- a/src/hotspot/share/nmt/memReporter.cpp +++ b/src/hotspot/share/nmt/memReporter.cpp @@ -26,11 +26,10 @@ #include "memory/metaspace.hpp" #include "memory/metaspaceUtils.hpp" #include "nmt/mallocTracker.hpp" -#include "nmt/memTag.hpp" -#include "nmt/memReporter.hpp" -#include "nmt/memTracker.hpp" #include "nmt/memoryFileTracker.hpp" -#include "nmt/regionsTree.hpp" +#include "nmt/memReporter.hpp" +#include "nmt/memTag.hpp" +#include "nmt/memTracker.hpp" #include "nmt/regionsTree.inline.hpp" #include "nmt/threadStackTracker.hpp" #include "nmt/virtualMemoryTracker.hpp" diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp index 124c6163d76..b6a9ed261de 100644 --- a/src/hotspot/share/nmt/memTracker.hpp +++ b/src/hotspot/share/nmt/memTracker.hpp @@ -28,8 +28,8 @@ #include "memory/reservedSpace.hpp" #include "nmt/mallocTracker.hpp" #include "nmt/memBaseline.hpp" -#include "nmt/nmtCommon.hpp" #include "nmt/memoryFileTracker.hpp" +#include "nmt/nmtCommon.hpp" #include "nmt/threadStackTracker.hpp" #include "nmt/virtualMemoryTracker.hpp" #include "runtime/mutexLocker.hpp" diff --git a/src/hotspot/share/nmt/memoryFileTracker.cpp b/src/hotspot/share/nmt/memoryFileTracker.cpp index 55f1cb64626..2f3f4f1973a 100644 --- a/src/hotspot/share/nmt/memoryFileTracker.cpp +++ b/src/hotspot/share/nmt/memoryFileTracker.cpp @@ -23,8 +23,8 @@ */ #include "memory/allocation.hpp" -#include "nmt/memTracker.hpp" #include "nmt/memoryFileTracker.hpp" +#include "nmt/memTracker.hpp" #include "nmt/nmtCommon.hpp" #include "nmt/nmtNativeCallStackStorage.hpp" #include "nmt/vmatree.hpp" diff --git a/src/hotspot/share/nmt/memoryFileTracker.hpp b/src/hotspot/share/nmt/memoryFileTracker.hpp index 1b23dacab81..1e8bd40ed50 100644 --- a/src/hotspot/share/nmt/memoryFileTracker.hpp +++ b/src/hotspot/share/nmt/memoryFileTracker.hpp @@ -28,8 +28,8 @@ #include "memory/allocation.hpp" #include "nmt/nmtCommon.hpp" #include "nmt/nmtNativeCallStackStorage.hpp" -#include "nmt/vmatree.hpp" #include "nmt/virtualMemoryTracker.hpp" +#include "nmt/vmatree.hpp" #include "runtime/os.inline.hpp" #include "utilities/deferredStatic.hpp" #include "utilities/growableArray.hpp" diff --git a/src/hotspot/share/nmt/nmtNativeCallStackStorage.hpp b/src/hotspot/share/nmt/nmtNativeCallStackStorage.hpp index 85e044c1a45..6f194cfa5a1 100644 --- a/src/hotspot/share/nmt/nmtNativeCallStackStorage.hpp +++ b/src/hotspot/share/nmt/nmtNativeCallStackStorage.hpp @@ -28,6 +28,7 @@ #include "nmt/arrayWithFreeList.hpp" #include "utilities/growableArray.hpp" #include "utilities/nativeCallStack.hpp" + #include // Virtual memory regions that are tracked by NMT also have their NativeCallStack (NCS) tracked. diff --git a/src/hotspot/share/nmt/regionsTree.inline.hpp b/src/hotspot/share/nmt/regionsTree.inline.hpp index 665f4a93c88..98cfa0e7f2c 100644 --- a/src/hotspot/share/nmt/regionsTree.inline.hpp +++ b/src/hotspot/share/nmt/regionsTree.inline.hpp @@ -25,6 +25,7 @@ #define SHARE_NMT_REGIONSTREE_INLINE_HPP #include "nmt/regionsTree.hpp" + #include "nmt/virtualMemoryTracker.hpp" template diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp index 8a97253860c..bdb31d5c992 100644 --- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp +++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp @@ -24,9 +24,8 @@ #include "logging/log.hpp" #include "nmt/memTracker.hpp" -#include "nmt/virtualMemoryTracker.hpp" -#include "nmt/regionsTree.hpp" #include "nmt/regionsTree.inline.hpp" +#include "nmt/virtualMemoryTracker.hpp" #include "runtime/os.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp index 3c6c1efd6a2..121fcbbda4b 100644 --- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp +++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp @@ -26,8 +26,8 @@ #define SHARE_NMT_VIRTUALMEMORYTRACKER_HPP #include "nmt/allocationSite.hpp" -#include "nmt/vmatree.hpp" #include "nmt/regionsTree.hpp" +#include "nmt/vmatree.hpp" #include "runtime/atomic.hpp" #include "utilities/nativeCallStack.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/nmt/vmatree.hpp b/src/hotspot/share/nmt/vmatree.hpp index d2acabdae07..01f0e107a56 100644 --- a/src/hotspot/share/nmt/vmatree.hpp +++ b/src/hotspot/share/nmt/vmatree.hpp @@ -26,12 +26,12 @@ #ifndef SHARE_NMT_VMATREE_HPP #define SHARE_NMT_VMATREE_HPP -#include "nmt/memTag.hpp" #include "nmt/memTag.hpp" #include "nmt/nmtNativeCallStackStorage.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/ostream.hpp" #include "utilities/rbTree.inline.hpp" + #include // A VMATree stores a sequence of points on the natural number line. diff --git a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java index be35f8fa2b2..695b300f3fd 100644 --- a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java +++ b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java @@ -57,6 +57,7 @@ public class TestIncludesAreSorted { "share/logging", "share/memory", "share/metaprogramming", + "share/nmt", "share/oops", "share/opto", "share/precompiled",