RFR: 8183122: Rename RefineRecordRefsIntoCSCardTableEntryClosure to G1RefineCardClosure

[Erik Helin]

On 06/28/2017 02:41 PM, Thomas Schatzl wrote:
> On Wed, 2017-06-28 at 14:26 +0200, Erik Helin wrote:
>> Hi all,
>>
>> please see the below inlined patch that just renames
>> RefineRecordRefsIntoCSCardTableEntryClosure to more sensible
>> G1RefineCardClosure.
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8183122
>> Testing: make hotspot
>
>   it's a bit hard to read (an attachment would have been better imho),
> but... looks good :)

Yeah, I wasn't sure if this list accepted attachments :/ Anyways, thanks 
for reviewing!

Erik

> Thomas
>
>>
>> Thanks,
>> Erik
>>
>> # HG changeset patch
>> # User ehelin
>> # Date 1498652248 -7200
>> #      Wed Jun 28 14:17:28 2017 +0200
>> # Node ID f6b845d54277ff9232578fee4ba9f80c85aab0ac
>> # Parent  46d3ce319f37d2996fb0393a4f54f7759148bd1d
>> 8183122: Rename RefineRecordRefsIntoCSCardTableEntryClosure to
>> G1RefineCardClosure
>>
>> diff -r 46d3ce319f37 -r f6b845d54277 src/share/vm/gc/g1/g1RemSet.cpp
>> --- a/src/share/vm/gc/g1/g1RemSet.cpp   Wed Jun 28 12:11:55 2017
>> +0200
>> +++ b/src/share/vm/gc/g1/g1RemSet.cpp   Wed Jun 28 14:17:28 2017
>> +0200
>> @@ -438,15 +438,14 @@
>>   // Closure used for updating RSets and recording references that
>>   // point into the collection set. Only called during an
>>   // evacuation pause.
>> -
>> -class RefineRecordRefsIntoCSCardTableEntryClosure: public
>> CardTableEntryClosure {
>> +class G1RefineCardClosure: public CardTableEntryClosure {
>>     G1RemSet* _g1rs;
>>     DirtyCardQueue* _into_cset_dcq;
>>     G1ScanObjsDuringUpdateRSClosure* _update_rs_cl;
>>   public:
>> -  RefineRecordRefsIntoCSCardTableEntryClosure(G1CollectedHeap* g1h,
>> -                                              DirtyCardQueue*
>> into_cset_dcq,
>> -
>> G1ScanObjsDuringUpdateRSClosure* update_rs_cl) :
>> +  G1RefineCardClosure(G1CollectedHeap* g1h,
>> +                      DirtyCardQueue* into_cset_dcq,
>> +                      G1ScanObjsDuringUpdateRSClosure* update_rs_cl)
>> :
>>       _g1rs(g1h->g1_rem_set()), _into_cset_dcq(into_cset_dcq),
>> _update_rs_cl(update_rs_cl)
>>     {}
>>
>> @@ -474,16 +473,16 @@
>>                                 G1ParScanThreadState* pss,
>>                                 uint worker_i) {
>>     G1ScanObjsDuringUpdateRSClosure update_rs_cl(_g1, pss, worker_i);
>> -  RefineRecordRefsIntoCSCardTableEntryClosure
>> into_cset_update_rs_cl(_g1, into_cset_dcq, &update_rs_cl);
>> +  G1RefineCardClosure refine_card_cl(_g1, into_cset_dcq,
>> &update_rs_cl);
>>
>>     G1GCParPhaseTimesTracker x(_g1p->phase_times(),
>> G1GCPhaseTimes::UpdateRS, worker_i);
>>     if (G1HotCardCache::default_use_cache()) {
>>       // Apply the closure to the entries of the hot card cache.
>>       G1GCParPhaseTimesTracker y(_g1p->phase_times(),
>> G1GCPhaseTimes::ScanHCC, worker_i);
>> -    _g1->iterate_hcc_closure(&into_cset_update_rs_cl, worker_i);
>> +    _g1->iterate_hcc_closure(&refine_card_cl, worker_i);
>>     }
>>     // Apply the closure to all remaining log entries.
>> -  _g1->iterate_dirty_card_closure(&into_cset_update_rs_cl,
>> worker_i);
>> +  _g1->iterate_dirty_card_closure(&refine_card_cl, worker_i);
>>   }
>>
>>   void G1RemSet::cleanupHRRS() {