Skip to content

Commit c851735

Browse files
fandreuzshipilev
authored andcommitted
8364115: Sort share/services includes
Reviewed-by: sspitsyn, ayang, shade
1 parent 317dacc commit c851735

File tree

12 files changed

+23
-20
lines changed

12 files changed

+23
-20
lines changed

src/hotspot/share/services/classLoadingService.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
*
2323
*/
2424

25+
#include "logging/log.hpp"
26+
#include "logging/logConfiguration.hpp"
2527
#include "memory/allocation.hpp"
2628
#include "memory/resourceArea.hpp"
27-
#include "oops/oop.inline.hpp"
2829
#include "oops/instanceKlass.hpp"
2930
#include "oops/method.hpp"
31+
#include "oops/oop.inline.hpp"
3032
#include "runtime/mutexLocker.hpp"
3133
#include "services/classLoadingService.hpp"
3234
#include "services/memoryService.hpp"
35+
#include "utilities/defaultStream.hpp"
3336
#include "utilities/dtrace.hpp"
3437
#include "utilities/macros.hpp"
35-
#include "utilities/defaultStream.hpp"
36-
#include "logging/log.hpp"
37-
#include "logging/logConfiguration.hpp"
3838

3939
#ifdef DTRACE_ENABLED
4040

src/hotspot/share/services/diagnosticCommand.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*
2323
*/
2424

25-
#include "cds/cdsConfig.hpp"
2625
#include "cds/cds_globals.hpp"
26+
#include "cds/cdsConfig.hpp"
2727
#include "classfile/classLoaderDataGraph.hpp"
2828
#include "classfile/classLoaderHierarchyDCmd.hpp"
2929
#include "classfile/classLoaderStats.hpp"
@@ -32,13 +32,13 @@
3232
#include "classfile/vmClasses.hpp"
3333
#include "code/codeCache.hpp"
3434
#include "compiler/compilationMemoryStatistic.hpp"
35-
#include "compiler/compiler_globals.hpp"
3635
#include "compiler/compileBroker.hpp"
36+
#include "compiler/compiler_globals.hpp"
3737
#include "compiler/directivesParser.hpp"
3838
#include "gc/shared/gcVMOperations.hpp"
3939
#include "jvm.h"
40-
#include "memory/metaspaceUtils.hpp"
4140
#include "memory/metaspace/metaspaceDCmd.hpp"
41+
#include "memory/metaspaceUtils.hpp"
4242
#include "memory/resourceArea.hpp"
4343
#include "memory/universe.hpp"
4444
#include "nmt/memMapPrinter.hpp"
@@ -55,8 +55,8 @@
5555
#include "runtime/javaCalls.hpp"
5656
#include "runtime/jniHandles.hpp"
5757
#include "runtime/os.hpp"
58-
#include "runtime/vmOperations.hpp"
5958
#include "runtime/vm_version.hpp"
59+
#include "runtime/vmOperations.hpp"
6060
#include "services/diagnosticArgument.hpp"
6161
#include "services/diagnosticCommand.hpp"
6262
#include "services/diagnosticFramework.hpp"
@@ -69,9 +69,10 @@
6969
#include "utilities/macros.hpp"
7070
#include "utilities/parseInteger.hpp"
7171
#ifdef LINUX
72-
#include "os_posix.hpp"
7372
#include "mallocInfoDcmd.hpp"
73+
#include "os_posix.hpp"
7474
#include "trimCHeapDCmd.hpp"
75+
7576
#include <errno.h>
7677
#endif
7778

src/hotspot/share/services/diagnosticCommand.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "classfile/symbolTable.hpp"
3030
#include "classfile/systemDictionary.hpp"
3131
#include "classfile/vmSymbols.hpp"
32+
#include "oops/method.hpp"
3233
#include "runtime/arguments.hpp"
3334
#include "runtime/os.hpp"
3435
#include "runtime/vmThread.hpp"
@@ -37,7 +38,6 @@
3738
#include "services/diagnosticFramework.hpp"
3839
#include "utilities/macros.hpp"
3940
#include "utilities/ostream.hpp"
40-
#include "oops/method.hpp"
4141

4242
class HelpDCmd : public DCmdWithParser {
4343
protected:

src/hotspot/share/services/diagnosticFramework.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "runtime/os.hpp"
3232
#include "runtime/vmThread.hpp"
3333
#include "utilities/ostream.hpp"
34+
3435
#include <type_traits>
3536

3637

src/hotspot/share/services/finalizerService.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "classfile/classLoaderDataGraph.inline.hpp"
2828
#include "classfile/javaClasses.inline.hpp"
2929
#include "classfile/symbolTable.hpp"
30-
#include "memory/resourceArea.hpp"
3130
#include "logging/log.hpp"
31+
#include "memory/resourceArea.hpp"
3232
#include "oops/instanceKlass.inline.hpp"
3333
#include "runtime/atomic.hpp"
3434
#include "runtime/fieldDescriptor.inline.hpp"

src/hotspot/share/services/gcNotifier.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
#include "classfile/javaClasses.hpp"
2626
#include "classfile/vmClasses.hpp"
2727
#include "classfile/vmSymbols.hpp"
28+
#include "memory/oopFactory.hpp"
29+
#include "memory/resourceArea.hpp"
30+
#include "memoryManager.hpp"
2831
#include "oops/objArrayOop.inline.hpp"
2932
#include "oops/oop.inline.hpp"
3033
#include "runtime/handles.inline.hpp"
@@ -35,9 +38,6 @@
3538
#include "services/gcNotifier.hpp"
3639
#include "services/management.hpp"
3740
#include "services/memoryService.hpp"
38-
#include "memoryManager.hpp"
39-
#include "memory/oopFactory.hpp"
40-
#include "memory/resourceArea.hpp"
4141

4242
GCNotificationRequest *GCNotifier::first_request = nullptr;
4343
GCNotificationRequest *GCNotifier::last_request = nullptr;

src/hotspot/share/services/gcNotifier.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#define SHARE_SERVICES_GCNOTIFIER_HPP
2727

2828
#include "memory/allStatic.hpp"
29+
#include "services/memoryManager.hpp"
2930
#include "services/memoryPool.hpp"
3031
#include "services/memoryService.hpp"
31-
#include "services/memoryManager.hpp"
3232

3333
class GCNotificationRequest : public CHeapObj<mtInternal> {
3434
friend class GCNotifier;

src/hotspot/share/services/heapDumper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
#include "runtime/os.hpp"
5454
#include "runtime/threads.hpp"
5555
#include "runtime/threadSMR.hpp"
56+
#include "runtime/timerTrace.hpp"
5657
#include "runtime/vframe.hpp"
5758
#include "runtime/vmOperations.hpp"
5859
#include "runtime/vmThread.hpp"
59-
#include "runtime/timerTrace.hpp"
6060
#include "services/heapDumper.hpp"
6161
#include "services/heapDumperCompression.hpp"
6262
#include "services/threadService.hpp"

src/hotspot/share/services/management.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
#include "services/diagnosticCommand.hpp"
5858
#include "services/diagnosticFramework.hpp"
5959
#include "services/finalizerService.hpp"
60-
#include "services/writeableFlags.hpp"
60+
#include "services/gcNotifier.hpp"
6161
#include "services/heapDumper.hpp"
6262
#include "services/lowMemoryDetector.hpp"
63-
#include "services/gcNotifier.hpp"
6463
#include "services/management.hpp"
6564
#include "services/memoryManager.hpp"
6665
#include "services/memoryPool.hpp"
6766
#include "services/memoryService.hpp"
6867
#include "services/runtimeService.hpp"
6968
#include "services/threadService.hpp"
69+
#include "services/writeableFlags.hpp"
7070
#include "utilities/debug.hpp"
7171
#include "utilities/formatBuffer.hpp"
7272
#include "utilities/macros.hpp"

src/hotspot/share/services/memoryManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
#include "runtime/handles.inline.hpp"
3333
#include "runtime/javaCalls.hpp"
3434
#include "runtime/mutexLocker.hpp"
35+
#include "services/gcNotifier.hpp"
3536
#include "services/lowMemoryDetector.hpp"
3637
#include "services/management.hpp"
3738
#include "services/memoryManager.hpp"
3839
#include "services/memoryPool.hpp"
3940
#include "services/memoryService.hpp"
40-
#include "services/gcNotifier.hpp"
4141
#include "utilities/dtrace.hpp"
4242

4343
MemoryManager::MemoryManager(const char* name)

0 commit comments

Comments
 (0)