src/share/vm/gc/g1/g1CollectorPolicy.cpp

*** 855,865 ****
    double elapsed_time_ms = (end_time_sec - _mark_remark_start_sec)*1000.0;
    _concurrent_mark_remark_times_ms->add(elapsed_time_ms);
    _cur_mark_stop_world_time_ms += elapsed_time_ms;
    _prev_collection_pause_end_ms += elapsed_time_ms;
  
!   _mmu_tracker->add_pause(_mark_remark_start_sec, end_time_sec, _g1->gc_tracer_cm()->gc_id());
  }
  
  void G1CollectorPolicy::record_concurrent_mark_cleanup_start() {
    _mark_cleanup_start_sec = os::elapsedTime();
  }
--- 855,865 ----
    double elapsed_time_ms = (end_time_sec - _mark_remark_start_sec)*1000.0;
    _concurrent_mark_remark_times_ms->add(elapsed_time_ms);
    _cur_mark_stop_world_time_ms += elapsed_time_ms;
    _prev_collection_pause_end_ms += elapsed_time_ms;
  
!   _mmu_tracker->add_pause(_mark_remark_start_sec, end_time_sec);
  }
  
  void G1CollectorPolicy::record_concurrent_mark_cleanup_start() {
    _mark_cleanup_start_sec = os::elapsedTime();
  }
*** 950,961 ****
      // pause we decided to start a cycle but at the beginning of
      // this pause we decided to postpone it. That's OK.
      collector_state()->set_initiate_conc_mark_if_possible(true);
    }
  
!   _mmu_tracker->add_pause(end_time_sec - pause_time_ms/1000.0,
!                           end_time_sec, _g1->gc_tracer_stw()->gc_id());
  
    if (update_stats) {
      _trace_young_gen_time_data.record_end_collection(pause_time_ms, phase_times());
      // this is where we update the allocation rate of the application
      double app_time_ms =
--- 950,960 ----
      // pause we decided to start a cycle but at the beginning of
      // this pause we decided to postpone it. That's OK.
      collector_state()->set_initiate_conc_mark_if_possible(true);
    }
  
!   _mmu_tracker->add_pause(end_time_sec - pause_time_ms/1000.0, end_time_sec);
  
    if (update_stats) {
      _trace_young_gen_time_data.record_end_collection(pause_time_ms, phase_times());
      // this is where we update the allocation rate of the application
      double app_time_ms =
*** 1582,1592 ****
    double end_sec = os::elapsedTime();
    double elapsed_time_ms = (end_sec - _mark_cleanup_start_sec) * 1000.0;
    _concurrent_mark_cleanup_times_ms->add(elapsed_time_ms);
    _cur_mark_stop_world_time_ms += elapsed_time_ms;
    _prev_collection_pause_end_ms += elapsed_time_ms;
!   _mmu_tracker->add_pause(_mark_cleanup_start_sec, end_sec, _g1->gc_tracer_cm()->gc_id());
  }
  
  // Add the heap region at the head of the non-incremental collection set
  void G1CollectorPolicy::add_old_region_to_cset(HeapRegion* hr) {
    assert(_inc_cset_build_state == Active, "Precondition");
--- 1581,1591 ----
    double end_sec = os::elapsedTime();
    double elapsed_time_ms = (end_sec - _mark_cleanup_start_sec) * 1000.0;
    _concurrent_mark_cleanup_times_ms->add(elapsed_time_ms);
    _cur_mark_stop_world_time_ms += elapsed_time_ms;
    _prev_collection_pause_end_ms += elapsed_time_ms;
!   _mmu_tracker->add_pause(_mark_cleanup_start_sec, end_sec);
  }
  
  // Add the heap region at the head of the non-incremental collection set
  void G1CollectorPolicy::add_old_region_to_cset(HeapRegion* hr) {
    assert(_inc_cset_build_state == Active, "Precondition");