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

rev 56302 : [mq]: 8231189-worker_i-renamings

*** 837,854 ****
    }
  
  public:
    G1ScanCollectionSetRegionClosure(G1RemSetScanState* scan_state,
                                     G1ParScanThreadState* pss,
!                                    uint worker_i,
                                     G1GCPhaseTimes::GCParPhases scan_phase,
                                     G1GCPhaseTimes::GCParPhases code_roots_phase) :
      _pss(pss),
      _scan_state(scan_state),
      _scan_phase(scan_phase),
      _code_roots_phase(code_roots_phase),
!     _worker_id(worker_i),
      _opt_refs_scanned(0),
      _opt_refs_memory_used(0),
      _strong_code_root_scan_time(),
      _strong_code_trim_partially_time(),
      _rem_set_opt_root_scan_time(),
--- 837,854 ----
    }
  
  public:
    G1ScanCollectionSetRegionClosure(G1RemSetScanState* scan_state,
                                     G1ParScanThreadState* pss,
!                                    uint worker_id,
                                     G1GCPhaseTimes::GCParPhases scan_phase,
                                     G1GCPhaseTimes::GCParPhases code_roots_phase) :
      _pss(pss),
      _scan_state(scan_state),
      _scan_phase(scan_phase),
      _code_roots_phase(code_roots_phase),
!     _worker_id(worker_id),
      _opt_refs_scanned(0),
      _opt_refs_memory_used(0),
      _strong_code_root_scan_time(),
      _strong_code_trim_partially_time(),
      _rem_set_opt_root_scan_time(),
*** 1059,1069 ****
    public:
      G1MergeLogBufferCardsClosure(G1CollectedHeap* g1h, G1RemSetScanState* scan_state) :
        _scan_state(scan_state), _ct(g1h->card_table()), _cards_dirty(0), _cards_skipped(0)
      {}
  
!     void do_card_ptr(CardValue* card_ptr, uint worker_i) {
        // The only time we care about recording cards that
        // contain references that point into the collection set
        // is during RSet updating within an evacuation pause.
        // In this case worker_id should be the id of a GC worker thread.
        assert(SafepointSynchronize::is_at_safepoint(), "not during an evacuation pause");
--- 1059,1069 ----
    public:
      G1MergeLogBufferCardsClosure(G1CollectedHeap* g1h, G1RemSetScanState* scan_state) :
        _scan_state(scan_state), _ct(g1h->card_table()), _cards_dirty(0), _cards_skipped(0)
      {}
  
!     void do_card_ptr(CardValue* card_ptr, uint worker_id) {
        // The only time we care about recording cards that
        // contain references that point into the collection set
        // is during RSet updating within an evacuation pause.
        // In this case worker_id should be the id of a GC worker thread.
        assert(SafepointSynchronize::is_at_safepoint(), "not during an evacuation pause");
*** 1261,1271 ****
           g1h->addr_to_region(ct->addr_for(card_ptr)));
  #endif
  }
  
  void G1RemSet::refine_card_concurrently(CardValue* card_ptr,
!                                         uint worker_i) {
    assert(!_g1h->is_gc_active(), "Only call concurrently");
  
    // Construct the region representing the card.
    HeapWord* start = _ct->addr_for(card_ptr);
    // And find the region containing it.
--- 1261,1271 ----
           g1h->addr_to_region(ct->addr_for(card_ptr)));
  #endif
  }
  
  void G1RemSet::refine_card_concurrently(CardValue* card_ptr,
!                                         uint worker_id) {
    assert(!_g1h->is_gc_active(), "Only call concurrently");
  
    // Construct the region representing the card.
    HeapWord* start = _ct->addr_for(card_ptr);
    // And find the region containing it.
*** 1373,1383 ****
    // a card beyond the heap.
    HeapWord* end = start + G1CardTable::card_size_in_words;
    MemRegion dirty_region(start, MIN2(scan_limit, end));
    assert(!dirty_region.is_empty(), "sanity");
  
!   G1ConcurrentRefineOopClosure conc_refine_cl(_g1h, worker_i);
    if (r->oops_on_memregion_seq_iterate_careful<false>(dirty_region, &conc_refine_cl) != NULL) {
      _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
      return;
    }
  
--- 1373,1383 ----
    // a card beyond the heap.
    HeapWord* end = start + G1CardTable::card_size_in_words;
    MemRegion dirty_region(start, MIN2(scan_limit, end));
    assert(!dirty_region.is_empty(), "sanity");
  
!   G1ConcurrentRefineOopClosure conc_refine_cl(_g1h, worker_id);
    if (r->oops_on_memregion_seq_iterate_careful<false>(dirty_region, &conc_refine_cl) != NULL) {
      _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
      return;
    }