8292267: Clean up synchronizer.hpp

iklam · iklam · commit 7244dd6fab0c · 2022-08-19T17:25:12.000Z
Reviewed-by: coleenp, dcubed, dholmes
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.hpp
@@ -26,8 +26,6 @@
 #ifndef CPU_AARCH64_FRAME_AARCH64_HPP
 #define CPU_AARCH64_FRAME_AARCH64_HPP
 
-#include "runtime/synchronizer.hpp"
-
 // A frame represents a physical stack frame (an activation).  Frames can be
 // C or Java frames, and the Java frames can be interpreted or compiled.
 // In contrast, vframes represent source-level activations, so that one physical frame
diff --git a/src/hotspot/cpu/arm/frame_arm.hpp b/src/hotspot/cpu/arm/frame_arm.hpp
@@ -25,8 +25,6 @@
 #ifndef CPU_ARM_FRAME_ARM_HPP
 #define CPU_ARM_FRAME_ARM_HPP
 
-#include "runtime/synchronizer.hpp"
-
  public:
   enum {
     pc_return_offset                                 =  0,
diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp
@@ -26,8 +26,6 @@
 #ifndef CPU_PPC_FRAME_PPC_HPP
 #define CPU_PPC_FRAME_PPC_HPP
 
-#include "runtime/synchronizer.hpp"
-
   //  C frame layout on PPC-64.
   //
   //  In this figure the stack grows upwards, while memory grows
diff --git a/src/hotspot/cpu/riscv/frame_riscv.hpp b/src/hotspot/cpu/riscv/frame_riscv.hpp
@@ -26,8 +26,6 @@
 #ifndef CPU_RISCV_FRAME_RISCV_HPP
 #define CPU_RISCV_FRAME_RISCV_HPP
 
-#include "runtime/synchronizer.hpp"
-
 // A frame represents a physical stack frame (an activation).  Frames can be
 // C or Java frames, and the Java frames can be interpreted or compiled.
 // In contrast, vframes represent source-level activations, so that one physical frame
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -28,8 +28,6 @@
 #ifndef CPU_S390_FRAME_S390_HPP
 #define CPU_S390_FRAME_S390_HPP
 
-#include "runtime/synchronizer.hpp"
-
   //  C frame layout on ZARCH_64.
   //
   //  In this figure the stack grows upwards, while memory grows
diff --git a/src/hotspot/cpu/x86/frame_x86.hpp b/src/hotspot/cpu/x86/frame_x86.hpp
@@ -25,8 +25,6 @@
 #ifndef CPU_X86_FRAME_X86_HPP
 #define CPU_X86_FRAME_X86_HPP
 
-#include "runtime/synchronizer.hpp"
-
 // A frame represents a physical stack frame (an activation).  Frames can be
 // C or Java frames, and the Java frames can be interpreted or compiled.
 // In contrast, vframes represent source-level activations, so that one physical frame
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -76,6 +76,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
+#include "runtime/synchronizer.hpp"
 #include "services/classLoadingService.hpp"
 #include "services/diagnosticCommand.hpp"
 #include "services/finalizerService.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPadding.hpp
@@ -25,6 +25,8 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP
 
+#include "memory/padded.hpp"
+
 // 64 bytes is enough to cover all existing architectures. If we have some
 // other platforms, we would need to provide the architecture-specific
 // versions here. Shared code provides DEFAULT_CACHE_LINE_SIZE, which is
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -54,6 +54,7 @@
 #include "runtime/mutex.hpp"
 #include "runtime/reflectionUtils.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "runtime/synchronizer.hpp"
 #if INCLUDE_G1GC
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #endif // INCLUDE_G1GC
diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
@@ -35,6 +35,7 @@
 #include "oops/verifyOopClosure.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/macros.hpp"
 
 void oopDesc::print_on(outputStream* st) const {
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
@@ -71,6 +71,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stackWatermarkSet.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vframe.hpp"
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
@@ -87,6 +87,7 @@
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vmOperations.hpp"
 #include "services/memTracker.hpp"
diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
@@ -47,8 +47,8 @@ class JvmtiEventControllerPrivate;
 class JvmtiManageCapabilities;
 class JvmtiEnv;
 class JvmtiThreadState;
-
 class OopStorage;
+class ThreadsList;
 
 #define JVMTI_SUPPORT_FLAG(key)                                           \
   private:                                                                \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
@@ -53,6 +53,7 @@
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/vm_version.hpp"
 #include "services/management.hpp"
 #include "services/nmtCommon.hpp"
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
@@ -79,6 +79,7 @@
 #include "runtime/serviceThread.hpp"
 #include "runtime/stackFrameStream.inline.hpp"
 #include "runtime/stackWatermarkSet.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/threadStatisticalInfo.hpp"
diff --git a/src/hotspot/share/runtime/monitorChunk.hpp b/src/hotspot/share/runtime/monitorChunk.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,7 +25,10 @@
 #ifndef SHARE_RUNTIME_MONITORCHUNK_HPP
 #define SHARE_RUNTIME_MONITORCHUNK_HPP
 
-#include "runtime/synchronizer.hpp"
+#include "memory/allocation.hpp"
+
+class BasicObjectLock;
+class OopClosure;
 
 // Data structure for holding monitors for one activation during
 // deoptimization.
diff --git a/src/hotspot/share/runtime/monitorDeflationThread.cpp b/src/hotspot/share/runtime/monitorDeflationThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -32,6 +32,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/monitorDeflationThread.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "runtime/synchronizer.hpp"
 
 void MonitorDeflationThread::initialize() {
   EXCEPTION_MARK;
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
@@ -57,8 +57,14 @@
 #include "utilities/align.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
+#include "utilities/linkedlist.hpp"
 #include "utilities/preserveException.hpp"
 
+class ObjectMonitorsHashtable::PtrList :
+  public LinkedListImpl<ObjectMonitor*,
+                        ResourceObj::C_HEAP, mtThread,
+                        AllocFailStrategy::RETURN_NULL> {};
+
 class CleanupObjectMonitorsHashtable: StackObj {
  public:
   bool do_entry(void*& key, ObjectMonitorsHashtable::PtrList*& list) {
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
@@ -29,10 +29,9 @@
 #include "oops/markWord.hpp"
 #include "runtime/basicLock.hpp"
 #include "runtime/handles.hpp"
-#include "utilities/growableArray.hpp"
-#include "utilities/linkedlist.hpp"
 #include "utilities/resourceHash.hpp"
 
+template <typename T> class GrowableArray;
 class LogStream;
 class ObjectMonitor;
 class ThreadsList;
@@ -49,15 +48,13 @@ class ObjectMonitorsHashtable {
   }
 
  public:
-  typedef LinkedListImpl<ObjectMonitor*,
-                         ResourceObj::C_HEAP, mtThread,
-                         AllocFailStrategy::RETURN_NULL> PtrList;
+  class PtrList;
 
+ private:
   // ResourceHashtable SIZE is specified at compile time so we
   // use 1031 which is the first prime after 1024.
   typedef ResourceHashtable<void*, PtrList*, 1031, ResourceObj::C_HEAP, mtThread,
                             &ObjectMonitorsHashtable::ptr_hash> PtrTable;
- private:
   PtrTable* _ptrs;
   size_t _key_count;
   size_t _om_count;
diff --git a/src/hotspot/share/runtime/vmOperations.hpp b/src/hotspot/share/runtime/vmOperations.hpp
@@ -30,6 +30,8 @@
 #include "runtime/vmOperation.hpp"
 #include "runtime/threadSMR.hpp"
 
+class ObjectMonitorsHashtable;
+
 // A hodge podge of commonly used VM Operations
 
 class VM_EmptyOperation : public VM_Operation {
diff --git a/src/hotspot/share/services/threadService.hpp b/src/hotspot/share/services/threadService.hpp
@@ -37,13 +37,14 @@
 #include "runtime/threadSMR.hpp"
 #include "services/management.hpp"
 
+class DeadlockCycle;
+class ObjectMonitorsHashtable;
 class OopClosure;
-class ThreadDumpResult;
-class ThreadStackTrace;
-class ThreadSnapshot;
 class StackFrameInfo;
 class ThreadConcurrentLocks;
-class DeadlockCycle;
+class ThreadDumpResult;
+class ThreadSnapshot;
+class ThreadStackTrace;
 
 // VM monitoring and management support for the thread and
 // synchronization subsystem
