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

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

*** 82,92 ****
                                              &_hot_cache[masked_index],
                                              current_ptr);
    return (previous_ptr == current_ptr) ? previous_ptr : card_ptr;
  }
  
! void G1HotCardCache::drain(G1CardTableEntryClosure* cl, uint worker_i) {
    assert(default_use_cache(), "Drain only necessary if we use the hot card cache.");
  
    assert(_hot_cache != NULL, "Logic");
    assert(!use_cache(), "cache should be disabled");
  
--- 82,92 ----
                                              &_hot_cache[masked_index],
                                              current_ptr);
    return (previous_ptr == current_ptr) ? previous_ptr : card_ptr;
  }
  
! void G1HotCardCache::drain(G1CardTableEntryClosure* cl, uint worker_id) {
    assert(default_use_cache(), "Drain only necessary if we use the hot card cache.");
  
    assert(_hot_cache != NULL, "Logic");
    assert(!use_cache(), "cache should be disabled");
  
*** 97,107 ****
      // The current worker has successfully claimed the chunk [start_idx..end_idx)
      end_idx = MIN2(end_idx, _hot_cache_size);
      for (size_t i = start_idx; i < end_idx; i++) {
        CardValue* card_ptr = _hot_cache[i];
        if (card_ptr != NULL) {
!         cl->do_card_ptr(card_ptr, worker_i);
        } else {
          break;
        }
      }
    }
--- 97,107 ----
      // The current worker has successfully claimed the chunk [start_idx..end_idx)
      end_idx = MIN2(end_idx, _hot_cache_size);
      for (size_t i = start_idx; i < end_idx; i++) {
        CardValue* card_ptr = _hot_cache[i];
        if (card_ptr != NULL) {
!         cl->do_card_ptr(card_ptr, worker_id);
        } else {
          break;
        }
      }
    }