src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp

rev 56667 : imported patch 8230706-kim-strong-weak-processing
rev 56669 : imported patch 8228609-used-vs-copied-bytes
rev 56672 : imported patch 8232779-collection-parallel-time-no-optional-evac
rev 56673 : imported patch 8227739-merge-scan-rs-update-rs-cost

@@ -85,11 +85,12 @@
   static const GCParPhases ExtRootScanSubPhasesLast = CMRefRoots;
 
   enum GCMergeRSWorkTimes {
     MergeRSMergedSparse,
     MergeRSMergedFine,
-    MergeRSMergedCoarse
+    MergeRSMergedCoarse,
+    MergeRSDirtyCards
   };
 
   enum GCScanHRWorkItems {
     ScanHRScannedCards,
     ScanHRScannedBlocks,

@@ -121,10 +122,11 @@
   WorkerDataArray<double>* _gc_par_phases[GCParPhasesSentinel];
 
   WorkerDataArray<size_t>* _merge_rs_merged_sparse;
   WorkerDataArray<size_t>* _merge_rs_merged_fine;
   WorkerDataArray<size_t>* _merge_rs_merged_coarse;
+  WorkerDataArray<size_t>* _merge_rs_dirty_cards;
 
   WorkerDataArray<size_t>* _merge_hcc_dirty_cards;
   WorkerDataArray<size_t>* _merge_hcc_skipped_cards;
 
   WorkerDataArray<size_t>* _merge_lb_dirty_cards;

@@ -135,10 +137,11 @@
   WorkerDataArray<size_t>* _scan_hr_claimed_chunks;
 
   WorkerDataArray<size_t>* _opt_merge_rs_merged_sparse;
   WorkerDataArray<size_t>* _opt_merge_rs_merged_fine;
   WorkerDataArray<size_t>* _opt_merge_rs_merged_coarse;
+  WorkerDataArray<size_t>* _opt_merge_rs_dirty_cards;
 
   WorkerDataArray<size_t>* _opt_scan_hr_scanned_cards;
   WorkerDataArray<size_t>* _opt_scan_hr_scanned_blocks;
   WorkerDataArray<size_t>* _opt_scan_hr_claimed_chunks;
   WorkerDataArray<size_t>* _opt_scan_hr_scanned_opt_refs;