8366660: Sort share/nmt includes

Reviewed-by: ayang, shade

src/hotspot/share/nmt/arrayWithFreeList.hpp

@@ -26,6 +26,7 @@
 #define SHARE_NMT_ARRAYWITHFREELIST_HPP
 
 #include "utilities/growableArray.hpp"
+
 #include <type_traits>
 
 // A flat array of elements E, backed by C-heap, growing on-demand. It allows for

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;

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;
 

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"
 

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"

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"

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"

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"

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"

src/hotspot/share/nmt/nmtNativeCallStackStorage.hpp

@@ -28,6 +28,7 @@
 #include "nmt/arrayWithFreeList.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/nativeCallStack.hpp"
+
 #include <limits>
 
 // Virtual memory regions that are tracked by NMT also have their NativeCallStack (NCS) tracked.

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<typename F>

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"
 

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"

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 <cstdint>
 
 // A VMATree stores a sequence of points on the natural number line.

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",