--- old/src/hotspot/share/runtime/synchronizer.hpp 2020-07-13 15:31:54.000000000 -0400 +++ new/src/hotspot/share/runtime/synchronizer.hpp 2020-07-13 15:31:53.000000000 -0400 @@ -42,14 +42,6 @@ typedef PaddedEnd PaddedObjectMonitor; -struct DeflateMonitorCounters { - volatile int n_in_use; // currently associated with objects - volatile int n_in_circulation; // extant - volatile int n_scavenged; // reclaimed (global and per-thread) - volatile int per_thread_scavenged; // per-thread scavenge total - double per_thread_times; // per-thread scavenge times -}; - class ObjectSynchronizer : AllStatic { friend class VMStructs; public: @@ -131,20 +123,11 @@ // GC: we current use aggressive monitor deflation policy // Basically we deflate all monitors that are not busy. // An adaptive profile-based deflation policy could be used if needed - static void deflate_idle_monitors(DeflateMonitorCounters* counters); static void deflate_idle_monitors_using_JT(); static void deflate_global_idle_monitors_using_JT(); static void deflate_per_thread_idle_monitors_using_JT(JavaThread* target); static void deflate_common_idle_monitors_using_JT(bool is_global, JavaThread* target); - static void deflate_thread_local_monitors(Thread* thread, DeflateMonitorCounters* counters); - static void prepare_deflate_idle_monitors(DeflateMonitorCounters* counters); - static void finish_deflate_idle_monitors(DeflateMonitorCounters* counters); - - // For a given monitor list: global or per-thread, deflate idle monitors - static int deflate_monitor_list(ObjectMonitor** list_p, - int* count_p, - ObjectMonitor** free_head_p, - ObjectMonitor** free_tail_p); + // For a given in-use monitor list: global or per-thread, deflate idle // monitors using a JavaThread. static int deflate_monitor_list_using_JT(ObjectMonitor** list_p, @@ -152,14 +135,10 @@ ObjectMonitor** free_head_p, ObjectMonitor** free_tail_p, ObjectMonitor** saved_mid_in_use_p); - static bool deflate_monitor(ObjectMonitor* mid, oop obj, - ObjectMonitor** free_head_p, - ObjectMonitor** free_tail_p); static bool deflate_monitor_using_JT(ObjectMonitor* mid, ObjectMonitor** free_head_p, ObjectMonitor** free_tail_p); static bool is_async_deflation_needed(); - static bool is_safepoint_deflation_needed(); static bool is_async_deflation_requested() { return _is_async_deflation_requested; } static jlong last_async_deflation_time_ns() { return _last_async_deflation_time_ns; } static bool request_deflate_idle_monitors(); // for whitebox test support and VM exit logging @@ -191,7 +170,7 @@ static int log_monitor_list_counts(outputStream * out); static int verify_objmon_isinpool(ObjectMonitor *addr) PRODUCT_RETURN0; - static void do_safepoint_work(DeflateMonitorCounters* counters); + static void do_safepoint_work(); private: friend class SynchronizerTest;