src/hotspot/share/runtime/safepoint.cpp

rev 54572 : Checkpoint latest preliminary review patches for full OpenJDK review; merge with 8222295.patch.
rev 54573 : imported patch dcubed.monitor_deflate_conc.v2.01

*** 523,532 ****
--- 523,536 ----
    ParallelSPCleanupThreadClosure(DeflateMonitorCounters* counters) :
      _nmethod_cl(UseCodeAging ? NMethodSweeper::prepare_reset_hotness_counters() : NULL),
      _counters(counters) {}
  
    void do_thread(Thread* thread) {
+     // deflate_thread_local_monitors() handles or requests deflation of
+     // this thread's idle monitors. If !AsyncDeflateIdleMonitors or if
+     // there is a special cleanup request, deflation is handled now.
+     // Otherwise, async deflation is requested via a flag.
      ObjectSynchronizer::deflate_thread_local_monitors(thread, _counters);
      if (_nmethod_cl != NULL && thread->is_Java_thread() &&
          ! thread->is_Code_cache_sweeper_thread()) {
        JavaThread* jt = (JavaThread*) thread;
        jt->nmethods_do(_nmethod_cl);
*** 555,565 ****
  
      if (_subtasks.try_claim_task(SafepointSynchronize::SAFEPOINT_CLEANUP_DEFLATE_MONITORS)) {
        const char* name = "deflating global idle monitors";
        EventSafepointCleanupTask event;
        TraceTime timer(name, TRACETIME_LOG(Info, safepoint, cleanup));
!       ObjectSynchronizer::deflate_idle_monitors(_counters);
  
        post_safepoint_cleanup_task_event(event, safepoint_id, name);
      }
  
      if (_subtasks.try_claim_task(SafepointSynchronize::SAFEPOINT_CLEANUP_UPDATE_INLINE_CACHES)) {
--- 559,573 ----
  
      if (_subtasks.try_claim_task(SafepointSynchronize::SAFEPOINT_CLEANUP_DEFLATE_MONITORS)) {
        const char* name = "deflating global idle monitors";
        EventSafepointCleanupTask event;
        TraceTime timer(name, TRACETIME_LOG(Info, safepoint, cleanup));
!       // AsyncDeflateIdleMonitors only uses DeflateMonitorCounters
!       // when a special cleanup has been requested.
!       // Note: This logging output will include global idle monitor
!       // elapsed times, but not global idle monitor deflation count.
!       ObjectSynchronizer::do_safepoint_work(_counters);
  
        post_safepoint_cleanup_task_event(event, safepoint_id, name);
      }
  
      if (_subtasks.try_claim_task(SafepointSynchronize::SAFEPOINT_CLEANUP_UPDATE_INLINE_CACHES)) {