From 270cf67e5ff19b082f710d52831f436dd144d883 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Wed, 22 Jun 2022 12:49:25 +0000 Subject: [PATCH] 8288752: Split thread implementation files Reviewed-by: dholmes, rehn, iklam --- .../gc/g1/g1BarrierSetAssembler_aarch64.cpp | 2 +- .../gc/shared/barrierSetAssembler_aarch64.cpp | 2 +- .../gc/shared/barrierSetNMethod_aarch64.cpp | 2 +- .../shenandoahBarrierSetAssembler_aarch64.cpp | 2 +- .../cpu/aarch64/interp_masm_aarch64.cpp | 2 +- .../cpu/aarch64/jniFastGetField_aarch64.cpp | 1 + .../cpu/aarch64/macroAssembler_aarch64.cpp | 2 +- .../cpu/aarch64/stubGenerator_aarch64.cpp | 2 +- .../cpu/aarch64/stubRoutines_aarch64.cpp | 2 +- .../arm/gc/g1/g1BarrierSetAssembler_arm.cpp | 2 +- .../arm/gc/shared/barrierSetAssembler_arm.cpp | 2 +- src/hotspot/cpu/arm/nativeInst_arm_32.hpp | 2 +- .../shenandoahBarrierSetAssembler_ppc.cpp | 2 +- src/hotspot/cpu/ppc/stubGenerator_ppc.cpp | 2 +- .../gc/g1/g1BarrierSetAssembler_riscv.cpp | 2 +- .../gc/shared/barrierSetAssembler_riscv.cpp | 2 +- .../gc/shared/barrierSetNMethod_riscv.cpp | 2 +- .../shenandoahBarrierSetAssembler_riscv.cpp | 2 +- src/hotspot/cpu/riscv/interp_masm_riscv.cpp | 2 +- .../cpu/riscv/macroAssembler_riscv.cpp | 2 +- src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 2 +- src/hotspot/cpu/riscv/stubRoutines_riscv.cpp | 2 +- src/hotspot/cpu/s390/interp_masm_s390.cpp | 2 +- .../cpu/s390/macroAssembler_s390.inline.hpp | 2 +- src/hotspot/cpu/s390/stubGenerator_s390.cpp | 2 +- src/hotspot/cpu/s390/stubRoutines_s390.cpp | 2 +- .../x86/gc/shared/barrierSetAssembler_x86.cpp | 2 +- .../x86/gc/shared/barrierSetNMethod_x86.cpp | 2 +- .../shenandoahBarrierSetAssembler_x86.cpp | 2 +- src/hotspot/cpu/x86/interp_masm_x86.cpp | 2 +- src/hotspot/cpu/x86/macroAssembler_x86.cpp | 2 +- src/hotspot/cpu/x86/rdtsc_x86.cpp | 2 +- src/hotspot/cpu/x86/stubGenerator_x86_32.cpp | 2 +- src/hotspot/cpu/x86/stubGenerator_x86_64.cpp | 2 +- src/hotspot/cpu/x86/stubRoutines_x86.cpp | 2 +- src/hotspot/cpu/x86/stubRoutines_x86_32.cpp | 2 +- src/hotspot/cpu/x86/stubRoutines_x86_64.cpp | 2 +- .../cpu/zero/interpreterFrame_zero.hpp | 2 +- src/hotspot/cpu/zero/stack_zero.cpp | 3 +- src/hotspot/cpu/zero/stack_zero.inline.hpp | 2 +- src/hotspot/cpu/zero/stubGenerator_zero.cpp | 2 +- src/hotspot/cpu/zero/stubRoutines_zero.cpp | 2 +- src/hotspot/os/aix/os_aix.cpp | 3 +- src/hotspot/os/aix/porting_aix.cpp | 2 +- src/hotspot/os/bsd/os_bsd.cpp | 3 +- src/hotspot/os/linux/os_linux.cpp | 3 +- src/hotspot/os/posix/signals_posix.cpp | 2 +- src/hotspot/os/posix/threadCritical_posix.cpp | 2 +- src/hotspot/os/posix/vmError_posix.cpp | 2 +- src/hotspot/os/windows/os_windows.cpp | 3 +- src/hotspot/os/windows/os_windows.inline.hpp | 2 +- .../os/windows/threadCritical_windows.cpp | 2 +- src/hotspot/os/windows/vmError_windows.cpp | 2 +- ...ead_aix_ppc.cpp => javaThread_aix_ppc.cpp} | 2 +- ...ead_aix_ppc.hpp => javaThread_aix_ppc.hpp} | 6 +- src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp | 2 +- ...aarch64.cpp => javaThread_bsd_aarch64.cpp} | 2 +- ...aarch64.hpp => javaThread_bsd_aarch64.hpp} | 6 +- .../os_cpu/bsd_aarch64/os_bsd_aarch64.cpp | 2 +- ...ead_bsd_x86.cpp => javaThread_bsd_x86.cpp} | 2 +- ...ead_bsd_x86.hpp => javaThread_bsd_x86.hpp} | 6 +- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp | 2 +- ...d_bsd_zero.cpp => javaThread_bsd_zero.cpp} | 2 +- ...d_bsd_zero.hpp => javaThread_bsd_zero.hpp} | 6 +- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp | 2 +- ...rch64.cpp => javaThread_linux_aarch64.cpp} | 2 +- ...rch64.hpp => javaThread_linux_aarch64.hpp} | 6 +- .../os_cpu/linux_aarch64/os_linux_aarch64.cpp | 2 +- ...linux_arm.cpp => javaThread_linux_arm.cpp} | 0 ...linux_arm.hpp => javaThread_linux_arm.hpp} | 6 +- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 1 + ...linux_ppc.cpp => javaThread_linux_ppc.cpp} | 2 +- ...linux_ppc.hpp => javaThread_linux_ppc.hpp} | 6 +- src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp | 2 +- ...x_riscv.cpp => javaThread_linux_riscv.cpp} | 2 +- ...x_riscv.hpp => javaThread_linux_riscv.hpp} | 6 +- .../os_cpu/linux_riscv/os_linux_riscv.cpp | 2 +- ...nux_s390.cpp => javaThread_linux_s390.cpp} | 2 +- ...nux_s390.hpp => javaThread_linux_s390.hpp} | 6 +- .../os_cpu/linux_s390/os_linux_s390.cpp | 2 +- ...linux_x86.cpp => javaThread_linux_x86.cpp} | 2 +- ...linux_x86.hpp => javaThread_linux_x86.hpp} | 6 +- src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp | 2 +- ...nux_zero.cpp => javaThread_linux_zero.cpp} | 2 +- ...nux_zero.hpp => javaThread_linux_zero.hpp} | 6 +- .../os_cpu/linux_zero/os_linux_zero.cpp | 2 +- ...h64.cpp => javaThread_windows_aarch64.cpp} | 2 +- ...h64.hpp => javaThread_windows_aarch64.hpp} | 6 +- .../windows_aarch64/os_windows_aarch64.cpp | 2 +- ...ows_x86.cpp => javaThread_windows_x86.cpp} | 2 +- ...ows_x86.hpp => javaThread_windows_x86.hpp} | 6 +- .../os_cpu/windows_x86/os_windows_x86.cpp | 2 +- src/hotspot/share/asm/assembler.cpp | 2 +- src/hotspot/share/cds/archiveBuilder.cpp | 2 +- src/hotspot/share/cds/cdsProtectionDomain.hpp | 2 +- src/hotspot/share/cds/classListWriter.hpp | 2 +- src/hotspot/share/ci/ciEnv.cpp | 4 +- src/hotspot/share/ci/ciEnv.hpp | 2 +- src/hotspot/share/ci/ciReplay.cpp | 3 +- .../share/classfile/defaultMethods.cpp | 2 +- src/hotspot/share/classfile/javaClasses.cpp | 2 +- .../share/classfile/metadataOnStackMark.cpp | 2 +- src/hotspot/share/classfile/placeholders.cpp | 2 +- src/hotspot/share/classfile/verifier.cpp | 2 +- src/hotspot/share/code/debugInfo.cpp | 2 +- src/hotspot/share/code/debugInfo.hpp | 2 +- src/hotspot/share/code/dependencies.cpp | 2 +- src/hotspot/share/code/dependencyContext.cpp | 1 + src/hotspot/share/code/icBuffer.cpp | 2 +- src/hotspot/share/compiler/compileBroker.cpp | 1 + src/hotspot/share/compiler/compileTask.cpp | 3 +- src/hotspot/share/compiler/compilerEvent.cpp | 2 +- src/hotspot/share/compiler/compilerThread.cpp | 2 +- src/hotspot/share/compiler/compilerThread.hpp | 2 +- .../share/gc/epsilon/epsilonBarrierSet.cpp | 2 +- .../gc/epsilon/epsilonThreadLocalData.hpp | 2 +- src/hotspot/share/gc/g1/g1Allocator.cpp | 3 +- src/hotspot/share/gc/g1/g1BarrierSet.cpp | 2 +- src/hotspot/share/gc/g1/g1CollectedHeap.hpp | 1 + src/hotspot/share/gc/g1/g1ConcurrentMark.cpp | 1 + .../share/gc/g1/g1ConcurrentRefine.cpp | 2 +- .../share/gc/g1/g1ConcurrentRefineThread.cpp | 3 +- src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp | 3 +- src/hotspot/share/gc/g1/g1HotCardCache.hpp | 2 +- .../share/gc/g1/g1MonitoringSupport.cpp | 1 + src/hotspot/share/gc/g1/g1RemSetSummary.cpp | 2 +- src/hotspot/share/gc/g1/g1RootProcessor.cpp | 1 + src/hotspot/share/gc/g1/g1ThreadLocalData.hpp | 2 +- src/hotspot/share/gc/g1/g1YoungCollector.cpp | 1 + src/hotspot/share/gc/g1/heapRegionManager.cpp | 1 + src/hotspot/share/gc/g1/heapRegionRemSet.cpp | 1 + .../share/gc/parallel/mutableNUMASpace.cpp | 2 +- .../share/gc/parallel/mutableSpace.cpp | 2 +- src/hotspot/share/gc/parallel/psOldGen.hpp | 1 + .../share/gc/parallel/psParallelCompact.cpp | 1 + src/hotspot/share/gc/parallel/psScavenge.cpp | 1 + .../share/gc/serial/defNewGeneration.cpp | 3 +- src/hotspot/share/gc/serial/genMarkSweep.cpp | 2 +- src/hotspot/share/gc/shared/barrierSet.cpp | 2 +- .../share/gc/shared/barrierSetNMethod.cpp | 3 +- .../share/gc/shared/cardTableBarrierSet.cpp | 2 +- src/hotspot/share/gc/shared/collectedHeap.cpp | 2 +- src/hotspot/share/gc/shared/collectedHeap.hpp | 1 + .../gc/shared/concurrentGCBreakpoints.cpp | 2 +- .../share/gc/shared/concurrentGCThread.hpp | 2 +- .../share/gc/shared/copyFailedInfo.hpp | 2 +- src/hotspot/share/gc/shared/gcId.cpp | 2 +- src/hotspot/share/gc/shared/gcLocker.cpp | 2 +- .../share/gc/shared/gcLocker.inline.hpp | 2 +- .../share/gc/shared/gcVMOperations.cpp | 3 +- .../share/gc/shared/genCollectedHeap.cpp | 1 + .../share/gc/shared/jvmFlagConstraintsGC.cpp | 2 +- src/hotspot/share/gc/shared/memAllocator.cpp | 2 +- src/hotspot/share/gc/shared/memAllocator.hpp | 2 +- src/hotspot/share/gc/shared/oopStorage.cpp | 2 +- src/hotspot/share/gc/shared/satbMarkQueue.cpp | 2 +- src/hotspot/share/gc/shared/space.hpp | 1 + .../gc/shared/stringdedup/stringDedup.cpp | 2 +- .../stringdedup/stringDedupStorageUse.cpp | 2 +- .../share/gc/shared/strongRootsScope.cpp | 2 +- .../share/gc/shared/suspendibleThreadSet.cpp | 2 +- .../share/gc/shared/taskTerminator.cpp | 2 +- src/hotspot/share/gc/shared/taskqueue.cpp | 2 +- .../gc/shared/threadLocalAllocBuffer.cpp | 2 +- .../shared/threadLocalAllocBuffer.inline.hpp | 2 +- src/hotspot/share/gc/shared/workerThread.cpp | 3 +- .../shenandoah/shenandoahClosures.inline.hpp | 2 +- .../shenandoah/shenandoahConcurrentMark.cpp | 1 + .../shenandoah/shenandoahEvacOOMHandler.cpp | 2 +- .../shenandoah/shenandoahEvacOOMHandler.hpp | 2 +- .../shenandoahForwarding.inline.hpp | 2 +- .../share/gc/shenandoah/shenandoahFullGC.cpp | 2 +- .../gc/shenandoah/shenandoahHeap.inline.hpp | 2 +- .../share/gc/shenandoah/shenandoahLock.cpp | 2 +- .../share/gc/shenandoah/shenandoahLock.hpp | 2 +- .../gc/shenandoah/shenandoahOopClosures.hpp | 2 +- .../shenandoahParallelCleaning.inline.hpp | 2 +- .../gc/shenandoah/shenandoahRootProcessor.cpp | 3 +- .../gc/shenandoah/shenandoahRootVerifier.cpp | 3 +- .../shenandoah/shenandoahSATBMarkQueueSet.hpp | 2 +- .../gc/shenandoah/shenandoahTaskqueue.hpp | 2 +- .../shenandoah/shenandoahThreadLocalData.hpp | 2 +- .../gc/shenandoah/shenandoahVerifier.cpp | 1 + .../gc/shenandoah/shenandoahWorkGroup.cpp | 1 + .../gc/shenandoah/shenandoahWorkerPolicy.cpp | 3 +- src/hotspot/share/gc/z/zBarrierSet.cpp | 2 +- .../share/gc/z/zBarrierSetAssembler.cpp | 2 +- src/hotspot/share/gc/z/zCPU.cpp | 2 +- src/hotspot/share/gc/z/zDriver.cpp | 1 + src/hotspot/share/gc/z/zFuture.inline.hpp | 2 +- src/hotspot/share/gc/z/zHeap.cpp | 2 +- src/hotspot/share/gc/z/zLock.inline.hpp | 2 +- src/hotspot/share/gc/z/zMark.cpp | 3 +- src/hotspot/share/gc/z/zMark.inline.hpp | 2 +- src/hotspot/share/gc/z/zNMethodTable.cpp | 1 + src/hotspot/share/gc/z/zThread.cpp | 2 +- .../share/gc/z/zThreadLocalAllocBuffer.cpp | 2 +- src/hotspot/share/gc/z/zThreadLocalData.hpp | 2 +- src/hotspot/share/gc/z/zVerify.cpp | 2 +- .../share/interpreter/abstractInterpreter.hpp | 2 +- .../share/interpreter/bootstrapInfo.cpp | 2 +- .../share/interpreter/interpreterRuntime.hpp | 2 +- .../share/interpreter/linkResolver.cpp | 2 +- .../jfrEventClassTransformer.cpp | 2 +- .../jfr/instrumentation/jfrJvmtiAgent.cpp | 2 +- .../jfr/instrumentation/jfrResolution.cpp | 2 +- src/hotspot/share/jfr/jni/jfrJavaSupport.cpp | 2 +- src/hotspot/share/jfr/jni/jfrJniMethod.cpp | 2 +- .../jfr/jni/jfrJniMethodRegistration.cpp | 2 +- src/hotspot/share/jfr/jni/jfrUpcalls.cpp | 2 +- .../leakprofiler/chains/rootSetClosure.cpp | 3 +- .../leakprofiler/checkpoint/eventEmitter.cpp | 2 +- .../checkpoint/objectSampleCheckpoint.cpp | 2 +- .../checkpoint/objectSampleDescription.cpp | 2 +- .../share/jfr/leakprofiler/leakProfiler.cpp | 2 +- .../leakprofiler/sampling/objectSampler.cpp | 2 +- .../periodic/jfrFinalizerStatisticsEvent.cpp | 2 +- .../share/jfr/periodic/jfrPeriodic.cpp | 1 + .../jfr/periodic/jfrThreadCPULoadEvent.cpp | 2 +- .../jfr/periodic/sampling/jfrCallTrace.cpp | 2 +- .../periodic/sampling/jfrThreadSampler.cpp | 2 +- .../recorder/checkpoint/jfrMetadataEvent.cpp | 2 +- .../checkpoint/types/jfrThreadState.cpp | 2 +- .../jfr/recorder/checkpoint/types/jfrType.cpp | 2 +- .../checkpoint/types/jfrTypeManager.cpp | 2 +- .../checkpoint/types/traceid/jfrTraceId.cpp | 2 +- .../types/traceid/jfrTraceId.inline.hpp | 2 +- .../types/traceid/jfrTraceIdLoadBarrier.cpp | 2 +- .../traceid/jfrTraceIdLoadBarrier.inline.hpp | 2 +- .../recorder/repository/jfrEmergencyDump.cpp | 2 +- .../jfr/recorder/repository/jfrRepository.cpp | 2 +- .../share/jfr/recorder/service/jfrEvent.hpp | 2 +- .../jfr/recorder/service/jfrOptionSet.cpp | 2 +- .../share/jfr/recorder/service/jfrPostBox.cpp | 2 +- .../recorder/service/jfrRecorderService.cpp | 2 +- .../recorder/service/jfrRecorderThread.cpp | 2 +- .../service/jfrRecorderThreadLoop.cpp | 2 +- .../share/jfr/recorder/storage/jfrBuffer.cpp | 2 +- .../share/jfr/recorder/storage/jfrStorage.cpp | 2 +- .../jfr/recorder/storage/jfrStorageUtils.hpp | 2 +- .../storage/jfrStorageUtils.inline.hpp | 2 +- .../jfr/recorder/stringpool/jfrStringPool.cpp | 2 +- .../share/jfr/support/jfrAllocationTracer.cpp | 2 +- src/hotspot/share/jfr/support/jfrFlush.cpp | 2 +- .../share/jfr/support/jfrJdkJfrEvent.cpp | 2 +- .../share/jfr/support/jfrStackTraceMark.cpp | 2 +- .../share/jfr/support/jfrThreadLocal.cpp | 2 +- .../jfr/utilities/jfrEpochQueue.inline.hpp | 2 +- .../share/jfr/utilities/jfrJavaLog.cpp | 2 +- .../share/jfr/utilities/jfrSpinlockHelper.hpp | 2 +- .../share/jfr/utilities/jfrThreadIterator.cpp | 2 +- .../share/jfr/utilities/jfrThreadIterator.hpp | 2 +- .../share/jfr/writers/jfrJavaEventWriter.cpp | 3 +- src/hotspot/share/jvmci/jvmciEnv.hpp | 2 +- src/hotspot/share/libadt/dict.hpp | 2 +- src/hotspot/share/logging/logDecorations.cpp | 2 +- .../share/logging/logMessageBuffer.cpp | 2 +- src/hotspot/share/memory/resourceArea.cpp | 2 +- src/hotspot/share/memory/resourceArea.hpp | 2 +- src/hotspot/share/memory/universe.cpp | 3 +- src/hotspot/share/oops/accessBackend.cpp | 2 +- src/hotspot/share/oops/constantPool.cpp | 2 +- src/hotspot/share/oops/constantPool.hpp | 2 +- src/hotspot/share/oops/cpCache.cpp | 1 + .../share/oops/fieldStreams.inline.hpp | 2 +- src/hotspot/share/oops/instanceKlass.cpp | 3 +- src/hotspot/share/oops/markWord.cpp | 2 +- src/hotspot/share/oops/oop.cpp | 2 +- src/hotspot/share/oops/oopsHierarchy.cpp | 2 +- src/hotspot/share/precompiled/precompiled.hpp | 2 +- src/hotspot/share/prims/forte.cpp | 2 +- src/hotspot/share/prims/jni.cpp | 1 + src/hotspot/share/prims/jniCheck.cpp | 2 +- src/hotspot/share/prims/jniCheck.hpp | 2 +- src/hotspot/share/prims/jvm.cpp | 2 +- .../share/prims/jvmtiDeferredUpdates.hpp | 5 +- src/hotspot/share/prims/jvmtiEnter.xsl | 2 + src/hotspot/share/prims/jvmtiEnv.cpp | 3 +- src/hotspot/share/prims/jvmtiEnvBase.cpp | 3 +- src/hotspot/share/prims/jvmtiEnvBase.hpp | 3 +- .../share/prims/jvmtiEnvThreadState.cpp | 2 +- .../share/prims/jvmtiEventController.cpp | 3 +- src/hotspot/share/prims/jvmtiExport.cpp | 3 +- .../share/prims/jvmtiGetLoadedClasses.cpp | 2 +- src/hotspot/share/prims/jvmtiImpl.cpp | 2 +- src/hotspot/share/prims/jvmtiRawMonitor.cpp | 3 +- src/hotspot/share/prims/jvmtiTagMap.cpp | 2 +- src/hotspot/share/prims/jvmtiThreadState.hpp | 4 +- .../share/prims/jvmtiThreadState.inline.hpp | 2 +- src/hotspot/share/prims/jvmtiTrace.cpp | 2 +- src/hotspot/share/prims/jvmtiUtil.hpp | 1 + src/hotspot/share/prims/stackwalk.cpp | 2 +- src/hotspot/share/prims/unsafe.cpp | 2 +- src/hotspot/share/prims/whitebox.cpp | 2 +- src/hotspot/share/runtime/continuation.cpp | 1 + .../share/runtime/continuationEntry.cpp | 2 +- .../share/runtime/continuationFreezeThaw.cpp | 1 + .../share/runtime/continuationWrapper.cpp | 2 +- .../runtime/continuationWrapper.inline.hpp | 2 +- src/hotspot/share/runtime/deoptimization.cpp | 2 +- src/hotspot/share/runtime/escapeBarrier.cpp | 1 + src/hotspot/share/runtime/frame.cpp | 2 +- src/hotspot/share/runtime/handles.cpp | 2 +- src/hotspot/share/runtime/handles.inline.hpp | 2 +- src/hotspot/share/runtime/handshake.cpp | 2 +- .../share/runtime/interfaceSupport.cpp | 3 +- .../share/runtime/interfaceSupport.inline.hpp | 3 +- src/hotspot/share/runtime/java.cpp | 3 +- src/hotspot/share/runtime/javaCalls.cpp | 1 + src/hotspot/share/runtime/javaCalls.hpp | 2 +- src/hotspot/share/runtime/javaThread.cpp | 2031 ++++++++++ src/hotspot/share/runtime/javaThread.hpp | 1188 ++++++ .../share/runtime/javaThread.inline.hpp | 242 ++ src/hotspot/share/runtime/jniHandles.cpp | 2 +- .../share/runtime/monitorDeflationThread.hpp | 2 +- src/hotspot/share/runtime/mutex.cpp | 2 +- src/hotspot/share/runtime/mutexLocker.cpp | 2 +- src/hotspot/share/runtime/nonJavaThread.cpp | 3 +- .../share/runtime/notificationThread.hpp | 2 +- src/hotspot/share/runtime/objectMonitor.cpp | 2 +- src/hotspot/share/runtime/orderAccess.cpp | 3 +- src/hotspot/share/runtime/os.cpp | 2 +- src/hotspot/share/runtime/park.cpp | 2 +- src/hotspot/share/runtime/reflection.cpp | 2 +- src/hotspot/share/runtime/safepoint.cpp | 3 +- src/hotspot/share/runtime/safepoint.hpp | 2 +- .../share/runtime/safepointMechanism.cpp | 1 + .../runtime/safepointMechanism.inline.hpp | 1 - .../share/runtime/safepointVerifiers.hpp | 2 +- .../share/runtime/semaphore.inline.hpp | 2 +- src/hotspot/share/runtime/serviceThread.hpp | 2 +- src/hotspot/share/runtime/stackOverflow.cpp | 2 +- src/hotspot/share/runtime/stackWatermark.cpp | 2 +- .../share/runtime/stackWatermark.inline.hpp | 2 +- .../share/runtime/stackWatermarkSet.cpp | 2 +- src/hotspot/share/runtime/sweeper.cpp | 2 +- src/hotspot/share/runtime/synchronizer.cpp | 3 +- src/hotspot/share/runtime/task.cpp | 3 +- src/hotspot/share/runtime/thread.cpp | 3476 +---------------- src/hotspot/share/runtime/thread.hpp | 1272 +----- src/hotspot/share/runtime/thread.inline.hpp | 210 +- src/hotspot/share/runtime/threadSMR.cpp | 2 + src/hotspot/share/runtime/threadSMR.hpp | 2 +- .../share/runtime/threadSMR.inline.hpp | 2 +- src/hotspot/share/runtime/threads.cpp | 1560 ++++++++ src/hotspot/share/runtime/threads.hpp | 150 + src/hotspot/share/runtime/unhandledOops.cpp | 2 +- src/hotspot/share/runtime/vframe.cpp | 2 +- src/hotspot/share/runtime/vframe.hpp | 1 + src/hotspot/share/runtime/vframe.inline.hpp | 2 +- src/hotspot/share/runtime/vmOperations.cpp | 3 +- src/hotspot/share/runtime/vmOperations.hpp | 2 +- src/hotspot/share/runtime/vmStructs.cpp | 2 +- src/hotspot/share/runtime/vmThread.cpp | 2 +- src/hotspot/share/runtime/vmThread.hpp | 2 +- .../share/services/diagnosticArgument.cpp | 2 +- .../share/services/diagnosticArgument.hpp | 2 +- .../share/services/finalizerService.cpp | 2 +- src/hotspot/share/services/heapDumper.cpp | 3 +- .../share/services/heapDumperCompression.cpp | 2 +- src/hotspot/share/services/management.cpp | 1 + src/hotspot/share/services/memBaseline.cpp | 2 +- src/hotspot/share/services/memoryManager.cpp | 3 +- src/hotspot/share/services/memoryPool.cpp | 3 +- src/hotspot/share/services/memoryService.cpp | 3 +- src/hotspot/share/services/threadIdTable.cpp | 2 +- src/hotspot/share/services/threadService.cpp | 3 +- src/hotspot/share/services/threadService.hpp | 2 +- .../utilities/concurrentHashTable.inline.hpp | 1 + src/hotspot/share/utilities/debug.cpp | 3 +- src/hotspot/share/utilities/events.cpp | 2 +- src/hotspot/share/utilities/events.hpp | 2 +- src/hotspot/share/utilities/exceptions.cpp | 2 +- src/hotspot/share/utilities/globalCounter.cpp | 2 +- .../share/utilities/globalCounter.inline.hpp | 2 +- src/hotspot/share/utilities/growableArray.cpp | 2 +- src/hotspot/share/utilities/vmError.cpp | 3 +- src/hotspot/share/utilities/waitBarrier.hpp | 2 +- .../gtest/code/test_dependencyContext.cpp | 1 + test/hotspot/gtest/runtime/test_os.cpp | 1 + test/hotspot/gtest/runtime/test_threads.cpp | 3 +- .../gtest/utilities/test_metaspaceClosure.cpp | 2 +- 382 files changed, 5636 insertions(+), 5306 deletions(-) rename src/hotspot/os_cpu/aix_ppc/{thread_aix_ppc.cpp => javaThread_aix_ppc.cpp} (99%) rename src/hotspot/os_cpu/aix_ppc/{thread_aix_ppc.hpp => javaThread_aix_ppc.hpp} (91%) rename src/hotspot/os_cpu/bsd_aarch64/{thread_bsd_aarch64.cpp => javaThread_bsd_aarch64.cpp} (98%) rename src/hotspot/os_cpu/bsd_aarch64/{thread_bsd_aarch64.hpp => javaThread_bsd_aarch64.hpp} (91%) rename src/hotspot/os_cpu/bsd_x86/{thread_bsd_x86.cpp => javaThread_bsd_x86.cpp} (98%) rename src/hotspot/os_cpu/bsd_x86/{thread_bsd_x86.hpp => javaThread_bsd_x86.hpp} (91%) rename src/hotspot/os_cpu/bsd_zero/{thread_bsd_zero.cpp => javaThread_bsd_zero.cpp} (97%) rename src/hotspot/os_cpu/bsd_zero/{thread_bsd_zero.hpp => javaThread_bsd_zero.hpp} (95%) rename src/hotspot/os_cpu/linux_aarch64/{thread_linux_aarch64.cpp => javaThread_linux_aarch64.cpp} (98%) rename src/hotspot/os_cpu/linux_aarch64/{thread_linux_aarch64.hpp => javaThread_linux_aarch64.hpp} (90%) rename src/hotspot/os_cpu/linux_arm/{thread_linux_arm.cpp => javaThread_linux_arm.cpp} (100%) rename src/hotspot/os_cpu/linux_arm/{thread_linux_arm.hpp => javaThread_linux_arm.hpp} (94%) rename src/hotspot/os_cpu/linux_ppc/{thread_linux_ppc.cpp => javaThread_linux_ppc.cpp} (99%) rename src/hotspot/os_cpu/linux_ppc/{thread_linux_ppc.hpp => javaThread_linux_ppc.hpp} (90%) rename src/hotspot/os_cpu/linux_riscv/{thread_linux_riscv.cpp => javaThread_linux_riscv.cpp} (98%) rename src/hotspot/os_cpu/linux_riscv/{thread_linux_riscv.hpp => javaThread_linux_riscv.hpp} (90%) rename src/hotspot/os_cpu/linux_s390/{thread_linux_s390.cpp => javaThread_linux_s390.cpp} (99%) rename src/hotspot/os_cpu/linux_s390/{thread_linux_s390.hpp => javaThread_linux_s390.hpp} (90%) rename src/hotspot/os_cpu/linux_x86/{thread_linux_x86.cpp => javaThread_linux_x86.cpp} (98%) rename src/hotspot/os_cpu/linux_x86/{thread_linux_x86.hpp => javaThread_linux_x86.hpp} (91%) rename src/hotspot/os_cpu/linux_zero/{thread_linux_zero.cpp => javaThread_linux_zero.cpp} (98%) rename src/hotspot/os_cpu/linux_zero/{thread_linux_zero.hpp => javaThread_linux_zero.hpp} (95%) rename src/hotspot/os_cpu/windows_aarch64/{thread_windows_aarch64.cpp => javaThread_windows_aarch64.cpp} (98%) rename src/hotspot/os_cpu/windows_aarch64/{thread_windows_aarch64.hpp => javaThread_windows_aarch64.hpp} (89%) rename src/hotspot/os_cpu/windows_x86/{thread_windows_x86.cpp => javaThread_windows_x86.cpp} (98%) rename src/hotspot/os_cpu/windows_x86/{thread_windows_x86.hpp => javaThread_windows_x86.hpp} (92%) create mode 100644 src/hotspot/share/runtime/javaThread.cpp create mode 100644 src/hotspot/share/runtime/javaThread.hpp create mode 100644 src/hotspot/share/runtime/javaThread.inline.hpp create mode 100644 src/hotspot/share/runtime/threads.cpp create mode 100644 src/hotspot/share/runtime/threads.hpp diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp index 0ee16ff1896..44150205c24 100644 --- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp @@ -31,8 +31,8 @@ #include "gc/g1/g1ThreadLocalData.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/shared/collectedHeap.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #include "interpreter/interp_masm.hpp" #include "runtime/sharedRuntime.hpp" #ifdef COMPILER1 diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp index 386c5879f89..28b1dcde30e 100644 --- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp @@ -30,10 +30,10 @@ #include "gc/shared/collectedHeap.hpp" #include "interpreter/interp_masm.hpp" #include "memory/universe.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.hpp" #define __ masm-> diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp index e9bc3d85df6..fd25dcf3ace 100644 --- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp @@ -31,9 +31,9 @@ #include "logging/log.hpp" #include "memory/resourceArea.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/registerMap.hpp" -#include "runtime/thread.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp index 0c0bf4dfda0..86640896d20 100644 --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp @@ -33,8 +33,8 @@ #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/interp_masm.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #ifdef COMPILER1 #include "c1/c1_LIRAssembler.hpp" #include "c1/c1_MacroAssembler.hpp" diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp index 40d427d8176..340799cc8c3 100644 --- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp @@ -40,9 +40,9 @@ #include "prims/jvmtiThreadState.hpp" #include "runtime/basicLock.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/powerOfTwo.hpp" void InterpreterMacroAssembler::narrow(Register result) { diff --git a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp index 35b0ea96672..03cfafea143 100644 --- a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp @@ -31,6 +31,7 @@ #include "prims/jniFastGetField.hpp" #include "prims/jvm_misc.hpp" #include "prims/jvmtiExport.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/safepoint.hpp" #include "runtime/threadWXSetters.inline.hpp" diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp index 39c5c3af1bc..0d1e7e6dce7 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp @@ -50,10 +50,10 @@ #include "runtime/continuation.hpp" #include "runtime/icache.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.hpp" #include "utilities/powerOfTwo.hpp" #ifdef COMPILER1 #include "c1/c1_LIRAssembler.hpp" diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp index 5846a5025dc..a1deff3212d 100644 --- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp @@ -46,10 +46,10 @@ #include "runtime/continuationEntry.inline.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/align.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp index 76b2f28cbc6..5cef1e0ec70 100644 --- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp @@ -26,8 +26,8 @@ #include "precompiled.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/globalDefinitions.hpp" // Implementation of the platform-specific part of StubRoutines - for diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp index 765b05e779b..7eca3a025bc 100644 --- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp +++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp @@ -32,8 +32,8 @@ #include "gc/g1/g1ThreadLocalData.hpp" #include "gc/g1/heapRegion.hpp" #include "interpreter/interp_masm.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #include "utilities/macros.hpp" #ifdef COMPILER1 #include "c1/c1_LIRAssembler.hpp" diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp index e2ffb6c3670..1702c188b98 100644 --- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp +++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp @@ -26,7 +26,7 @@ #include "gc/shared/barrierSetAssembler.hpp" #include "gc/shared/collectedHeap.hpp" #include "memory/universe.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #define __ masm-> diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp index 82273e87d88..572cb0f0cc4 100644 --- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp +++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp @@ -28,9 +28,9 @@ #include "asm/macroAssembler.hpp" #include "code/codeCache.hpp" #include "runtime/icache.hpp" +#include "runtime/javaThread.hpp" #include "runtime/orderAccess.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" #include "register_arm.hpp" // ------------------------------------------------------------------- diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp index 8c9955078ff..3564d1dc3d4 100644 --- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp @@ -38,8 +38,8 @@ #include "gc/shenandoah/shenandoahThreadLocalData.hpp" #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp" #include "interpreter/interpreter.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #include "utilities/globalDefinitions.hpp" #include "vm_version_ppc.hpp" diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp index 176eecf807a..ca101c4bcf5 100644 --- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp +++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp @@ -38,10 +38,10 @@ #include "prims/methodHandles.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vm_version.hpp" #include "utilities/align.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp index 1c46b3947d3..b5681e9c2d0 100644 --- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp @@ -33,8 +33,8 @@ #include "gc/g1/heapRegion.hpp" #include "gc/shared/collectedHeap.hpp" #include "interpreter/interp_masm.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #ifdef COMPILER1 #include "c1/c1_LIRAssembler.hpp" #include "c1/c1_MacroAssembler.hpp" diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp index 3c115a2ea02..4d342ec2a0a 100644 --- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp @@ -31,10 +31,10 @@ #include "gc/shared/collectedHeap.hpp" #include "interpreter/interp_masm.hpp" #include "memory/universe.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.hpp" #define __ masm-> diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp index 1f6c6a884e2..0be482010fa 100644 --- a/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp +++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp @@ -30,9 +30,9 @@ #include "logging/log.hpp" #include "memory/resourceArea.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/registerMap.hpp" -#include "runtime/thread.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp index ed6fcb7b807..d22a9141af7 100644 --- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp @@ -34,8 +34,8 @@ #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/interp_masm.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #ifdef COMPILER1 #include "c1/c1_LIRAssembler.hpp" #include "c1/c1_MacroAssembler.hpp" diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp index d2dcc178ba1..9bbed018554 100644 --- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp +++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp @@ -40,9 +40,9 @@ #include "prims/jvmtiThreadState.hpp" #include "runtime/basicLock.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/powerOfTwo.hpp" void InterpreterMacroAssembler::narrow(Register result) { diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp index 1d10dd672f0..0daf2ec2fe7 100644 --- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp @@ -42,10 +42,10 @@ #include "oops/klass.inline.hpp" #include "oops/oop.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.hpp" #include "utilities/powerOfTwo.hpp" #ifdef COMPILER2 #include "opto/compile.hpp" diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp index aa1dd2d125a..aee4617298e 100644 --- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp +++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp @@ -40,10 +40,10 @@ #include "prims/methodHandles.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/align.hpp" #include "utilities/powerOfTwo.hpp" #ifdef COMPILER2 diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp index 395a2d338e4..f4e37f3a8f2 100644 --- a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp +++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp @@ -27,8 +27,8 @@ #include "precompiled.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/globalDefinitions.hpp" // Implementation of the platform-specific part of StubRoutines - for diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp index 9c184d9f264..5833e54a179 100644 --- a/src/hotspot/cpu/s390/interp_masm_s390.cpp +++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp @@ -39,9 +39,9 @@ #include "prims/jvmtiThreadState.hpp" #include "runtime/basicLock.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp index 889820ef500..eb58ffc2f54 100644 --- a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp +++ b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp @@ -30,7 +30,7 @@ #include "asm/macroAssembler.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" // Simplified shift operations for single register operands, constant shift amount. inline void MacroAssembler::lshift(Register r, int places, bool is_DW) { diff --git a/src/hotspot/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp index fbe8e0c09b4..914030e52cc 100644 --- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp +++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp @@ -38,10 +38,10 @@ #include "prims/methodHandles.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/formatBuffer.hpp" #include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/cpu/s390/stubRoutines_s390.cpp b/src/hotspot/cpu/s390/stubRoutines_s390.cpp index 55aa6d232fd..9c7bf649180 100644 --- a/src/hotspot/cpu/s390/stubRoutines_s390.cpp +++ b/src/hotspot/cpu/s390/stubRoutines_s390.cpp @@ -27,8 +27,8 @@ #include "asm/macroAssembler.inline.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp index 930926bbb17..e1a2f5ec271 100644 --- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp @@ -30,10 +30,10 @@ #include "gc/shared/collectedHeap.hpp" #include "interpreter/interp_masm.hpp" #include "memory/universe.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.hpp" #define __ masm-> diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetNMethod_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetNMethod_x86.cpp index b1b381afe5f..5e5ab9e81fd 100644 --- a/src/hotspot/cpu/x86/gc/shared/barrierSetNMethod_x86.cpp +++ b/src/hotspot/cpu/x86/gc/shared/barrierSetNMethod_x86.cpp @@ -28,8 +28,8 @@ #include "gc/shared/barrierSetNMethod.hpp" #include "logging/log.hpp" #include "memory/resourceArea.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp index d213e6fda39..89e8feac1da 100644 --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp @@ -32,8 +32,8 @@ #include "gc/shenandoah/shenandoahThreadLocalData.hpp" #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp" #include "interpreter/interpreter.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #include "utilities/macros.hpp" #ifdef COMPILER1 #include "c1/c1_LIRAssembler.hpp" diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp index 2c0546aa211..f971142ee58 100644 --- a/src/hotspot/cpu/x86/interp_masm_x86.cpp +++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp @@ -36,9 +36,9 @@ #include "prims/jvmtiThreadState.hpp" #include "runtime/basicLock.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/powerOfTwo.hpp" // Implementation of InterpreterMacroAssembler diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp index 35a41a803ae..1d74c3376c6 100644 --- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp @@ -43,6 +43,7 @@ #include "runtime/continuation.hpp" #include "runtime/flags/flagSetting.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.hpp" #include "runtime/objectMonitor.hpp" #include "runtime/os.hpp" @@ -50,7 +51,6 @@ #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.hpp" #include "utilities/macros.hpp" #include "crc32c.h" diff --git a/src/hotspot/cpu/x86/rdtsc_x86.cpp b/src/hotspot/cpu/x86/rdtsc_x86.cpp index c6109ccdefe..120ca8124c1 100644 --- a/src/hotspot/cpu/x86/rdtsc_x86.cpp +++ b/src/hotspot/cpu/x86/rdtsc_x86.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "rdtsc_x86.hpp" #include "runtime/globals_extension.hpp" +#include "runtime/javaThread.hpp" #include "runtime/orderAccess.hpp" -#include "runtime/thread.inline.hpp" #include "vm_version_x86.hpp" // The following header contains the implementations of rdtsc() diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp index b551c38fa2d..cba9e275492 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp @@ -39,10 +39,10 @@ #include "prims/methodHandles.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #ifdef COMPILER2 #include "opto/runtime.hpp" #endif diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp index e0259f2a8a5..68a980e0d25 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp @@ -45,10 +45,10 @@ #include "runtime/continuationEntry.inline.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #ifdef COMPILER2 #include "opto/runtime.hpp" #endif diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.cpp b/src/hotspot/cpu/x86/stubRoutines_x86.cpp index 95384c82a07..e438d369991 100644 --- a/src/hotspot/cpu/x86/stubRoutines_x86.cpp +++ b/src/hotspot/cpu/x86/stubRoutines_x86.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/globalDefinitions.hpp" #include "crc32c.h" diff --git a/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp b/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp index 0ff782f94e5..3df12a7dd2b 100644 --- a/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp +++ b/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. diff --git a/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp b/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp index 851be5a0549..1363955fa36 100644 --- a/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp +++ b/src/hotspot/cpu/x86/stubRoutines_x86_64.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. diff --git a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp index a8066080d54..2c17f137c23 100644 --- a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp +++ b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp @@ -28,7 +28,7 @@ #include "interpreter/zero/bytecodeInterpreter.hpp" #include "oops/method.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "stack_zero.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/cpu/zero/stack_zero.cpp b/src/hotspot/cpu/zero/stack_zero.cpp index 1f50d37f0e0..a16ab38e6f7 100644 --- a/src/hotspot/cpu/zero/stack_zero.cpp +++ b/src/hotspot/cpu/zero/stack_zero.cpp @@ -26,10 +26,11 @@ #include "precompiled.hpp" #include "interpreter/interpreterRuntime.hpp" #include "interpreter/zero/bytecodeInterpreter.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "stack_zero.hpp" #include "stack_zero.inline.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "utilities/align.hpp" // Inlined causes circular inclusion with thread.hpp diff --git a/src/hotspot/cpu/zero/stack_zero.inline.hpp b/src/hotspot/cpu/zero/stack_zero.inline.hpp index f363de57180..09e30435a5f 100644 --- a/src/hotspot/cpu/zero/stack_zero.inline.hpp +++ b/src/hotspot/cpu/zero/stack_zero.inline.hpp @@ -26,7 +26,7 @@ #ifndef CPU_ZERO_STACK_ZERO_INLINE_HPP #define CPU_ZERO_STACK_ZERO_INLINE_HPP -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "stack_zero.hpp" inline void ZeroStack::overflow_check(int required_words, TRAPS) { diff --git a/src/hotspot/cpu/zero/stubGenerator_zero.cpp b/src/hotspot/cpu/zero/stubGenerator_zero.cpp index 4c7844deb87..80e55d9c8e4 100644 --- a/src/hotspot/cpu/zero/stubGenerator_zero.cpp +++ b/src/hotspot/cpu/zero/stubGenerator_zero.cpp @@ -34,10 +34,10 @@ #include "prims/methodHandles.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "stack_zero.inline.hpp" #ifdef COMPILER2 #include "opto/runtime.hpp" diff --git a/src/hotspot/cpu/zero/stubRoutines_zero.cpp b/src/hotspot/cpu/zero/stubRoutines_zero.cpp index 98bd6c2a76a..0a9e3558711 100644 --- a/src/hotspot/cpu/zero/stubRoutines_zero.cpp +++ b/src/hotspot/cpu/zero/stubRoutines_zero.cpp @@ -26,5 +26,5 @@ #include "precompiled.hpp" #include "runtime/deoptimization.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp index 3f0d9710ee1..743710f5a97 100644 --- a/src/hotspot/os/aix/os_aix.cpp +++ b/src/hotspot/os/aix/os_aix.cpp @@ -56,6 +56,7 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/objectMonitor.hpp" #include "runtime/os.hpp" @@ -64,8 +65,8 @@ #include "runtime/safefetch.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/statSampler.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadCritical.hpp" +#include "runtime/threads.hpp" #include "runtime/timer.hpp" #include "runtime/vm_version.hpp" #include "services/attachListener.hpp" diff --git a/src/hotspot/os/aix/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp index e05a174d56e..9748963c5e7 100644 --- a/src/hotspot/os/aix/porting_aix.cpp +++ b/src/hotspot/os/aix/porting_aix.cpp @@ -29,8 +29,8 @@ #include "memory/allocation.inline.hpp" #include "misc_aix.hpp" #include "porting_aix.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp index a838d7cdb79..dea59fdd3ae 100644 --- a/src/hotspot/os/bsd/os_bsd.cpp +++ b/src/hotspot/os/bsd/os_bsd.cpp @@ -47,6 +47,7 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/objectMonitor.hpp" #include "runtime/osThread.hpp" @@ -55,8 +56,8 @@ #include "runtime/sharedRuntime.hpp" #include "runtime/statSampler.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadCritical.hpp" +#include "runtime/threads.hpp" #include "runtime/timer.hpp" #include "services/attachListener.hpp" #include "services/memTracker.hpp" diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp index bddfb861fa8..322c20f99c1 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -50,6 +50,7 @@ #include "runtime/init.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/objectMonitor.hpp" #include "runtime/osThread.hpp" @@ -57,8 +58,8 @@ #include "runtime/sharedRuntime.hpp" #include "runtime/statSampler.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadCritical.hpp" +#include "runtime/threads.hpp" #include "runtime/threadSMR.hpp" #include "runtime/timer.hpp" #include "runtime/vm_version.hpp" diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp index 79f2f8f3f83..33a6a7c8dbd 100644 --- a/src/hotspot/os/posix/signals_posix.cpp +++ b/src/hotspot/os/posix/signals_posix.cpp @@ -33,11 +33,11 @@ #include "runtime/globals.hpp" #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" #include "runtime/osThread.hpp" #include "runtime/safefetch.hpp" #include "runtime/semaphore.inline.hpp" -#include "runtime/thread.hpp" #include "signals_posix.hpp" #include "utilities/events.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/os/posix/threadCritical_posix.cpp b/src/hotspot/os/posix/threadCritical_posix.cpp index ee57352cb0c..45eba4c1585 100644 --- a/src/hotspot/os/posix/threadCritical_posix.cpp +++ b/src/hotspot/os/posix/threadCritical_posix.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/threadCritical.hpp" // put OS-includes here diff --git a/src/hotspot/os/posix/vmError_posix.cpp b/src/hotspot/os/posix/vmError_posix.cpp index 6d35dcde3b6..de325b29b09 100644 --- a/src/hotspot/os/posix/vmError_posix.cpp +++ b/src/hotspot/os/posix/vmError_posix.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "cds/metaspaceShared.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" #include "runtime/safefetch.hpp" -#include "runtime/thread.hpp" #include "signals_posix.hpp" #include "utilities/debug.hpp" #include "utilities/vmError.hpp" diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp index 2e41281113a..0f59aef82b7 100644 --- a/src/hotspot/os/windows/os_windows.cpp +++ b/src/hotspot/os/windows/os_windows.cpp @@ -50,6 +50,7 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/objectMonitor.hpp" #include "runtime/orderAccess.hpp" @@ -61,7 +62,7 @@ #include "runtime/sharedRuntime.hpp" #include "runtime/statSampler.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/threads.hpp" #include "runtime/threadCritical.hpp" #include "runtime/timer.hpp" #include "runtime/vm_version.hpp" diff --git a/src/hotspot/os/windows/os_windows.inline.hpp b/src/hotspot/os/windows/os_windows.inline.hpp index 8dab6f44180..e7d7ea6f7aa 100644 --- a/src/hotspot/os/windows/os_windows.inline.hpp +++ b/src/hotspot/os/windows/os_windows.inline.hpp @@ -27,8 +27,8 @@ // os_windows.hpp included by os.hpp +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" inline bool os::uses_stack_guard_pages() { return true; diff --git a/src/hotspot/os/windows/threadCritical_windows.cpp b/src/hotspot/os/windows/threadCritical_windows.cpp index b433309e359..105e0beb199 100644 --- a/src/hotspot/os/windows/threadCritical_windows.cpp +++ b/src/hotspot/os/windows/threadCritical_windows.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "runtime/atomic.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/threadCritical.hpp" // OS-includes here diff --git a/src/hotspot/os/windows/vmError_windows.cpp b/src/hotspot/os/windows/vmError_windows.cpp index 853a148d9b1..89f1e90ebd6 100644 --- a/src/hotspot/os/windows/vmError_windows.cpp +++ b/src/hotspot/os/windows/vmError_windows.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" #include "cds/metaspaceShared.hpp" #include "runtime/arguments.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" #include "utilities/vmError.hpp" LONG WINAPI crash_handler(struct _EXCEPTION_POINTERS* exceptionInfo) { diff --git a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp similarity index 99% rename from src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp rename to src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp index 63a1c76cb57..07215e4c2fe 100644 --- a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp +++ b/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp @@ -27,7 +27,7 @@ #include "precompiled.hpp" #include "memory/metaspace.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.hpp similarity index 91% rename from src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp rename to src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.hpp index 18056cf5eeb..40a586dc062 100644 --- a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP -#define OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP +#ifndef OS_CPU_AIX_PPC_JAVATHREAD_AIX_PPC_HPP +#define OS_CPU_AIX_PPC_JAVATHREAD_AIX_PPC_HPP private: void pd_initialize() { @@ -41,4 +41,4 @@ bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); -#endif // OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP +#endif // OS_CPU_AIX_PPC_JAVATHREAD_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp index 8e0c841f7d5..8ddd73a68ab 100644 --- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp +++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp @@ -43,12 +43,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/events.hpp" diff --git a/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/javaThread_bsd_aarch64.cpp similarity index 98% rename from src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp rename to src/hotspot/os_cpu/bsd_aarch64/javaThread_bsd_aarch64.cpp index f07f22bc0cd..10352994df6 100644 --- a/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp +++ b/src/hotspot/os_cpu/bsd_aarch64/javaThread_bsd_aarch64.cpp @@ -27,7 +27,7 @@ #include "precompiled.hpp" #include "cds/metaspaceShared.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/javaThread_bsd_aarch64.hpp similarity index 91% rename from src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.hpp rename to src/hotspot/os_cpu/bsd_aarch64/javaThread_bsd_aarch64.hpp index 82138d35847..dc79064bbcf 100644 --- a/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.hpp +++ b/src/hotspot/os_cpu/bsd_aarch64/javaThread_bsd_aarch64.hpp @@ -24,8 +24,8 @@ * */ -#ifndef OS_CPU_BSD_AARCH64_THREAD_BSD_AARCH64_HPP -#define OS_CPU_BSD_AARCH64_THREAD_BSD_AARCH64_HPP +#ifndef OS_CPU_BSD_AARCH64_JAVATHREAD_BSD_AARCH64_HPP +#define OS_CPU_BSD_AARCH64_JAVATHREAD_BSD_AARCH64_HPP private: void pd_initialize() { @@ -52,4 +52,4 @@ public: return Thread::current(); } -#endif // OS_CPU_BSD_AARCH64_THREAD_BSD_AARCH64_HPP +#endif // OS_CPU_BSD_AARCH64_JAVATHREAD_BSD_AARCH64_HPP diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp index 777085275ef..5a149b41243 100644 --- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp +++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp @@ -43,12 +43,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/javaThread_bsd_x86.cpp similarity index 98% rename from src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp rename to src/hotspot/os_cpu/bsd_x86/javaThread_bsd_x86.cpp index 8d580c79b22..90793839fac 100644 --- a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp +++ b/src/hotspot/os_cpu/bsd_x86/javaThread_bsd_x86.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/javaThread_bsd_x86.hpp similarity index 91% rename from src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp rename to src/hotspot/os_cpu/bsd_x86/javaThread_bsd_x86.hpp index 6f4e42e14ff..9dbeba49757 100644 --- a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/javaThread_bsd_x86.hpp @@ -22,8 +22,8 @@ * */ -#ifndef OS_CPU_BSD_X86_THREAD_BSD_X86_HPP -#define OS_CPU_BSD_X86_THREAD_BSD_X86_HPP +#ifndef OS_CPU_BSD_X86_JAVATHREAD_BSD_X86_HPP +#define OS_CPU_BSD_X86_JAVATHREAD_BSD_X86_HPP private: void pd_initialize() { @@ -46,4 +46,4 @@ private: bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava); -#endif // OS_CPU_BSD_X86_THREAD_BSD_X86_HPP +#endif // OS_CPU_BSD_X86_JAVATHREAD_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp index 828295c107d..f7ad9c8782a 100644 --- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp +++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp @@ -40,12 +40,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/javaThread_bsd_zero.cpp similarity index 97% rename from src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.cpp rename to src/hotspot/os_cpu/bsd_zero/javaThread_bsd_zero.cpp index 816ca411430..d09516ff9ea 100644 --- a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.cpp +++ b/src/hotspot/os_cpu/bsd_zero/javaThread_bsd_zero.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/javaThread_bsd_zero.hpp similarity index 95% rename from src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp rename to src/hotspot/os_cpu/bsd_zero/javaThread_bsd_zero.hpp index efbd3d05a3d..08c4389bc58 100644 --- a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/javaThread_bsd_zero.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP +#ifndef OS_CPU_BSD_ZERO_JAVATHREAD_BSD_ZERO_HPP +#define OS_CPU_BSD_ZERO_JAVATHREAD_BSD_ZERO_HPP private: ZeroStack _zero_stack; @@ -101,4 +101,4 @@ return false; } -#endif // OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP +#endif // OS_CPU_BSD_ZERO_JAVATHREAD_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp index af6ffc7172b..55a8211d801 100644 --- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp +++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp @@ -45,11 +45,11 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/events.hpp" diff --git a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.cpp similarity index 98% rename from src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp rename to src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.cpp index f584da5814a..4523582e6ec 100644 --- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp +++ b/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp similarity index 90% rename from src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp rename to src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp index 5a1f273c548..c6e012ecfdd 100644 --- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP +#ifndef OS_CPU_LINUX_AARCH64_JAVATHREAD_LINUX_AARCH64_HPP +#define OS_CPU_LINUX_AARCH64_JAVATHREAD_LINUX_AARCH64_HPP private: @@ -49,4 +49,4 @@ public: static Thread *aarch64_get_thread_helper(); -#endif // OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP +#endif // OS_CPU_LINUX_AARCH64_JAVATHREAD_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp index 6cd08c3acd8..8fb7cbff953 100644 --- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp +++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp @@ -46,7 +46,7 @@ #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.cpp similarity index 100% rename from src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp rename to src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.cpp diff --git a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.hpp similarity index 94% rename from src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp rename to src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.hpp index 579d752f034..b7907d050b7 100644 --- a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.hpp @@ -22,8 +22,8 @@ * */ -#ifndef OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP +#ifndef OS_CPU_LINUX_ARM_JAVATHREAD_LINUX_ARM_HPP +#define OS_CPU_LINUX_ARM_JAVATHREAD_LINUX_ARM_HPP private: // The following thread-local variables replicate corresponding global variables. @@ -62,4 +62,4 @@ private: bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava); public: -#endif // OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP +#endif // OS_CPU_LINUX_ARM_JAVATHREAD_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp index 124e86c6e93..38c19261249 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -44,6 +44,7 @@ #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" +#include "runtime/threads.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp similarity index 99% rename from src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp rename to src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp index cddaaf1ebac..988a59e7cf0 100644 --- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp +++ b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp @@ -26,7 +26,7 @@ #include "precompiled.hpp" #include "memory/metaspace.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.hpp similarity index 90% rename from src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp rename to src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.hpp index c38f90efa8d..c77819ad40e 100644 --- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP +#ifndef OS_CPU_LINUX_PPC_JAVATHREAD_LINUX_PPC_HPP +#define OS_CPU_LINUX_PPC_JAVATHREAD_LINUX_PPC_HPP private: @@ -41,4 +41,4 @@ bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); -#endif // OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP +#endif // OS_CPU_LINUX_PPC_JAVATHREAD_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp index 110e0de3c13..84042f7a29e 100644 --- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp +++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp @@ -42,12 +42,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "runtime/vm_version.hpp" #include "signals_posix.hpp" diff --git a/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/javaThread_linux_riscv.cpp similarity index 98% rename from src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp rename to src/hotspot/os_cpu/linux_riscv/javaThread_linux_riscv.cpp index 3100572e9fd..4d88e670c19 100644 --- a/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp +++ b/src/hotspot/os_cpu/linux_riscv/javaThread_linux_riscv.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/javaThread_linux_riscv.hpp similarity index 90% rename from src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp rename to src/hotspot/os_cpu/linux_riscv/javaThread_linux_riscv.hpp index 61e2cf85b63..36b7d43fb26 100644 --- a/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp +++ b/src/hotspot/os_cpu/linux_riscv/javaThread_linux_riscv.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_LINUX_RISCV_THREAD_LINUX_RISCV_HPP -#define OS_CPU_LINUX_RISCV_THREAD_LINUX_RISCV_HPP +#ifndef OS_CPU_LINUX_RISCV_JAVATHREAD_LINUX_RISCV_HPP +#define OS_CPU_LINUX_RISCV_JAVATHREAD_LINUX_RISCV_HPP private: void pd_initialize() { @@ -45,4 +45,4 @@ private: bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava); -#endif // OS_CPU_LINUX_RISCV_THREAD_LINUX_RISCV_HPP +#endif // OS_CPU_LINUX_RISCV_JAVATHREAD_LINUX_RISCV_HPP diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp index 6e523810e95..69c1f281c23 100644 --- a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp +++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp @@ -41,12 +41,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.cpp similarity index 99% rename from src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp rename to src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.cpp index 3e755fdf1af..e0414f496b0 100644 --- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp +++ b/src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.cpp @@ -26,7 +26,7 @@ #include "precompiled.hpp" #include "memory/metaspace.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.hpp similarity index 90% rename from src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp rename to src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.hpp index 29606455e77..bc3ab953f5d 100644 --- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP -#define OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP +#ifndef OS_CPU_LINUX_S390_JAVATHREAD_LINUX_S390_HPP +#define OS_CPU_LINUX_S390_JAVATHREAD_LINUX_S390_HPP private: @@ -40,4 +40,4 @@ bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); -#endif // OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP +#endif // OS_CPU_LINUX_S390_JAVATHREAD_LINUX_S390_HPP diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp index e7426f0d92a..0396b6d2425 100644 --- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp +++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp @@ -44,12 +44,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/events.hpp" diff --git a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/javaThread_linux_x86.cpp similarity index 98% rename from src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp rename to src/hotspot/os_cpu/linux_x86/javaThread_linux_x86.cpp index 28982d00f4b..9e129487edf 100644 --- a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp +++ b/src/hotspot/os_cpu/linux_x86/javaThread_linux_x86.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/javaThread_linux_x86.hpp similarity index 91% rename from src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp rename to src/hotspot/os_cpu/linux_x86/javaThread_linux_x86.hpp index 574edc79831..1efb7efb8c2 100644 --- a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/javaThread_linux_x86.hpp @@ -22,8 +22,8 @@ * */ -#ifndef OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP +#ifndef OS_CPU_LINUX_X86_JAVATHREAD_LINUX_X86_HPP +#define OS_CPU_LINUX_X86_JAVATHREAD_LINUX_X86_HPP private: void pd_initialize() { @@ -45,4 +45,4 @@ private: bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava); public: -#endif // OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP +#endif // OS_CPU_LINUX_X86_JAVATHREAD_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp index a8f073b787b..1c853ccda28 100644 --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp @@ -39,12 +39,12 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "services/memTracker.hpp" diff --git a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/javaThread_linux_zero.cpp similarity index 98% rename from src/hotspot/os_cpu/linux_zero/thread_linux_zero.cpp rename to src/hotspot/os_cpu/linux_zero/javaThread_linux_zero.cpp index e4313782613..f94477aab39 100644 --- a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.cpp +++ b/src/hotspot/os_cpu/linux_zero/javaThread_linux_zero.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/javaThread_linux_zero.hpp similarity index 95% rename from src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp rename to src/hotspot/os_cpu/linux_zero/javaThread_linux_zero.hpp index b915c40c049..e15782cf9b3 100644 --- a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/javaThread_linux_zero.hpp @@ -23,8 +23,8 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP +#ifndef OS_CPU_LINUX_ZERO_JAVATHREAD_LINUX_ZERO_HPP +#define OS_CPU_LINUX_ZERO_JAVATHREAD_LINUX_ZERO_HPP private: ZeroStack _zero_stack; @@ -102,4 +102,4 @@ void* ucontext, bool isInJava); -#endif // OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP +#endif // OS_CPU_LINUX_ZERO_JAVATHREAD_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp index feeac1c8cb7..630276aa74b 100644 --- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp +++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp @@ -40,11 +40,11 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "signals_posix.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/javaThread_windows_aarch64.cpp similarity index 98% rename from src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp rename to src/hotspot/os_cpu/windows_aarch64/javaThread_windows_aarch64.cpp index c5267d85d37..6af1fee4f8b 100644 --- a/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp +++ b/src/hotspot/os_cpu/windows_aarch64/javaThread_windows_aarch64.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/javaThread_windows_aarch64.hpp similarity index 89% rename from src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.hpp rename to src/hotspot/os_cpu/windows_aarch64/javaThread_windows_aarch64.hpp index bcf43c8b088..7d6ed16e629 100644 --- a/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.hpp +++ b/src/hotspot/os_cpu/windows_aarch64/javaThread_windows_aarch64.hpp @@ -22,8 +22,8 @@ * */ -#ifndef OS_CPU_WINDOWS_AARCH64_THREAD_WINDOWS_AARCH64_HPP -#define OS_CPU_WINDOWS_AARCH64_THREAD_WINDOWS_AARCH64_HPP +#ifndef OS_CPU_WINDOWS_AARCH64_JAVATHREAD_WINDOWS_AARCH64_HPP +#define OS_CPU_WINDOWS_AARCH64_JAVATHREAD_WINDOWS_AARCH64_HPP private: @@ -50,4 +50,4 @@ public: return Thread::current(); } -#endif // OS_CPU_WINDOWS_AARCH64_THREAD_WINDOWS_AARCH64_HPP +#endif // OS_CPU_WINDOWS_AARCH64_JAVATHREAD_WINDOWS_AARCH64_HPP diff --git a/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp index 24fa22fda21..338333a94a9 100644 --- a/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp +++ b/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp @@ -40,11 +40,11 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "unwind_windows_aarch64.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/javaThread_windows_x86.cpp similarity index 98% rename from src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp rename to src/hotspot/os_cpu/windows_x86/javaThread_windows_x86.cpp index 8eed73ec46e..4527dd83682 100644 --- a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp +++ b/src/hotspot/os_cpu/windows_x86/javaThread_windows_x86.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); diff --git a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/javaThread_windows_x86.hpp similarity index 92% rename from src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp rename to src/hotspot/os_cpu/windows_x86/javaThread_windows_x86.hpp index 21577346246..348fd83ef72 100644 --- a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/javaThread_windows_x86.hpp @@ -22,8 +22,8 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP +#ifndef OS_CPU_WINDOWS_X86_JAVATHREAD_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_JAVATHREAD_WINDOWS_X86_HPP private: // On windows, in the stubGenerator, there's nowhere to save callee saved regs @@ -54,4 +54,4 @@ private: bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava); -#endif // OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP +#endif // OS_CPU_WINDOWS_X86_JAVATHREAD_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp index d338f18f4cf..78b137afc78 100644 --- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp +++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp @@ -40,11 +40,11 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/timer.hpp" #include "symbolengine.hpp" #include "unwind_windows_x86.hpp" diff --git a/src/hotspot/share/asm/assembler.cpp b/src/hotspot/share/asm/assembler.cpp index a8718c9c4fb..6339dac5e13 100644 --- a/src/hotspot/share/asm/assembler.cpp +++ b/src/hotspot/share/asm/assembler.cpp @@ -30,8 +30,8 @@ #include "memory/universe.hpp" #include "oops/compressedOops.hpp" #include "runtime/icache.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" // Implementation of AbstractAssembler diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp index c2a9b3ef40c..009ba3de3be 100644 --- a/src/hotspot/share/cds/archiveBuilder.cpp +++ b/src/hotspot/share/cds/archiveBuilder.cpp @@ -45,8 +45,8 @@ #include "oops/oopHandle.inline.hpp" #include "runtime/arguments.hpp" #include "runtime/globals_extension.hpp" +#include "runtime/javaThread.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.hpp" #include "utilities/align.hpp" #include "utilities/bitMap.inline.hpp" #include "utilities/formatBuffer.hpp" diff --git a/src/hotspot/share/cds/cdsProtectionDomain.hpp b/src/hotspot/share/cds/cdsProtectionDomain.hpp index 1e048a96285..f784e167b06 100644 --- a/src/hotspot/share/cds/cdsProtectionDomain.hpp +++ b/src/hotspot/share/cds/cdsProtectionDomain.hpp @@ -26,7 +26,7 @@ #define SHARED_CDS_CDSPROTECTIONDOMAIN_HPP #include "oops/oopHandle.inline.hpp" #include "runtime/handles.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "classfile/moduleEntry.hpp" class InstanceKlass; diff --git a/src/hotspot/share/cds/classListWriter.hpp b/src/hotspot/share/cds/classListWriter.hpp index db7265b1209..1e42c5fcc74 100644 --- a/src/hotspot/share/cds/classListWriter.hpp +++ b/src/hotspot/share/cds/classListWriter.hpp @@ -25,8 +25,8 @@ #ifndef SHARE_CDS_CLASSLISTWRITER_HPP #define SHARE_CDS_CLASSLISTWRITER_HPP +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.hpp" #include "utilities/ostream.hpp" class ClassFileStream; diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp index 84eb3948f60..d35434cfe91 100644 --- a/src/hotspot/share/ci/ciEnv.cpp +++ b/src/hotspot/share/ci/ciEnv.cpp @@ -69,11 +69,11 @@ #include "runtime/fieldDescriptor.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/init.hpp" -#include "runtime/reflection.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" +#include "runtime/reflection.hpp" #include "runtime/safepointVerifiers.hpp" #include "runtime/sharedRuntime.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/dtrace.hpp" #include "utilities/macros.hpp" #ifdef COMPILER1 diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp index 9a01b339386..1bafe5d0480 100644 --- a/src/hotspot/share/ci/ciEnv.hpp +++ b/src/hotspot/share/ci/ciEnv.hpp @@ -34,7 +34,7 @@ #include "code/exceptionHandlerTable.hpp" #include "compiler/compilerThread.hpp" #include "oops/methodData.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" class CompileTask; class OopMapSet; diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp index a9731d4bfb7..fc593dc2154 100644 --- a/src/hotspot/share/ci/ciReplay.cpp +++ b/src/hotspot/share/ci/ciReplay.cpp @@ -49,8 +49,9 @@ #include "runtime/fieldDescriptor.inline.hpp" #include "runtime/globals_extension.hpp" #include "runtime/handles.inline.hpp" -#include "runtime/jniHandles.inline.hpp" #include "runtime/java.hpp" +#include "runtime/jniHandles.inline.hpp" +#include "runtime/threads.hpp" #include "utilities/copy.hpp" #include "utilities/macros.hpp" #include "utilities/utf8.hpp" diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp index 9bac172a5f2..6560a1d22b4 100644 --- a/src/hotspot/share/classfile/defaultMethods.cpp +++ b/src/hotspot/share/classfile/defaultMethods.cpp @@ -38,8 +38,8 @@ #include "prims/jvmtiExport.hpp" #include "runtime/arguments.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/signature.hpp" -#include "runtime/thread.hpp" #include "oops/instanceKlass.hpp" #include "oops/klass.hpp" #include "oops/method.hpp" diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index c3fdff84ca0..dd3575f5bbf 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -72,11 +72,11 @@ #include "runtime/interfaceSupport.inline.hpp" #include "runtime/java.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/reflectionUtils.hpp" #include "runtime/safepoint.hpp" #include "runtime/safepointVerifiers.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" #include "runtime/vframe.inline.hpp" #include "runtime/vm_version.hpp" diff --git a/src/hotspot/share/classfile/metadataOnStackMark.cpp b/src/hotspot/share/classfile/metadataOnStackMark.cpp index 51c53ce8f95..57c258f7666 100644 --- a/src/hotspot/share/classfile/metadataOnStackMark.cpp +++ b/src/hotspot/share/classfile/metadataOnStackMark.cpp @@ -28,8 +28,8 @@ #include "compiler/compileBroker.hpp" #include "oops/metadata.hpp" #include "prims/jvmtiImpl.hpp" +#include "runtime/javaThread.hpp" #include "runtime/synchronizer.hpp" -#include "runtime/thread.hpp" #include "services/threadService.hpp" #include "utilities/chunkedList.hpp" #if INCLUDE_JVMCI diff --git a/src/hotspot/share/classfile/placeholders.cpp b/src/hotspot/share/classfile/placeholders.cpp index c8c75fbbf2e..b2f960443c3 100644 --- a/src/hotspot/share/classfile/placeholders.cpp +++ b/src/hotspot/share/classfile/placeholders.cpp @@ -29,8 +29,8 @@ #include "logging/logTag.hpp" #include "logging/logStream.hpp" #include "memory/resourceArea.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.hpp" #include "utilities/hashtable.inline.hpp" // SeenThread objects represent list of threads that are diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp index f93ca7830b3..9e97499ee3a 100644 --- a/src/hotspot/share/classfile/verifier.cpp +++ b/src/hotspot/share/classfile/verifier.cpp @@ -52,10 +52,10 @@ #include "runtime/handles.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/os.hpp" #include "runtime/safepointVerifiers.hpp" -#include "runtime/thread.hpp" #include "services/threadService.hpp" #include "utilities/align.hpp" #include "utilities/bytes.hpp" diff --git a/src/hotspot/share/code/debugInfo.cpp b/src/hotspot/share/code/debugInfo.cpp index 47d6f7b9300..8b735932720 100644 --- a/src/hotspot/share/code/debugInfo.cpp +++ b/src/hotspot/share/code/debugInfo.cpp @@ -31,8 +31,8 @@ #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" -#include "runtime/thread.hpp" // Constructors diff --git a/src/hotspot/share/code/debugInfo.hpp b/src/hotspot/share/code/debugInfo.hpp index 7c85ae60c33..bbb585cb9f0 100644 --- a/src/hotspot/share/code/debugInfo.hpp +++ b/src/hotspot/share/code/debugInfo.hpp @@ -29,7 +29,7 @@ #include "code/location.hpp" #include "code/nmethod.hpp" #include "code/oopRecorder.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/growableArray.hpp" // Classes used for serializing debugging information. diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp index e150b300b7b..de7844e58b3 100644 --- a/src/hotspot/share/code/dependencies.cpp +++ b/src/hotspot/share/code/dependencies.cpp @@ -40,9 +40,9 @@ #include "runtime/flags/flagSetting.hpp" #include "runtime/handles.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/perfData.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmThread.hpp" #include "utilities/copy.hpp" diff --git a/src/hotspot/share/code/dependencyContext.cpp b/src/hotspot/share/code/dependencyContext.cpp index c2197663740..4a0ea13daff 100644 --- a/src/hotspot/share/code/dependencyContext.cpp +++ b/src/hotspot/share/code/dependencyContext.cpp @@ -28,6 +28,7 @@ #include "code/dependencyContext.hpp" #include "memory/resourceArea.hpp" #include "runtime/atomic.hpp" +#include "runtime/mutexLocker.hpp" #include "runtime/orderAccess.hpp" #include "runtime/perfData.hpp" #include "utilities/exceptions.hpp" diff --git a/src/hotspot/share/code/icBuffer.cpp b/src/hotspot/share/code/icBuffer.cpp index 1da48f0bd13..8db25297f01 100644 --- a/src/hotspot/share/code/icBuffer.cpp +++ b/src/hotspot/share/code/icBuffer.cpp @@ -35,9 +35,9 @@ #include "oops/method.hpp" #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/stubRoutines.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmOperations.hpp" DEF_STUB_INTERFACE(ICStub); diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp index 5a57578a88d..8f578df4064 100644 --- a/src/hotspot/share/compiler/compileBroker.cpp +++ b/src/hotspot/share/compiler/compileBroker.cpp @@ -64,6 +64,7 @@ #include "runtime/safepointVerifiers.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/sweeper.hpp" +#include "runtime/threads.hpp" #include "runtime/threadSMR.hpp" #include "runtime/timerTrace.hpp" #include "runtime/vframe.inline.hpp" diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp index d610d8bdcf8..4c8933252fd 100644 --- a/src/hotspot/share/compiler/compileTask.cpp +++ b/src/hotspot/share/compiler/compileTask.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ #include "oops/klass.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/jniHandles.hpp" +#include "runtime/mutexLocker.hpp" CompileTask* CompileTask::_task_free_list = NULL; diff --git a/src/hotspot/share/compiler/compilerEvent.cpp b/src/hotspot/share/compiler/compilerEvent.cpp index 6de747d44b3..d1a1864a0db 100644 --- a/src/hotspot/share/compiler/compilerEvent.cpp +++ b/src/hotspot/share/compiler/compilerEvent.cpp @@ -28,8 +28,8 @@ #include "jfr/jfrEvents.hpp" #include "jfr/metadata/jfrSerializer.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/semaphore.inline.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/growableArray.hpp" // Synchronizes access to phases_names. diff --git a/src/hotspot/share/compiler/compilerThread.cpp b/src/hotspot/share/compiler/compilerThread.cpp index 94e00083de0..fd1ce21a9f8 100644 --- a/src/hotspot/share/compiler/compilerThread.cpp +++ b/src/hotspot/share/compiler/compilerThread.cpp @@ -26,8 +26,8 @@ #include "compiler/compileBroker.hpp" #include "compiler/compileTask.hpp" #include "compiler/compilerThread.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/sweeper.hpp" -#include "runtime/thread.inline.hpp" // Create a CompilerThread CompilerThread::CompilerThread(CompileQueue* queue, diff --git a/src/hotspot/share/compiler/compilerThread.hpp b/src/hotspot/share/compiler/compilerThread.hpp index a79780fa533..1c1fcd438b1 100644 --- a/src/hotspot/share/compiler/compilerThread.hpp +++ b/src/hotspot/share/compiler/compilerThread.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_COMPILER_COMPILERTHREAD_HPP #define SHARE_COMPILER_COMPILERTHREAD_HPP -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" class BufferBlob; class AbstractCompiler; diff --git a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp index 84b76f75d5e..ba4a346cf72 100644 --- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp +++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp @@ -23,7 +23,6 @@ */ #include "precompiled.hpp" -#include "runtime/thread.hpp" #include "gc/epsilon/epsilonBarrierSet.hpp" #include "gc/epsilon/epsilonThreadLocalData.hpp" #include "gc/shared/barrierSet.hpp" @@ -34,6 +33,7 @@ #ifdef COMPILER2 #include "gc/shared/c2/barrierSetC2.hpp" #endif +#include "runtime/javaThread.hpp" EpsilonBarrierSet::EpsilonBarrierSet() : BarrierSet( make_barrier_set_assembler(), diff --git a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp index 3c0a2ab0678..fd399119340 100644 --- a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP #include "gc/shared/gc_globals.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" class EpsilonThreadLocalData { diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp index f83ae9b52d3..6df4fc95526 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.cpp +++ b/src/hotspot/share/gc/g1/g1Allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ #include "gc/g1/heapRegionSet.inline.hpp" #include "gc/g1/heapRegionType.hpp" #include "gc/shared/tlab_globals.hpp" +#include "runtime/mutexLocker.hpp" #include "utilities/align.hpp" G1Allocator::G1Allocator(G1CollectedHeap* heap) : diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp index bd0eaed9f99..0e441ba0868 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp @@ -36,8 +36,8 @@ #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/orderAccess.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/macros.hpp" #ifdef COMPILER1 #include "gc/g1/c1/g1BarrierSetC1.hpp" diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp index 5b4b68db978..5046919a8d8 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp @@ -55,6 +55,7 @@ #include "memory/allocation.hpp" #include "memory/iterator.hpp" #include "memory/memRegion.hpp" +#include "runtime/mutexLocker.hpp" #include "utilities/bitMap.hpp" // A "G1CollectedHeap" is an implementation of a java heap for HotSpot. diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp index 6977fde7e0e..e6ed6cecaa1 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp @@ -72,6 +72,7 @@ #include "runtime/java.hpp" #include "runtime/orderAccess.hpp" #include "runtime/prefetch.inline.hpp" +#include "runtime/threads.hpp" #include "services/memTracker.hpp" #include "utilities/align.hpp" #include "utilities/formatBuffer.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp index d879568e34c..c18d55b1437 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp @@ -32,7 +32,7 @@ #include "memory/iterator.hpp" #include "runtime/globals_extension.hpp" #include "runtime/java.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" #include "utilities/formatBuffer.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp index ece63ed805a..1cd93d1feab 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp @@ -32,8 +32,9 @@ #include "logging/log.hpp" #include "runtime/atomic.hpp" #include "runtime/init.hpp" +#include "runtime/javaThread.hpp" +#include "runtime/mutexLocker.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" G1ConcurrentRefineThread::G1ConcurrentRefineThread(G1ConcurrentRefine* cr, uint worker_id) : ConcurrentGCThread(), diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp index 136f5849dbb..65967ac42c9 100644 --- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp +++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp @@ -38,11 +38,12 @@ #include "gc/shared/suspendibleThreadSet.hpp" #include "memory/iterator.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutex.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/threads.hpp" #include "runtime/threadSMR.hpp" #include "utilities/globalCounter.inline.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/g1/g1HotCardCache.hpp b/src/hotspot/share/gc/g1/g1HotCardCache.hpp index f7c7fc6b94e..e6e63a47057 100644 --- a/src/hotspot/share/gc/g1/g1HotCardCache.hpp +++ b/src/hotspot/share/gc/g1/g1HotCardCache.hpp @@ -27,8 +27,8 @@ #include "gc/g1/g1CardCounts.hpp" #include "memory/allocation.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" #include "utilities/globalDefinitions.hpp" class G1CardTableEntryClosure; diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp index 37c095f4c5b..e8bbb062dd4 100644 --- a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp +++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp @@ -29,6 +29,7 @@ #include "gc/g1/g1MemoryPool.hpp" #include "gc/shared/hSpaceCounters.hpp" #include "memory/metaspaceCounters.hpp" +#include "runtime/mutexLocker.hpp" #include "services/memoryPool.hpp" class G1GenerationCounters : public GenerationCounters { diff --git a/src/hotspot/share/gc/g1/g1RemSetSummary.cpp b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp index 8b8b76d8609..b531b769a5b 100644 --- a/src/hotspot/share/gc/g1/g1RemSetSummary.cpp +++ b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp @@ -35,7 +35,7 @@ #include "gc/g1/heapRegionRemSet.inline.hpp" #include "memory/allocation.inline.hpp" #include "memory/iterator.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" void G1RemSetSummary::update() { class CollectData : public ThreadClosure { diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp index c8609718c25..5460d2a3cde 100644 --- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp +++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp @@ -43,6 +43,7 @@ #include "gc/shared/referenceProcessor.hpp" #include "memory/allocation.inline.hpp" #include "runtime/mutex.hpp" +#include "runtime/threads.hpp" #include "utilities/enumIterator.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp b/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp index d531f8ac56a..e17a8c7960a 100644 --- a/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp +++ b/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp @@ -28,7 +28,7 @@ #include "gc/g1/g1DirtyCardQueue.hpp" #include "gc/shared/gc_globals.hpp" #include "gc/shared/satbMarkQueue.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" #include "utilities/sizes.hpp" diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp index d5e1774a8bd..36e01a888ad 100644 --- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp +++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp @@ -57,6 +57,7 @@ #include "gc/shared/workerThread.hpp" #include "jfr/jfrEvents.hpp" #include "memory/resourceArea.hpp" +#include "runtime/threads.hpp" #include "utilities/ticks.hpp" // GCTraceTime wrapper that constructs the message according to GC pause type and diff --git a/src/hotspot/share/gc/g1/heapRegionManager.cpp b/src/hotspot/share/gc/g1/heapRegionManager.cpp index cdb5914a9cb..dd533c807af 100644 --- a/src/hotspot/share/gc/g1/heapRegionManager.cpp +++ b/src/hotspot/share/gc/g1/heapRegionManager.cpp @@ -35,6 +35,7 @@ #include "logging/logStream.hpp" #include "memory/allocation.hpp" #include "runtime/atomic.hpp" +#include "runtime/mutexLocker.hpp" #include "runtime/orderAccess.hpp" #include "utilities/bitMap.inline.hpp" diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp index c540aa930f3..c60f39cd696 100644 --- a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp +++ b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp @@ -37,6 +37,7 @@ #include "runtime/atomic.hpp" #include "runtime/globals_extension.hpp" #include "runtime/java.hpp" +#include "runtime/mutexLocker.hpp" #include "utilities/bitMap.inline.hpp" #include "utilities/debug.hpp" #include "utilities/formatBuffer.hpp" diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp index 11c32584ea8..eb54d76629c 100644 --- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp +++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp @@ -33,8 +33,8 @@ #include "oops/typeArrayOop.hpp" #include "runtime/atomic.hpp" #include "runtime/java.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.inline.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp index bf399327ae0..99bf6a2dca6 100644 --- a/src/hotspot/share/gc/parallel/mutableSpace.cpp +++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp @@ -30,8 +30,8 @@ #include "memory/universe.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" #include "utilities/align.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp index 1a8a15ad827..3bfc7e45d59 100644 --- a/src/hotspot/share/gc/parallel/psOldGen.hpp +++ b/src/hotspot/share/gc/parallel/psOldGen.hpp @@ -30,6 +30,7 @@ #include "gc/parallel/psGenerationCounters.hpp" #include "gc/parallel/psVirtualspace.hpp" #include "gc/parallel/spaceCounters.hpp" +#include "runtime/mutexLocker.hpp" #include "runtime/safepoint.hpp" class PSOldGen : public CHeapObj { diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 4917c4e92a0..9e802f59d00 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -79,6 +79,7 @@ #include "runtime/handles.inline.hpp" #include "runtime/java.hpp" #include "runtime/safepoint.hpp" +#include "runtime/threads.hpp" #include "runtime/vmThread.hpp" #include "services/memTracker.hpp" #include "services/memoryService.hpp" diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp index 1bf4d7d0c52..717cac93a26 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.cpp +++ b/src/hotspot/share/gc/parallel/psScavenge.cpp @@ -65,6 +65,7 @@ #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/threadCritical.hpp" +#include "runtime/threads.hpp" #include "runtime/vmThread.hpp" #include "runtime/vmOperations.hpp" #include "services/memoryService.hpp" diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp index 48067f7099d..430acdbcddd 100644 --- a/src/hotspot/share/gc/serial/defNewGeneration.cpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp @@ -55,8 +55,9 @@ #include "oops/instanceRefKlass.hpp" #include "oops/oop.inline.hpp" #include "runtime/java.hpp" +#include "runtime/javaThread.hpp" #include "runtime/prefetch.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/threads.hpp" #include "utilities/align.hpp" #include "utilities/copy.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp index 28ea7a9e10a..9dc95ffb60c 100644 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp @@ -53,8 +53,8 @@ #include "oops/oop.inline.hpp" #include "prims/jvmtiExport.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/synchronizer.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmThread.hpp" #include "utilities/copy.hpp" #include "utilities/events.hpp" diff --git a/src/hotspot/share/gc/shared/barrierSet.cpp b/src/hotspot/share/gc/shared/barrierSet.cpp index c7e1e9659a0..bfd62381d0a 100644 --- a/src/hotspot/share/gc/shared/barrierSet.cpp +++ b/src/hotspot/share/gc/shared/barrierSet.cpp @@ -27,7 +27,7 @@ #include "gc/shared/barrierSetAssembler.hpp" #include "gc/shared/barrierSetNMethod.hpp" #include "runtime/continuation.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp index d0af04b8a61..cf481959bd6 100644 --- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp +++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp @@ -33,8 +33,9 @@ #include "oops/access.inline.hpp" #include "oops/method.hpp" #include "runtime/frame.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "runtime/threadWXSetters.inline.hpp" +#include "runtime/threads.hpp" #include "utilities/debug.hpp" class LoadPhantomOopClosure : public OopClosure { diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp index d32a414e033..da7a81d4949 100644 --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp @@ -31,7 +31,7 @@ #include "logging/log.hpp" #include "memory/virtualspace.hpp" #include "oops/oop.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "services/memTracker.hpp" #include "utilities/align.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp index f4037c2bb16..61d8411a5ea 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.cpp +++ b/src/hotspot/share/gc/shared/collectedHeap.cpp @@ -49,8 +49,8 @@ #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/init.hpp" +#include "runtime/javaThread.hpp" #include "runtime/perfData.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" #include "runtime/vmThread.hpp" #include "services/heapDumper.hpp" diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp index 838a927ec48..31684ca9259 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.hpp @@ -31,6 +31,7 @@ #include "memory/allocation.hpp" #include "memory/metaspace.hpp" #include "memory/universe.hpp" +#include "oops/stackChunkOop.hpp" #include "runtime/handles.hpp" #include "runtime/perfDataTypes.hpp" #include "runtime/safepoint.hpp" diff --git a/src/hotspot/share/gc/shared/concurrentGCBreakpoints.cpp b/src/hotspot/share/gc/shared/concurrentGCBreakpoints.cpp index 106627e73a7..ae821e46a85 100644 --- a/src/hotspot/share/gc/shared/concurrentGCBreakpoints.cpp +++ b/src/hotspot/share/gc/shared/concurrentGCBreakpoints.cpp @@ -28,8 +28,8 @@ #include "logging/log.hpp" #include "memory/universe.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" // States: diff --git a/src/hotspot/share/gc/shared/concurrentGCThread.hpp b/src/hotspot/share/gc/shared/concurrentGCThread.hpp index 92f035e720a..630abeaeb9f 100644 --- a/src/hotspot/share/gc/shared/concurrentGCThread.hpp +++ b/src/hotspot/share/gc/shared/concurrentGCThread.hpp @@ -25,8 +25,8 @@ #ifndef SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP #define SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP +#include "runtime/javaThread.hpp" #include "runtime/nonJavaThread.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" class ConcurrentGCThread: public NamedThread { diff --git a/src/hotspot/share/gc/shared/copyFailedInfo.hpp b/src/hotspot/share/gc/shared/copyFailedInfo.hpp index f4aeac16c34..7957859d04d 100644 --- a/src/hotspot/share/gc/shared/copyFailedInfo.hpp +++ b/src/hotspot/share/gc/shared/copyFailedInfo.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_SHARED_COPYFAILEDINFO_HPP #include "jfr/support/jfrThreadId.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/globalDefinitions.hpp" class CopyFailedInfo : public CHeapObj { diff --git a/src/hotspot/share/gc/shared/gcId.cpp b/src/hotspot/share/gc/shared/gcId.cpp index 5accff001f5..a11a0cf3d25 100644 --- a/src/hotspot/share/gc/shared/gcId.cpp +++ b/src/hotspot/share/gc/shared/gcId.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "jvm.h" #include "gc/shared/gcId.hpp" +#include "runtime/javaThread.hpp" #include "runtime/nonJavaThread.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.inline.hpp" uint GCId::_next_id = 0; diff --git a/src/hotspot/share/gc/shared/gcLocker.cpp b/src/hotspot/share/gc/shared/gcLocker.cpp index f1b3dce71cf..88aafa26aac 100644 --- a/src/hotspot/share/gc/shared/gcLocker.cpp +++ b/src/hotspot/share/gc/shared/gcLocker.cpp @@ -30,8 +30,8 @@ #include "memory/universe.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" volatile jint GCLocker::_jni_lock_count = 0; diff --git a/src/hotspot/share/gc/shared/gcLocker.inline.hpp b/src/hotspot/share/gc/shared/gcLocker.inline.hpp index 39585bfe19e..82cc4bb5442 100644 --- a/src/hotspot/share/gc/shared/gcLocker.inline.hpp +++ b/src/hotspot/share/gc/shared/gcLocker.inline.hpp @@ -27,7 +27,7 @@ #include "gc/shared/gcLocker.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.inline.hpp" void GCLocker::lock_critical(JavaThread* thread) { if (!thread->in_critical()) { diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp index c4dc7f90766..c381ac58fe0 100644 --- a/src/hotspot/share/gc/shared/gcVMOperations.cpp +++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,7 @@ #include "runtime/handles.inline.hpp" #include "runtime/init.hpp" #include "runtime/java.hpp" +#include "runtime/mutexLocker.hpp" #include "utilities/dtrace.hpp" #include "utilities/macros.hpp" #include "utilities/preserveException.hpp" diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp index fd71e75db2f..b44f278d5ef 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp @@ -67,6 +67,7 @@ #include "runtime/handles.hpp" #include "runtime/handles.inline.hpp" #include "runtime/java.hpp" +#include "runtime/threads.hpp" #include "runtime/vmThread.hpp" #include "services/memoryService.hpp" #include "utilities/autoRestore.hpp" diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp index 82182fbcea8..dbe4e31da8e 100644 --- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp +++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp @@ -34,7 +34,7 @@ #include "runtime/arguments.hpp" #include "runtime/globals.hpp" #include "runtime/globals_extension.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "utilities/align.hpp" #include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp index 4e99cea7422..be64eadc433 100644 --- a/src/hotspot/share/gc/shared/memAllocator.cpp +++ b/src/hotspot/share/gc/shared/memAllocator.cpp @@ -35,7 +35,7 @@ #include "prims/jvmtiExport.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/handles.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "services/lowMemoryDetector.hpp" #include "utilities/align.hpp" #include "utilities/copy.hpp" diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp index 320331f5ae7..2bc3d601720 100644 --- a/src/hotspot/share/gc/shared/memAllocator.hpp +++ b/src/hotspot/share/gc/shared/memAllocator.hpp @@ -27,7 +27,7 @@ #include "memory/memRegion.hpp" #include "oops/oopsHierarchy.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/exceptions.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/shared/oopStorage.cpp b/src/hotspot/share/gc/shared/oopStorage.cpp index f39a64870c7..177647c6c5d 100644 --- a/src/hotspot/share/gc/shared/oopStorage.cpp +++ b/src/hotspot/share/gc/shared/oopStorage.cpp @@ -32,13 +32,13 @@ #include "runtime/globals.hpp" #include "runtime/handles.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutex.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/orderAccess.hpp" #include "runtime/os.hpp" #include "runtime/safefetch.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" #include "services/memTracker.hpp" #include "utilities/align.hpp" #include "utilities/count_trailing_zeros.hpp" diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.cpp b/src/hotspot/share/gc/shared/satbMarkQueue.cpp index e80ea71b032..c602eccfc3c 100644 --- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp +++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp @@ -32,7 +32,7 @@ #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" +#include "runtime/threads.hpp" #include "runtime/threadSMR.hpp" #include "runtime/vmThread.hpp" #include "utilities/globalCounter.inline.hpp" diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp index aae5dcc6128..bc2c84d2bb7 100644 --- a/src/hotspot/share/gc/shared/space.hpp +++ b/src/hotspot/share/gc/shared/space.hpp @@ -50,6 +50,7 @@ class CompactibleSpace; class BlockOffsetTable; class CardTableRS; class DirtyCardToOopClosure; +class FilteringClosure; // A Space describes a heap area. Class Space is an abstract // base class. diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp index 69776cab184..91270da832b 100644 --- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp @@ -43,10 +43,10 @@ #include "oops/markWord.hpp" #include "oops/oopsHierarchy.hpp" #include "runtime/globals.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/orderAccess.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp index ba897ef868a..ee5fc6db5d5 100644 --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "gc/shared/stringdedup/stringDedupStorageUse.hpp" #include "runtime/atomic.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" #include "utilities/globalCounter.inline.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/shared/strongRootsScope.cpp b/src/hotspot/share/gc/shared/strongRootsScope.cpp index ed012b1f0e0..0839c72ca5d 100644 --- a/src/hotspot/share/gc/shared/strongRootsScope.cpp +++ b/src/hotspot/share/gc/shared/strongRootsScope.cpp @@ -26,7 +26,7 @@ #include "classfile/stringTable.hpp" #include "code/nmethod.hpp" #include "gc/shared/strongRootsScope.hpp" -#include "runtime/thread.hpp" +#include "runtime/threads.hpp" MarkScope::MarkScope() { nmethod::oops_do_marking_prologue(); diff --git a/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp b/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp index 2636cc92061..daaf72b48da 100644 --- a/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp +++ b/src/hotspot/share/gc/shared/suspendibleThreadSet.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" #include "gc/shared/gc_globals.hpp" #include "gc/shared/suspendibleThreadSet.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/semaphore.hpp" -#include "runtime/thread.inline.hpp" uint SuspendibleThreadSet::_nthreads = 0; uint SuspendibleThreadSet::_nthreads_stopped = 0; diff --git a/src/hotspot/share/gc/shared/taskTerminator.cpp b/src/hotspot/share/gc/shared/taskTerminator.cpp index 74d66b74e12..f5345885c94 100644 --- a/src/hotspot/share/gc/shared/taskTerminator.cpp +++ b/src/hotspot/share/gc/shared/taskTerminator.cpp @@ -29,8 +29,8 @@ #include "gc/shared/taskqueue.hpp" #include "logging/log.hpp" #include "runtime/globals.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.hpp" TaskTerminator::DelayContext::DelayContext() { _yield_count = 0; diff --git a/src/hotspot/share/gc/shared/taskqueue.cpp b/src/hotspot/share/gc/shared/taskqueue.cpp index 1a11a536683..43d354747da 100644 --- a/src/hotspot/share/gc/shared/taskqueue.cpp +++ b/src/hotspot/share/gc/shared/taskqueue.cpp @@ -27,8 +27,8 @@ #include "oops/oop.inline.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/debug.hpp" #include "utilities/stack.inline.hpp" diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp index 47395d7802a..a867d021031 100644 --- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp +++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp @@ -32,8 +32,8 @@ #include "memory/universe.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/perfData.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" #include "utilities/copy.hpp" diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp index 3b167d752e7..61b6ca0b5a5 100644 --- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp +++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp @@ -31,8 +31,8 @@ #include "gc/shared/tlab_globals.hpp" #include "memory/universe.hpp" #include "logging/log.hpp" +#include "runtime/javaThread.hpp" #include "runtime/osThread.hpp" -#include "runtime/thread.hpp" #include "utilities/copy.hpp" inline HeapWord* ThreadLocalAllocBuffer::allocate(size_t size) { diff --git a/src/hotspot/share/gc/shared/workerThread.cpp b/src/hotspot/share/gc/shared/workerThread.cpp index 9d141464a39..d303d8d404c 100644 --- a/src/hotspot/share/gc/shared/workerThread.cpp +++ b/src/hotspot/share/gc/shared/workerThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ #include "gc/shared/gc_globals.hpp" #include "gc/shared/workerThread.hpp" #include "logging/log.hpp" +#include "memory/iterator.hpp" #include "runtime/atomic.hpp" #include "runtime/init.hpp" #include "runtime/java.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp index 914f00ada76..851cb91b866 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp @@ -36,7 +36,7 @@ #include "memory/iterator.inline.hpp" #include "oops/compressedOops.inline.hpp" #include "runtime/atomic.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" ShenandoahForwardedIsAliveClosure::ShenandoahForwardedIsAliveClosure() : _mark_context(ShenandoahHeap::heap()->marking_context()) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp index a311ded3d9a..ad3e825c1c8 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp @@ -42,6 +42,7 @@ #include "memory/iterator.inline.hpp" #include "memory/resourceArea.hpp" #include "runtime/continuation.hpp" +#include "runtime/threads.hpp" class ShenandoahConcurrentMarkingTask : public WorkerTask { private: diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp index bed372be170..35a7d33ac4f 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp @@ -26,8 +26,8 @@ #include "gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" const jint ShenandoahEvacOOMHandler::OOM_MARKER_MASK = 0x80000000; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp index 86dd365683a..352732a8a10 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp @@ -27,7 +27,7 @@ #include "gc/shenandoah/shenandoahPadding.hpp" #include "memory/allocation.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/globalDefinitions.hpp" /** diff --git a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp index c92160e90d7..08a9a4963cb 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp @@ -29,7 +29,7 @@ #include "gc/shenandoah/shenandoahAsserts.hpp" #include "oops/markWord.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" inline oop ShenandoahForwarding::get_forwardee_raw(oop obj) { shenandoah_assert_in_heap(NULL, obj); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp index da12de337d9..182a7dfd1f8 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp @@ -55,8 +55,8 @@ #include "memory/universe.hpp" #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/orderAccess.hpp" -#include "runtime/thread.hpp" #include "runtime/vmThread.hpp" #include "utilities/copy.hpp" #include "utilities/events.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp index b58d97d68a6..c15ec37c1f5 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp @@ -46,8 +46,8 @@ #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/prefetch.inline.hpp" -#include "runtime/thread.hpp" #include "utilities/copy.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp index 96260a05d8a..eb645af3d8b 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp @@ -28,8 +28,8 @@ #include "gc/shenandoah/shenandoahLock.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.inline.hpp" -#include "runtime/thread.hpp" ShenandoahSimpleLock::ShenandoahSimpleLock() { assert(os::mutex_init_done(), "Too early!"); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp index 4c84ef49a9f..9b4be0c88ce 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp @@ -27,8 +27,8 @@ #include "gc/shenandoah/shenandoahPadding.hpp" #include "memory/allocation.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" class ShenandoahLock { private: diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp index 80a017227f6..11c70f2726a 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp @@ -31,7 +31,7 @@ #include "gc/shenandoah/shenandoahTaskqueue.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" #include "memory/iterator.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" enum StringDedupMode { NO_DEDUP, // Do not do anything for String deduplication diff --git a/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp index f764c7f9763..4403e51b62f 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp @@ -30,7 +30,7 @@ #include "gc/shared/weakProcessor.inline.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahUtils.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" template diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp index 21a21053c89..848f92184d9 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp @@ -33,8 +33,9 @@ #include "gc/shenandoah/shenandoahStackWatermark.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stackWatermarkSet.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/threads.hpp" ShenandoahJavaThreadsIterator::ShenandoahJavaThreadsIterator(ShenandoahPhaseTimings::Phase phase, uint n_workers) : _threads(), diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp index 840db75afe2..1074a5e9051 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp @@ -36,8 +36,9 @@ #include "gc/shenandoah/shenandoahUtils.hpp" #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageSet.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.hpp" -#include "runtime/thread.hpp" +#include "runtime/threads.hpp" #include "utilities/debug.hpp" #include "utilities/enumIterator.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp index aaf008894ad..9e4984a325f 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp @@ -27,8 +27,8 @@ #include "gc/shared/satbMarkQueue.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutex.hpp" -#include "runtime/thread.hpp" class ShenandoahSATBMarkQueueSet : public SATBMarkQueueSet { public: diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp index 5ce731e6fcc..5050ce4c4ec 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp @@ -30,8 +30,8 @@ #include "gc/shenandoah/shenandoahPadding.hpp" #include "memory/allocation.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutex.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" template diff --git a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp index 8d50bb35ee1..fcd4b042101 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp @@ -31,7 +31,7 @@ #include "gc/shenandoah/shenandoahBarrierSet.hpp" #include "gc/shenandoah/shenandoahCodeRoots.hpp" #include "gc/shenandoah/shenandoahSATBMarkQueueSet.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" #include "utilities/sizes.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp index 07f1dec2b17..4b97e620250 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp @@ -39,6 +39,7 @@ #include "oops/compressedOops.inline.hpp" #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" +#include "runtime/threads.hpp" #include "utilities/align.hpp" // Avoid name collision on verify_oop (defined in macroAssembler_arm.hpp) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp index d842c87e405..923a12a58b8 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp @@ -30,6 +30,7 @@ #include "gc/shenandoah/shenandoahTaskqueue.hpp" #include "logging/log.hpp" +#include "runtime/threads.hpp" ShenandoahWorkerScope::ShenandoahWorkerScope(WorkerThreads* workers, uint nworkers, const char* msg, bool check) : _workers(workers) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp index 2c9c0a8aacc..5c06bdbf9b4 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp @@ -27,7 +27,8 @@ #include "gc/shared/gc_globals.hpp" #include "gc/shared/workerPolicy.hpp" #include "gc/shenandoah/shenandoahWorkerPolicy.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" +#include "runtime/threads.hpp" uint ShenandoahWorkerPolicy::_prev_par_marking = 0; uint ShenandoahWorkerPolicy::_prev_conc_marking = 0; diff --git a/src/hotspot/share/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp index 7822d37f282..eceee80d16b 100644 --- a/src/hotspot/share/gc/z/zBarrierSet.cpp +++ b/src/hotspot/share/gc/z/zBarrierSet.cpp @@ -29,7 +29,7 @@ #include "gc/z/zHeap.inline.hpp" #include "gc/z/zStackWatermark.hpp" #include "gc/z/zThreadLocalData.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/macros.hpp" #ifdef COMPILER1 #include "gc/z/c1/zBarrierSetC1.hpp" diff --git a/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp b/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp index ace07bec98d..8127ff61079 100644 --- a/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp +++ b/src/hotspot/share/gc/z/zBarrierSetAssembler.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "gc/z/zBarrierSetAssembler.hpp" #include "gc/z/zThreadLocalData.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" Address ZBarrierSetAssemblerBase::address_bad_mask_from_thread(Register thread) { return Address(thread, ZThreadLocalData::address_bad_mask_offset()); diff --git a/src/hotspot/share/gc/z/zCPU.cpp b/src/hotspot/share/gc/z/zCPU.cpp index c3159d401c5..ba9da1d6e33 100644 --- a/src/hotspot/share/gc/z/zCPU.cpp +++ b/src/hotspot/share/gc/z/zCPU.cpp @@ -25,8 +25,8 @@ #include "gc/shared/gcLogPrecious.hpp" #include "gc/z/zCPU.inline.hpp" #include "memory/padded.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/debug.hpp" #define ZCPU_UNKNOWN_AFFINITY ((Thread*)-1) diff --git a/src/hotspot/share/gc/z/zDriver.cpp b/src/hotspot/share/gc/z/zDriver.cpp index 97e8ca21bcc..f216c71217d 100644 --- a/src/hotspot/share/gc/z/zDriver.cpp +++ b/src/hotspot/share/gc/z/zDriver.cpp @@ -37,6 +37,7 @@ #include "gc/z/zVerify.hpp" #include "logging/log.hpp" #include "memory/universe.hpp" +#include "runtime/threads.hpp" #include "runtime/vmOperations.hpp" #include "runtime/vmThread.hpp" diff --git a/src/hotspot/share/gc/z/zFuture.inline.hpp b/src/hotspot/share/gc/z/zFuture.inline.hpp index 376bea62471..538b5be3a65 100644 --- a/src/hotspot/share/gc/z/zFuture.inline.hpp +++ b/src/hotspot/share/gc/z/zFuture.inline.hpp @@ -26,8 +26,8 @@ #include "gc/z/zFuture.hpp" +#include "runtime/javaThread.hpp" #include "runtime/semaphore.inline.hpp" -#include "runtime/thread.hpp" template inline ZFuture::ZFuture() : diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp index 36afe843640..f0441046999 100644 --- a/src/hotspot/share/gc/z/zHeap.cpp +++ b/src/hotspot/share/gc/z/zHeap.cpp @@ -47,8 +47,8 @@ #include "memory/resourceArea.hpp" #include "prims/jvmtiTagMap.hpp" #include "runtime/handshake.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" static const ZStatCounter ZCounterUndoPageAllocation("Memory", "Undo Page Allocation", ZStatUnitOpsPerSecond); diff --git a/src/hotspot/share/gc/z/zLock.inline.hpp b/src/hotspot/share/gc/z/zLock.inline.hpp index 79176d54f30..d0df421b1ec 100644 --- a/src/hotspot/share/gc/z/zLock.inline.hpp +++ b/src/hotspot/share/gc/z/zLock.inline.hpp @@ -27,8 +27,8 @@ #include "gc/z/zLock.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.inline.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" inline void ZLock::lock() { diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp index b5e27f74b9d..d79717e9d12 100644 --- a/src/hotspot/share/gc/z/zMark.cpp +++ b/src/hotspot/share/gc/z/zMark.cpp @@ -58,11 +58,12 @@ #include "runtime/atomic.hpp" #include "runtime/continuation.hpp" #include "runtime/handshake.hpp" +#include "runtime/javaThread.hpp" #include "runtime/prefetch.inline.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/stackWatermark.hpp" #include "runtime/stackWatermarkSet.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/threads.hpp" #include "utilities/align.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp index 662ba17fc65..289d8df7db4 100644 --- a/src/hotspot/share/gc/z/zMark.inline.hpp +++ b/src/hotspot/share/gc/z/zMark.inline.hpp @@ -31,7 +31,7 @@ #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageTable.inline.hpp" #include "gc/z/zThreadLocalData.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" // Marking before pushing helps reduce mark stack memory usage. However, diff --git a/src/hotspot/share/gc/z/zNMethodTable.cpp b/src/hotspot/share/gc/z/zNMethodTable.cpp index de1d48bed17..4dde10d15d3 100644 --- a/src/hotspot/share/gc/z/zNMethodTable.cpp +++ b/src/hotspot/share/gc/z/zNMethodTable.cpp @@ -41,6 +41,7 @@ #include "memory/allocation.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" +#include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp" #include "utilities/powerOfTwo.hpp" diff --git a/src/hotspot/share/gc/z/zThread.cpp b/src/hotspot/share/gc/z/zThread.cpp index 7dc539f4b35..c0a9d5046c4 100644 --- a/src/hotspot/share/gc/z/zThread.cpp +++ b/src/hotspot/share/gc/z/zThread.cpp @@ -23,8 +23,8 @@ #include "precompiled.hpp" #include "gc/z/zThread.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/nonJavaThread.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" THREAD_LOCAL bool ZThread::_initialized; diff --git a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp index 97ff1234123..fcad13ab6c0 100644 --- a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp +++ b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp @@ -28,8 +28,8 @@ #include "gc/z/zThreadLocalAllocBuffer.hpp" #include "gc/z/zValue.inline.hpp" #include "runtime/globals.hpp" +#include "runtime/javaThread.hpp" #include "runtime/stackWatermarkSet.inline.hpp" -#include "runtime/thread.hpp" ZPerWorker* ZThreadLocalAllocBuffer::_stats = NULL; diff --git a/src/hotspot/share/gc/z/zThreadLocalData.hpp b/src/hotspot/share/gc/z/zThreadLocalData.hpp index e7e0b37af1d..f8c362c74ed 100644 --- a/src/hotspot/share/gc/z/zThreadLocalData.hpp +++ b/src/hotspot/share/gc/z/zThreadLocalData.hpp @@ -26,7 +26,7 @@ #include "gc/z/zMarkStack.hpp" #include "gc/z/zGlobals.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" #include "utilities/sizes.hpp" diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp index bdf4d0eb372..689b0ded691 100644 --- a/src/hotspot/share/gc/z/zVerify.cpp +++ b/src/hotspot/share/gc/z/zVerify.cpp @@ -40,11 +40,11 @@ #include "runtime/frame.inline.hpp" #include "runtime/globals.hpp" #include "runtime/handles.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" #include "runtime/stackFrameStream.inline.hpp" #include "runtime/stackWatermark.inline.hpp" #include "runtime/stackWatermarkSet.inline.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/preserveException.hpp" diff --git a/src/hotspot/share/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp index 58e3d41af6b..bdf84b39634 100644 --- a/src/hotspot/share/interpreter/abstractInterpreter.hpp +++ b/src/hotspot/share/interpreter/abstractInterpreter.hpp @@ -31,7 +31,7 @@ #include "interpreter/bytecodes.hpp" #include "oops/method.hpp" #include "runtime/frame.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "runtime/vmThread.hpp" // This file contains the platform-independent parts diff --git a/src/hotspot/share/interpreter/bootstrapInfo.cpp b/src/hotspot/share/interpreter/bootstrapInfo.cpp index 830c015cc39..dfb3525eb37 100644 --- a/src/hotspot/share/interpreter/bootstrapInfo.cpp +++ b/src/hotspot/share/interpreter/bootstrapInfo.cpp @@ -38,7 +38,7 @@ #include "oops/objArrayOop.inline.hpp" #include "oops/typeArrayOop.inline.hpp" #include "runtime/handles.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/vmThread.hpp" //------------------------------------------------------------------------------------------------------------------------ diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp index c32431784aa..36b838c2777 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.hpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp @@ -29,8 +29,8 @@ #include "interpreter/linkResolver.hpp" #include "oops/method.hpp" #include "runtime/frame.hpp" +#include "runtime/javaThread.hpp" #include "runtime/signature.hpp" -#include "runtime/thread.hpp" #include "utilities/macros.hpp" class BufferBlob; diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp index 328b9ae7034..284164c16ff 100644 --- a/src/hotspot/share/interpreter/linkResolver.cpp +++ b/src/hotspot/share/interpreter/linkResolver.cpp @@ -54,11 +54,11 @@ #include "runtime/fieldDescriptor.inline.hpp" #include "runtime/frame.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/reflection.hpp" #include "runtime/safepointVerifiers.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/signature.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmThread.hpp" #include "utilities/macros.hpp" #if INCLUDE_JFR diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp index 6d83ef1fce9..5599a347e8a 100644 --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp @@ -54,9 +54,9 @@ #include "prims/jvmtiRedefineClasses.hpp" #include "prims/jvmtiThreadState.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/exceptions.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/growableArray.hpp" diff --git a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp index fa8b350aee8..44ea5384589 100644 --- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp +++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp @@ -36,7 +36,7 @@ #include "prims/jvmtiExport.hpp" #include "prims/jvmtiUtil.hpp" #include "runtime/interfaceSupport.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "utilities/exceptions.hpp" static const size_t ERROR_MSG_BUFFER_SIZE = 256; diff --git a/src/hotspot/share/jfr/instrumentation/jfrResolution.cpp b/src/hotspot/share/jfr/instrumentation/jfrResolution.cpp index 50b9bfcbbf7..f187613e24f 100644 --- a/src/hotspot/share/jfr/instrumentation/jfrResolution.cpp +++ b/src/hotspot/share/jfr/instrumentation/jfrResolution.cpp @@ -30,7 +30,7 @@ #include "jfr/instrumentation/jfrResolution.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp" #include "oops/method.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "runtime/vframe.inline.hpp" #ifdef COMPILER1 diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp index 207e03d1e55..a718d897c5d 100644 --- a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp +++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp @@ -45,10 +45,10 @@ #include "runtime/handles.inline.hpp" #include "runtime/fieldDescriptor.inline.hpp" #include "runtime/java.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" #include "runtime/semaphore.inline.hpp" #include "runtime/synchronizer.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" #include "utilities/growableArray.hpp" #include "classfile/vmSymbols.hpp" diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp index a6788b7fcb6..a8e1d4ec099 100644 --- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp @@ -56,9 +56,9 @@ #include "logging/log.hpp" #include "memory/resourceArea.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" -#include "runtime/thread.hpp" #include "utilities/debug.hpp" #ifdef LINUX diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp index b71224c6589..68a2d4de373 100644 --- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp @@ -27,7 +27,7 @@ #include "jfr/jni/jfrJniMethodRegistration.hpp" #include "logging/log.hpp" #include "runtime/interfaceSupport.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.inline.hpp" #include "utilities/exceptions.hpp" JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) { diff --git a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp index ae746de3a90..0915eff531f 100644 --- a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp +++ b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp @@ -37,8 +37,8 @@ #include "oops/typeArrayKlass.hpp" #include "oops/typeArrayOop.inline.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/exceptions.hpp" static Symbol* jvm_upcalls_class_sym = NULL; diff --git a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp index 9a76d3b40d5..037d320c7a1 100644 --- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp @@ -35,8 +35,9 @@ #include "jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp" #include "oops/access.inline.hpp" #include "oops/oop.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/synchronizer.hpp" -#include "runtime/thread.hpp" +#include "runtime/threads.hpp" #include "services/management.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp index aa8f6a098b6..2fee9671d5e 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp @@ -36,8 +36,8 @@ #include "memory/resourceArea.hpp" #include "oops/markWord.hpp" #include "oops/oop.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmThread.hpp" EventEmitter::EventEmitter(const JfrTicks& start_time, const JfrTicks& end_time) : diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp index 870f5153b91..f0199566c2b 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp @@ -44,9 +44,9 @@ #include "memory/resourceArea.inline.hpp" #include "oops/instanceKlass.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.inline.hpp" const int initial_array_size = 64; diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.cpp index 1bcc4bc57b8..c3b1307b696 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.cpp @@ -32,7 +32,7 @@ #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp" #include "oops/oop.inline.hpp" #include "runtime/fieldDescriptor.inline.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/ostream.hpp" static Symbol* symbol_size = NULL; diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp index cf611d299dc..62ea206960a 100644 --- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp +++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp @@ -31,7 +31,7 @@ #include "jfr/recorder/service/jfrOptionSet.hpp" #include "logging/log.hpp" #include "memory/iterator.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/vmThread.hpp" bool LeakProfiler::is_running() { diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp index acdf8959213..55002b3ccaf 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp @@ -42,9 +42,9 @@ #include "memory/universe.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/orderAccess.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" // Timestamp of when the gc last processed the set of sampled objects. // Atomic access to prevent word tearing on 32-bit platforms. diff --git a/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.cpp b/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.cpp index 78970935016..d292173ba10 100644 --- a/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.cpp +++ b/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.cpp @@ -31,8 +31,8 @@ #include "jfr/support/jfrSymbolTable.hpp" #include "jfr/utilities/jfrTime.hpp" #include "jfr/utilities/jfrTypes.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.inline.hpp" #include "services/finalizerService.hpp" static void send_event(const FinalizerEntry* fe, const InstanceKlass* ik, const JfrTicks& timestamp, Thread* thread) { diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp index b6232756298..34475cc3430 100644 --- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp +++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp @@ -58,6 +58,7 @@ #include "runtime/os.hpp" #include "runtime/os_perf.hpp" #include "runtime/thread.inline.hpp" +#include "runtime/threads.hpp" #include "runtime/sweeper.hpp" #include "runtime/vmThread.hpp" #include "runtime/vm_version.hpp" diff --git a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.cpp b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.cpp index 367bc0847f5..f9e9c537fd8 100644 --- a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.cpp +++ b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.cpp @@ -29,8 +29,8 @@ #include "jfr/utilities/jfrThreadIterator.hpp" #include "jfr/utilities/jfrTime.hpp" #include "utilities/globalDefinitions.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" jlong JfrThreadCPULoadEvent::get_wallclock_time() { return os::javaTimeNanos(); diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp index c822c1be1a0..f040b8381fc 100644 --- a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp +++ b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp @@ -30,9 +30,9 @@ #include "jfr/utilities/jfrTypes.hpp" #include "oops/method.hpp" #include "runtime/javaCalls.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/frame.inline.hpp" #include "runtime/registerMap.hpp" -#include "runtime/thread.inline.hpp" bool JfrGetCallTrace::find_top_frame(frame& top_frame, Method** method, frame& first_frame) { assert(top_frame.cb() != NULL, "invariant"); diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp index 3cf61839a77..28fbd9d5bf6 100644 --- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp +++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp @@ -36,9 +36,9 @@ #include "jfrfiles/jfrEventClasses.hpp" #include "logging/log.hpp" #include "runtime/frame.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "runtime/os.hpp" #include "runtime/semaphore.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/threadSMR.hpp" enum JfrSampleType { diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.cpp index 135fc64bd9d..17ed2653525 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.cpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.cpp @@ -32,7 +32,7 @@ #include "oops/oop.inline.hpp" #include "oops/typeArrayOop.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "utilities/exceptions.hpp" static jbyteArray metadata_blob = NULL; diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.cpp index 5c2576f3b81..c0379e61377 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.cpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.cpp @@ -28,8 +28,8 @@ #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp" #include "jfr/support/jfrThreadLocal.hpp" #include "jvmtifiles/jvmti.h" +#include "runtime/javaThread.hpp" #include "runtime/osThread.hpp" -#include "runtime/thread.hpp" struct jvmti_thread_state { u8 id; diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp index 5803d84605e..b75e70247b7 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp @@ -47,11 +47,11 @@ #include "memory/universe.hpp" #include "oops/compressedOops.hpp" #include "runtime/flags/jvmFlag.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/osThread.hpp" #include "runtime/safepoint.hpp" #include "runtime/synchronizer.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmOperations.hpp" #ifdef COMPILER2 diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp index 472712a875e..913d13b78f4 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp @@ -34,8 +34,8 @@ #include "jfr/utilities/jfrIterator.hpp" #include "jfr/utilities/jfrLinkedList.inline.hpp" #include "memory/resourceArea.hpp" +#include "runtime/javaThread.hpp" #include "runtime/semaphore.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/macros.hpp" class JfrSerializerRegistration : public JfrCHeapObj { diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp index 2ef989c0481..abb46b975ac 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp @@ -33,8 +33,8 @@ #include "oops/oop.inline.hpp" #include "prims/jvmtiThreadState.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/jniHandles.inline.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vm_version.hpp" #include "utilities/growableArray.hpp" diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp index b9a13e76140..b1b9460cf62 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp @@ -33,7 +33,7 @@ #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp" #include "jfr/support/jfrKlassExtension.hpp" #include "oops/klass.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.inline.hpp" #include "utilities/debug.hpp" inline traceid JfrTraceId::load(const Klass* klass) { diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.cpp index f5e3612f254..71beedbf003 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.cpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.cpp @@ -27,7 +27,7 @@ #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdKlassQueue.hpp" #include "jfr/support/jfrThreadLocal.hpp" #include "jfr/utilities/jfrEpochQueue.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" // The queue instance used by the load barrier to enqueue tagged Klass'es. diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp index 9b7ddcd1273..78ad76269ce 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp @@ -35,7 +35,7 @@ #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp" #include "oops/klass.hpp" #include "oops/method.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" inline bool is_not_tagged(traceid value) { diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp index 7f4314867a7..ad95adb7d93 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp @@ -35,9 +35,9 @@ #include "runtime/arguments.hpp" #include "runtime/atomic.hpp" #include "runtime/globals.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/growableArray.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp b/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp index 234e0ed0953..1bfc1a0242a 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp @@ -32,9 +32,9 @@ #include "jfr/recorder/service/jfrPostBox.hpp" #include "logging/log.hpp" #include "memory/resourceArea.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutex.hpp" #include "runtime/os.hpp" -#include "runtime/thread.inline.hpp" static JfrRepository* _instance = NULL; diff --git a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp index 3a8562d25de..60ac9ca9da2 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp @@ -31,7 +31,7 @@ #include "jfr/utilities/jfrTime.hpp" #include "jfr/utilities/jfrTypes.hpp" #include "jfr/writers/jfrNativeEventWriter.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" #include "utilities/exceptions.hpp" #include "utilities/ticks.hpp" #ifdef ASSERT diff --git a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp index b91851d0f11..bcb701c354e 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp +++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp @@ -33,7 +33,7 @@ #include "memory/allocation.inline.hpp" #include "memory/resourceArea.hpp" #include "runtime/java.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "services/diagnosticArgument.hpp" #include "services/diagnosticFramework.hpp" #include "utilities/growableArray.hpp" diff --git a/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp b/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp index 4001e51f5b0..c4cb226c314 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp +++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp @@ -28,7 +28,7 @@ #include "runtime/atomic.hpp" #include "runtime/handles.hpp" #include "runtime/interfaceSupport.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #define MSG_IS_SYNCHRONOUS ( (MSGBIT(MSG_ROTATE)) | \ (MSGBIT(MSG_STOP)) | \ diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp index 43b3bbc4a54..bc5c1a4f93e 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp +++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp @@ -47,10 +47,10 @@ #include "logging/log.hpp" #include "runtime/atomic.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.inline.hpp" #include "runtime/vmOperations.hpp" #include "runtime/vmThread.hpp" diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp index e4b615be81a..25baddc9372 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp +++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp @@ -33,7 +33,7 @@ #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "runtime/handles.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "utilities/preserveException.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp index 1145b3c21b8..b46bae370e3 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp +++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp @@ -32,8 +32,8 @@ #include "logging/log.hpp" #include "runtime/handles.hpp" #include "runtime/interfaceSupport.inline.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" -#include "runtime/thread.inline.hpp" // // Entry point for "JFR Recorder Thread" message loop. diff --git a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp index 2e1c8c600a2..1471be963f0 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp @@ -24,7 +24,7 @@ #include "precompiled.hpp" #include "jfr/recorder/storage/jfrBuffer.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" static const u1* const TOP_CRITICAL_SECTION = NULL; diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp index 512d2ad8ab0..f03f0a963d4 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp @@ -40,9 +40,9 @@ #include "jfr/utilities/jfrTime.hpp" #include "jfr/writers/jfrNativeEventWriter.hpp" #include "logging/log.hpp" +#include "runtime/javaThread.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.hpp" typedef JfrStorage::BufferPtr BufferPtr; diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp index 0ac44944bdd..e7a93baf9a5 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp @@ -29,7 +29,7 @@ #include "jfr/recorder/repository/jfrChunkWriter.hpp" #include "jfr/utilities/jfrAllocation.hpp" #include "jfr/utilities/jfrTypes.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" class CompositeOperationOr { public: diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp index 4ed8000d182..e96ca735552 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp @@ -28,7 +28,7 @@ #include "jfr/recorder/storage/jfrStorageUtils.hpp" #include "runtime/atomic.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" template inline bool UnBufferedWriteToChunk::write(T* t, const u1* data, size_t size) { diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp index 7001f0f0a02..fa1471e808b 100644 --- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp +++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp @@ -36,8 +36,8 @@ #include "jfr/utilities/jfrTypes.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/safepoint.hpp" -#include "runtime/thread.inline.hpp" typedef JfrStringPool::BufferPtr BufferPtr; diff --git a/src/hotspot/share/jfr/support/jfrAllocationTracer.cpp b/src/hotspot/share/jfr/support/jfrAllocationTracer.cpp index 5e358d100f2..8d56be89c13 100644 --- a/src/hotspot/share/jfr/support/jfrAllocationTracer.cpp +++ b/src/hotspot/share/jfr/support/jfrAllocationTracer.cpp @@ -26,7 +26,7 @@ #include "jfr/leakprofiler/leakProfiler.hpp" #include "jfr/support/jfrAllocationTracer.hpp" #include "jfr/support/jfrObjectAllocationSample.hpp" -#include "runtime/thread.hpp" +#include "runtime/javaThread.hpp" JfrAllocationTracer::JfrAllocationTracer(const Klass* klass, HeapWord* obj, size_t alloc_size, bool outside_tlab, JavaThread* thread) { if (LeakProfiler::is_running()) { diff --git a/src/hotspot/share/jfr/support/jfrFlush.cpp b/src/hotspot/share/jfr/support/jfrFlush.cpp index 8704b4b2554..38c4ec1821b 100644 --- a/src/hotspot/share/jfr/support/jfrFlush.cpp +++ b/src/hotspot/share/jfr/support/jfrFlush.cpp @@ -28,7 +28,7 @@ #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp" #include "jfr/support/jfrFlush.hpp" #include "jfr/support/jfrThreadLocal.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "utilities/debug.hpp" JfrFlush::JfrFlush(JfrStorage::BufferPtr old, size_t used, size_t requested, Thread* thread) : diff --git a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp index 6c57030baca..c13a5884007 100644 --- a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp +++ b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp @@ -34,7 +34,7 @@ #include "oops/instanceKlass.hpp" #include "oops/klass.inline.hpp" #include "runtime/handles.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" #include "utilities/stack.inline.hpp" static jobject empty_java_util_arraylist = NULL; diff --git a/src/hotspot/share/jfr/support/jfrStackTraceMark.cpp b/src/hotspot/share/jfr/support/jfrStackTraceMark.cpp index b7a2f1d6410..a5450f61646 100644 --- a/src/hotspot/share/jfr/support/jfrStackTraceMark.cpp +++ b/src/hotspot/share/jfr/support/jfrStackTraceMark.cpp @@ -27,7 +27,7 @@ #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp" #include "jfr/support/jfrStackTraceMark.hpp" #include "jfr/support/jfrThreadLocal.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" JfrStackTraceMark::JfrStackTraceMark() : _t(Thread::current()), _previous_id(0), _previous_hash(0) { JfrThreadLocal* const tl = _t->jfr_thread_local(); diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp index d7f25d3dbbc..19bbe25798c 100644 --- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp +++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp @@ -41,9 +41,9 @@ #include "memory/allocation.inline.hpp" #include "memory/arena.hpp" #include "runtime/atomic.hpp" +#include "runtime/javaThread.hpp" #include "runtime/os.hpp" #include "runtime/threadIdentifier.hpp" -#include "runtime/thread.inline.hpp" #include "utilities/sizes.hpp" JfrThreadLocal::JfrThreadLocal() : diff --git a/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp b/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp index 2d8428c234a..562ac0e77b5 100644 --- a/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp +++ b/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp @@ -28,7 +28,7 @@ #include "jfr/utilities/jfrEpochQueue.hpp" #include "jfr/recorder/storage/jfrEpochStorage.inline.hpp" #include "jfr/recorder/storage/jfrStorageUtils.inline.hpp" -#include "runtime/thread.inline.hpp" +#include "runtime/javaThread.hpp" template