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

rev 13232 : imported patch parallel-fullgc-stefanj
rev 13237 : imported patch 8183226-periodic-rem-set-summary-accesses-uninitialized-stuff
rev 13238 : imported patch 8183226-eridk-sjohanss-review
rev 13240 : imported patch 8183128-cleanup-refinecardtableentryclosure
rev 13241 : imported patch 8183128-erikd-review
rev 13243 : [mq]: 8183121-add-information-about-scanned-skipped-cards-during-updaters

*** 3122,3132 ****
          // This timing is only used by the ergonomics to handle our pause target.
          // It is unclear why this should not include the full pause. We will
          // investigate this in CR 7178365.
          double sample_end_time_sec = os::elapsedTime();
          double pause_time_ms = (sample_end_time_sec - sample_start_time_sec) * MILLIUNITS;
!         size_t total_cards_scanned = g1_policy()->phase_times()->sum_thread_work_items(G1GCPhaseTimes::ScanRS, G1GCPhaseTimes::ScannedCards);
          g1_policy()->record_collection_pause_end(pause_time_ms, total_cards_scanned, heap_used_bytes_before_gc);
  
          evacuation_info.set_collectionset_used_before(collection_set()->bytes_used_before());
          evacuation_info.set_bytes_copied(g1_policy()->bytes_copied_during_gc());
  
--- 3122,3132 ----
          // This timing is only used by the ergonomics to handle our pause target.
          // It is unclear why this should not include the full pause. We will
          // investigate this in CR 7178365.
          double sample_end_time_sec = os::elapsedTime();
          double pause_time_ms = (sample_end_time_sec - sample_start_time_sec) * MILLIUNITS;
!         size_t total_cards_scanned = g1_policy()->phase_times()->sum_thread_work_items(G1GCPhaseTimes::ScanRS, G1GCPhaseTimes::ScanRSScannedCards);
          g1_policy()->record_collection_pause_end(pause_time_ms, total_cards_scanned, heap_used_bytes_before_gc);
  
          evacuation_info.set_collectionset_used_before(collection_set()->bytes_used_before());
          evacuation_info.set_bytes_copied(g1_policy()->bytes_copied_during_gc());