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

rev 53923 : [mq]: 8219747-remove-g1-prefix

*** 46,56 ****
      _dcq(&g1h->dirty_card_queue_set()),
      _ct(g1h->card_table()),
      _closures(NULL),
      _plab_allocator(NULL),
      _age_table(false),
!     _tenuring_threshold(g1h->g1_policy()->tenuring_threshold()),
      _scanner(g1h, this),
      _worker_id(worker_id),
      _stack_trim_upper_threshold(GCDrainStackTargetSize * 2 + 1),
      _stack_trim_lower_threshold(GCDrainStackTargetSize),
      _trim_ticks(),
--- 46,56 ----
      _dcq(&g1h->dirty_card_queue_set()),
      _ct(g1h->card_table()),
      _closures(NULL),
      _plab_allocator(NULL),
      _age_table(false),
!     _tenuring_threshold(g1h->policy()->tenuring_threshold()),
      _scanner(g1h, this),
      _worker_id(worker_id),
      _stack_trim_upper_threshold(GCDrainStackTargetSize * 2 + 1),
      _stack_trim_lower_threshold(GCDrainStackTargetSize),
      _trim_ticks(),
*** 89,99 ****
  // Pass locally gathered statistics to global state.
  void G1ParScanThreadState::flush(size_t* surviving_young_words) {
    _dcq.flush();
    // Update allocation statistics.
    _plab_allocator->flush_and_retire_stats();
!   _g1h->g1_policy()->record_age_table(&_age_table);
  
    uint length = _g1h->collection_set()->young_region_length();
    for (uint region_index = 0; region_index < length; region_index++) {
      surviving_young_words[region_index] += _surviving_young_words[region_index];
    }
--- 89,99 ----
  // Pass locally gathered statistics to global state.
  void G1ParScanThreadState::flush(size_t* surviving_young_words) {
    _dcq.flush();
    // Update allocation statistics.
    _plab_allocator->flush_and_retire_stats();
!   _g1h->policy()->record_age_table(&_age_table);
  
    uint length = _g1h->collection_set()->young_region_length();
    for (uint region_index = 0; region_index < length; region_index++) {
      surviving_young_words[region_index] += _surviving_young_words[region_index];
    }
*** 370,380 ****
      if (pss == NULL) {
        continue;
      }
  
      size_t used_memory = pss->oops_into_optional_region(hr)->used_memory();
!     _g1h->g1_policy()->phase_times()->record_or_add_thread_work_item(G1GCPhaseTimes::OptScanRS, worker_index, used_memory, G1GCPhaseTimes::OptCSetUsedMemory);
    }
  }
  
  oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
    assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
--- 370,380 ----
      if (pss == NULL) {
        continue;
      }
  
      size_t used_memory = pss->oops_into_optional_region(hr)->used_memory();
!     _g1h->policy()->phase_times()->record_or_add_thread_work_item(G1GCPhaseTimes::OptScanRS, worker_index, used_memory, G1GCPhaseTimes::OptCSetUsedMemory);
    }
  }
  
  oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
    assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));