# HG changeset patch
# User sjohanss
# Date 1461765752 -7200
# Node ID aee6db99b6c75525f9378690af49a545f7b804ab
# Parent  da14ba2f0cd9536671dd79005d42ef620c1c31c7
8155087: Calculation in other_time_ms() is incorrect
Reviewed-by: tschatzl, ehelin

diff -r da14ba2f0cd9 -r aee6db99b6c7 hotspot/src/share/vm/gc/g1/g1DefaultPolicy.cpp
--- a/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.cpp	Wed Apr 27 16:02:02 2016 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.cpp	Wed Apr 27 16:02:32 2016 +0200
@@ -549,11 +549,7 @@
 }
 
 double G1DefaultPolicy::other_time_ms(double pause_time_ms) const {
-  return pause_time_ms -
-         average_time_ms(G1GCPhaseTimes::UpdateRS) -
-         average_time_ms(G1GCPhaseTimes::ScanRS) -
-         average_time_ms(G1GCPhaseTimes::ObjCopy) -
-         average_time_ms(G1GCPhaseTimes::Termination);
+  return pause_time_ms - phase_times()->cur_collection_par_time_ms();
 }
 
 double G1DefaultPolicy::constant_other_time_ms(double pause_time_ms) const {