# HG changeset patch
# User tschatzl
# Date 1563373999 -7200
# Node ID 3504188512e2d40683fede7ee9b276d31c39ec36
# Parent  95706898c3ea8bdf61acd5fb1d6efddff399216a
8227090: G1 does not account the OptMergeRS in cost per card calculation
Reviewed-by: sangheki, kbarrett

diff -r 95706898c3ea -r 3504188512e2 src/hotspot/share/gc/g1/g1Policy.cpp
--- a/src/hotspot/share/gc/g1/g1Policy.cpp	Wed Jul 17 16:33:19 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp	Wed Jul 17 16:33:19 2019 +0200
@@ -685,7 +685,8 @@
       double avg_time_remset_scan = ((average_time_ms(G1GCPhaseTimes::ScanHR) + average_time_ms(G1GCPhaseTimes::OptScanHR)) *
                                      remset_cards_scanned / total_cards_scanned) +
                                      average_time_ms(G1GCPhaseTimes::MergeER) +
-                                     average_time_ms(G1GCPhaseTimes::MergeRS);
+                                     average_time_ms(G1GCPhaseTimes::MergeRS) +
+                                     average_time_ms(G1GCPhaseTimes::OptMergeRS);
 
       cost_per_remset_card_ms = avg_time_remset_scan / remset_cards_scanned;
       _analytics->report_cost_per_remset_card_ms(cost_per_remset_card_ms, this_pause_was_young_only);