src/hotspot/share/gc/g1/g1CollectedHeap.cpp

*** 1781,1791 ****
    _full_gc_memory_manager.add_pool(_survivor_pool);
    _full_gc_memory_manager.add_pool(_old_pool);
  
    _memory_manager.add_pool(_eden_pool);
    _memory_manager.add_pool(_survivor_pool);
! 
  }
  
  void G1CollectedHeap::stop() {
    // Stop all concurrent threads. We do this to make sure these threads
    // do not continue to execute and access resources (e.g. logging)
--- 1781,1791 ----
    _full_gc_memory_manager.add_pool(_survivor_pool);
    _full_gc_memory_manager.add_pool(_old_pool);
  
    _memory_manager.add_pool(_eden_pool);
    _memory_manager.add_pool(_survivor_pool);
!   _memory_manager.add_pool(_old_pool, false /* always_affected_by_gc */);
  }
  
  void G1CollectedHeap::stop() {
    // Stop all concurrent threads. We do this to make sure these threads
    // do not continue to execute and access resources (e.g. logging)
*** 2912,2922 ****
                                                                    Threads::number_of_non_daemon_threads());
      workers()->update_active_workers(active_workers);
      log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());
  
      TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
!     TraceMemoryManagerStats tms(&_memory_manager, gc_cause());
  
      // If the secondary_free_list is not empty, append it to the
      // free_list. No need to wait for the cleanup operation to finish;
      // the region allocation code will check the secondary_free_list
      // and wait if necessary. If the G1StressConcRegionFreeing flag is
--- 2912,2922 ----
                                                                    Threads::number_of_non_daemon_threads());
      workers()->update_active_workers(active_workers);
      log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());
  
      TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
!     TraceMemoryManagerStats tms(&_memory_manager, gc_cause(), collector_state()->yc_type() == Mixed /* allMemoryPoolsAffected */);
  
      // If the secondary_free_list is not empty, append it to the
      // free_list. No need to wait for the cleanup operation to finish;
      // the region allocation code will check the secondary_free_list
      // and wait if necessary. If the G1StressConcRegionFreeing flag is