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

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

*** 130,140 ****
  
   public:
    RedirtyLoggedCardTableEntryClosure(G1CollectedHeap* g1h) : G1CardTableEntryClosure(),
      _num_dirtied(0), _g1h(g1h), _g1_ct(g1h->card_table()) { }
  
!   void do_card_ptr(CardValue* card_ptr, uint worker_i) {
      HeapRegion* hr = region_for_card(card_ptr);
  
      // Should only dirty cards in regions that won't be freed.
      if (!will_become_free(hr)) {
        *card_ptr = G1CardTable::dirty_card_val();
--- 130,140 ----
  
   public:
    RedirtyLoggedCardTableEntryClosure(G1CollectedHeap* g1h) : G1CardTableEntryClosure(),
      _num_dirtied(0), _g1h(g1h), _g1_ct(g1h->card_table()) { }
  
!   void do_card_ptr(CardValue* card_ptr, uint worker_id) {
      HeapRegion* hr = region_for_card(card_ptr);
  
      // Should only dirty cards in regions that won't be freed.
      if (!will_become_free(hr)) {
        *card_ptr = G1CardTable::dirty_card_val();
*** 1936,1947 ****
  
  size_t G1CollectedHeap::unused_committed_regions_in_bytes() const {
    return _hrm->total_free_bytes();
  }
  
! void G1CollectedHeap::iterate_hcc_closure(G1CardTableEntryClosure* cl, uint worker_i) {
!   _hot_card_cache->drain(cl, worker_i);
  }
  
  // Computes the sum of the storage used by the various regions.
  size_t G1CollectedHeap::used() const {
    size_t result = _summary_bytes_used + _allocator->used_in_alloc_regions();
--- 1936,1947 ----
  
  size_t G1CollectedHeap::unused_committed_regions_in_bytes() const {
    return _hrm->total_free_bytes();
  }
  
! void G1CollectedHeap::iterate_hcc_closure(G1CardTableEntryClosure* cl, uint worker_id) {
!   _hot_card_cache->drain(cl, worker_id);
  }
  
  // Computes the sum of the storage used by the various regions.
  size_t G1CollectedHeap::used() const {
    size_t result = _summary_bytes_used + _allocator->used_in_alloc_regions();