Skip to content

Commit ecab52c

Browse files
fandreuzsimonis
fandreuz
authored and
simonis
committed
8365610: Sort share/jfr includes
Reviewed-by: shade, mgronlun
1 parent ed7d5fe commit ecab52c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+84
-89
lines changed

‎src/hotspot/share/jfr/dcmd/jfrDcmds.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#include "classfile/javaClasses.inline.hpp"
2626
#include "classfile/vmSymbols.hpp"
27-
#include "jfr/jfr.hpp"
2827
#include "jfr/dcmd/jfrDcmds.hpp"
28+
#include "jfr/jfr.hpp"
2929
#include "jfr/jni/jfrJavaSupport.hpp"
3030
#include "jfr/recorder/jfrRecorder.hpp"
3131
#include "jfr/recorder/service/jfrOptionSet.hpp"

‎src/hotspot/share/jfr/instrumentation/jfrClassTransformer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "classfile/javaClasses.inline.hpp"
2929
#include "classfile/symbolTable.hpp"
3030
#include "jfr/instrumentation/jfrClassTransformer.hpp"
31-
#include "jfr/recorder/service/jfrOptionSet.hpp"
3231
#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
32+
#include "jfr/recorder/service/jfrOptionSet.hpp"
3333
#include "logging/log.hpp"
3434
#include "memory/allocation.inline.hpp"
3535
#include "memory/resourceArea.hpp"

‎src/hotspot/share/jfr/jfr.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,16 @@
2626
#include "jfr/jfr.hpp"
2727
#include "jfr/jni/jfrJavaSupport.hpp"
2828
#include "jfr/leakprofiler/leakProfiler.hpp"
29-
#include "jfr/recorder/jfrRecorder.hpp"
3029
#include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
30+
#include "jfr/recorder/jfrRecorder.hpp"
3131
#include "jfr/recorder/repository/jfrEmergencyDump.hpp"
32-
#include "jfr/recorder/service/jfrOptionSet.hpp"
33-
#include "jfr/recorder/service/jfrOptionSet.hpp"
3432
#include "jfr/recorder/repository/jfrRepository.hpp"
33+
#include "jfr/recorder/service/jfrOptionSet.hpp"
3534
#include "jfr/support/jfrKlassExtension.hpp"
3635
#include "jfr/support/jfrResolution.hpp"
3736
#include "jfr/support/jfrThreadLocal.hpp"
3837
#include "jfr/support/methodtracer/jfrMethodTracer.hpp"
3938
#include "jfr/support/methodtracer/jfrTraceTagging.hpp"
40-
#include "oops/instanceKlass.hpp"
4139
#include "oops/instanceKlass.inline.hpp"
4240
#include "oops/klass.hpp"
4341
#include "runtime/java.hpp"

‎src/hotspot/share/jfr/jni/jfrJavaSupport.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
#include "memory/resourceArea.hpp"
4040
#include "oops/instanceOop.hpp"
4141
#include "oops/klass.inline.hpp"
42-
#include "oops/oop.inline.hpp"
4342
#include "oops/objArrayKlass.hpp"
4443
#include "oops/objArrayOop.inline.hpp"
45-
#include "runtime/handles.inline.hpp"
44+
#include "oops/oop.inline.hpp"
4645
#include "runtime/fieldDescriptor.inline.hpp"
46+
#include "runtime/handles.inline.hpp"
4747
#include "runtime/java.hpp"
4848
#include "runtime/javaCalls.hpp"
4949
#include "runtime/javaThread.hpp"
@@ -52,7 +52,6 @@
5252
#include "runtime/synchronizer.hpp"
5353
#include "runtime/threadSMR.hpp"
5454
#include "utilities/growableArray.hpp"
55-
#include "classfile/vmSymbols.hpp"
5655

5756
#ifdef ASSERT
5857
static void check_java_thread_state(JavaThread* t, JavaThreadState state) {

‎src/hotspot/share/jfr/jni/jfrJniMethod.cpp

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

25+
#include "jfr/instrumentation/jfrEventClassTransformer.hpp"
26+
#include "jfr/instrumentation/jfrJvmtiAgent.hpp"
2527
#include "jfr/jfr.hpp"
2628
#include "jfr/jfrEvents.hpp"
29+
#include "jfr/jni/jfrJavaSupport.hpp"
30+
#include "jfr/jni/jfrJniMethodRegistration.hpp"
31+
#include "jfr/leakprofiler/leakProfiler.hpp"
2732
#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
2833
#include "jfr/periodic/sampling/jfrThreadSampler.hpp"
29-
#include "jfr/recorder/jfrEventSetting.hpp"
30-
#include "jfr/recorder/jfrRecorder.hpp"
3134
#include "jfr/recorder/checkpoint/jfrMetadataEvent.hpp"
3235
#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
36+
#include "jfr/recorder/jfrEventSetting.hpp"
37+
#include "jfr/recorder/jfrRecorder.hpp"
3338
#include "jfr/recorder/repository/jfrChunk.hpp"
34-
#include "jfr/recorder/repository/jfrRepository.hpp"
3539
#include "jfr/recorder/repository/jfrChunkRotation.hpp"
3640
#include "jfr/recorder/repository/jfrChunkWriter.hpp"
3741
#include "jfr/recorder/repository/jfrEmergencyDump.hpp"
42+
#include "jfr/recorder/repository/jfrRepository.hpp"
3843
#include "jfr/recorder/service/jfrEventThrottler.hpp"
3944
#include "jfr/recorder/service/jfrOptionSet.hpp"
4045
#include "jfr/recorder/service/jfrRecorderService.hpp"
4146
#include "jfr/recorder/stacktrace/jfrStackFilter.hpp"
4247
#include "jfr/recorder/stacktrace/jfrStackFilterRegistry.hpp"
4348
#include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
4449
#include "jfr/recorder/stringpool/jfrStringPool.hpp"
45-
#include "jfr/jni/jfrJavaSupport.hpp"
46-
#include "jfr/jni/jfrJniMethodRegistration.hpp"
47-
#include "jfr/instrumentation/jfrEventClassTransformer.hpp"
48-
#include "jfr/instrumentation/jfrJvmtiAgent.hpp"
49-
#include "jfr/leakprofiler/leakProfiler.hpp"
5050
#include "jfr/support/jfrDeprecationManager.hpp"
5151
#include "jfr/support/jfrJdkJfrEvent.hpp"
5252
#include "jfr/support/jfrKlassUnloading.hpp"
5353
#include "jfr/support/methodtracer/jfrMethodTracer.hpp"
5454
#include "jfr/utilities/jfrJavaLog.hpp"
55-
#include "jfr/utilities/jfrTimeConverter.hpp"
5655
#include "jfr/utilities/jfrTime.hpp"
56+
#include "jfr/utilities/jfrTimeConverter.hpp"
5757
#include "jfr/writers/jfrJavaEventWriter.hpp"
5858
#include "jfrfiles/jfrPeriodic.hpp"
5959
#include "jfrfiles/jfrTypes.hpp"
@@ -67,8 +67,8 @@
6767
#include "runtime/os.hpp"
6868
#include "utilities/debug.hpp"
6969
#ifdef LINUX
70-
#include "osContainer_linux.hpp"
7170
#include "os_linux.hpp"
71+
#include "osContainer_linux.hpp"
7272
#endif
7373

7474
#define NO_TRANSITION(result_type, header) extern "C" { result_type JNICALL header {

‎src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "jfr/leakprofiler/chains/bfsClosure.hpp"
2525
#include "jfr/leakprofiler/chains/dfsClosure.hpp"
2626
#include "jfr/leakprofiler/chains/edge.hpp"
27-
#include "jfr/leakprofiler/chains/edgeStore.hpp"
2827
#include "jfr/leakprofiler/chains/edgeQueue.hpp"
28+
#include "jfr/leakprofiler/chains/edgeStore.hpp"
2929
#include "jfr/leakprofiler/chains/jfrbitset.hpp"
3030
#include "jfr/leakprofiler/utilities/granularTimer.hpp"
3131
#include "jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp"

‎src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
2626
#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
2727

28-
#include "memory/allocation.hpp"
2928
#include "jfr/leakprofiler/chains/edge.hpp"
3029
#include "jfr/leakprofiler/utilities/unifiedOopRef.hpp"
30+
#include "memory/allocation.hpp"
3131

3232
class JfrVirtualMemory;
3333

‎src/hotspot/share/jfr/leakprofiler/chains/pathToGcRootsOperation.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,18 @@
2424

2525
#include "gc/shared/collectedHeap.hpp"
2626
#include "gc/shared/gc_globals.hpp"
27-
#include "jfr/leakprofiler/leakProfiler.hpp"
2827
#include "jfr/leakprofiler/chains/bfsClosure.hpp"
2928
#include "jfr/leakprofiler/chains/dfsClosure.hpp"
3029
#include "jfr/leakprofiler/chains/edge.hpp"
3130
#include "jfr/leakprofiler/chains/edgeQueue.hpp"
3231
#include "jfr/leakprofiler/chains/edgeStore.hpp"
3332
#include "jfr/leakprofiler/chains/jfrbitset.hpp"
3433
#include "jfr/leakprofiler/chains/objectSampleMarker.hpp"
35-
#include "jfr/leakprofiler/chains/rootSetClosure.hpp"
36-
#include "jfr/leakprofiler/chains/edgeStore.hpp"
37-
#include "jfr/leakprofiler/chains/objectSampleMarker.hpp"
3834
#include "jfr/leakprofiler/chains/pathToGcRootsOperation.hpp"
35+
#include "jfr/leakprofiler/chains/rootSetClosure.hpp"
3936
#include "jfr/leakprofiler/checkpoint/eventEmitter.hpp"
4037
#include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
38+
#include "jfr/leakprofiler/leakProfiler.hpp"
4139
#include "jfr/leakprofiler/sampling/objectSample.hpp"
4240
#include "jfr/leakprofiler/sampling/objectSampler.hpp"
4341
#include "jfr/leakprofiler/utilities/granularTimer.hpp"

‎src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_EVENTEMITTER_HPP
2626
#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_EVENTEMITTER_HPP
2727

28-
#include "memory/allocation.hpp"
2928
#include "jfr/utilities/jfrTime.hpp"
29+
#include "memory/allocation.hpp"
3030

3131
typedef u8 traceid;
3232

‎src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include "jfr/support/jfrKlassUnloading.hpp"
4040
#include "jfr/support/jfrMethodLookup.hpp"
4141
#include "jfr/utilities/jfrHashtable.hpp"
42-
#include "jfr/utilities/jfrSet.hpp"
4342
#include "jfr/utilities/jfrRelation.hpp"
43+
#include "jfr/utilities/jfrSet.hpp"
4444
#include "memory/resourceArea.inline.hpp"
4545
#include "oops/instanceKlass.inline.hpp"
4646
#include "runtime/interfaceSupport.inline.hpp"

0 commit comments

Comments
 (0)