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

rev 13167 : imported patch 8179677-rename-conc-refined-cards
rev 13168 : [mq]: 8179677-erik-review

@@ -280,11 +280,11 @@
 G1RemSet::G1RemSet(G1CollectedHeap* g1,
                    CardTableModRefBS* ct_bs,
                    G1HotCardCache* hot_card_cache) :
   _g1(g1),
   _scan_state(new G1RemSetScanState()),
-  _conc_refine_cards(0),
+  _num_conc_refined_cards(0),
   _ct_bs(ct_bs),
   _g1p(_g1->g1_policy()),
   _hot_card_cache(hot_card_cache),
   _prev_period_summary(),
   _into_cset_dirty_card_queue_set(false)

@@ -722,11 +722,11 @@
       DirtyCardQueue* sdcq =
         JavaThread::dirty_card_queue_set().shared_dirty_card_queue();
       sdcq->enqueue(card_ptr);
     }
   } else {
-    _conc_refine_cards++;
+    _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
   }
 }
 
 bool G1RemSet::refine_card_during_gc(jbyte* card_ptr,
                                      G1ScanObjsDuringUpdateRSClosure* update_rs_cl) {

@@ -766,11 +766,10 @@
   update_rs_cl->set_region(r);
   update_rs_cl->reset_has_refs_into_cset();
 
   bool card_processed = r->oops_on_card_seq_iterate_careful<true>(dirty_region, update_rs_cl);
   assert(card_processed, "must be");
-  _conc_refine_cards++;
 
   return update_rs_cl->has_refs_into_cset();
 }
 
 void G1RemSet::print_periodic_summary_info(const char* header, uint period_count) {