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

rev 53924 : imported patch 8219747-remove-g1-prefix
rev 53926 : imported patch 8219748-add-and-use-timing-object

*** 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));
--- 370,380 ----
      if (pss == NULL) {
        continue;
      }
  
      size_t used_memory = pss->oops_into_optional_region(hr)->used_memory();
!     _g1h->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));