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

rev 60591 : 8252038: G1: Remove unused G1MarkStatsCache::_num_stats
Reviewed-by:
rev 60592 : 8252034: G1: Remove *g1_reserved* methods
Reviewed-by:

*** 1662,1672 ****
  public:
    G1ObjectCountIsAliveClosure(G1CollectedHeap* g1h) : _g1h(g1h) { }
  
    bool do_object_b(oop obj) {
      return obj != NULL &&
!            (!_g1h->is_in_g1_reserved(obj) || !_g1h->is_obj_dead(obj));
    }
  };
  
  void G1ConcurrentMark::report_object_count(bool mark_completed) {
    // Depending on the completion of the marking liveness needs to be determined
--- 1662,1672 ----
  public:
    G1ObjectCountIsAliveClosure(G1CollectedHeap* g1h) : _g1h(g1h) { }
  
    bool do_object_b(oop obj) {
      return obj != NULL &&
!            (!_g1h->is_in_reserved(obj) || !_g1h->is_obj_dead(obj));
    }
  };
  
  void G1ConcurrentMark::report_object_count(bool mark_completed) {
    // Depending on the completion of the marking liveness needs to be determined
*** 1828,1838 ****
  G1ConcurrentMark::claim_region(uint worker_id) {
    // "checkpoint" the finger
    HeapWord* finger = _finger;
  
    while (finger < _heap.end()) {
!     assert(_g1h->is_in_g1_reserved(finger), "invariant");
  
      HeapRegion* curr_region = _g1h->heap_region_containing(finger);
      // Make sure that the reads below do not float before loading curr_region.
      OrderAccess::loadload();
      // Above heap_region_containing may return NULL as we always scan claim
--- 1828,1838 ----
  G1ConcurrentMark::claim_region(uint worker_id) {
    // "checkpoint" the finger
    HeapWord* finger = _finger;
  
    while (finger < _heap.end()) {
!     assert(_g1h->is_in_reserved(finger), "invariant");
  
      HeapRegion* curr_region = _g1h->heap_region_containing(finger);
      // Make sure that the reads below do not float before loading curr_region.
      OrderAccess::loadload();
      // Above heap_region_containing may return NULL as we always scan claim
*** 2891,2909 ****
    if (!log_is_enabled(Trace, gc, liveness)) {
      return;
    }
  
    G1CollectedHeap* g1h = G1CollectedHeap::heap();
!   MemRegion g1_reserved = g1h->g1_reserved();
    double now = os::elapsedTime();
  
    // Print the header of the output.
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX" PHASE %s @ %1.3f", phase_name, now);
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX" HEAP"
                            G1PPRL_SUM_ADDR_FORMAT("reserved")
                            G1PPRL_SUM_BYTE_FORMAT("region-size"),
!                           p2i(g1_reserved.start()), p2i(g1_reserved.end()),
                            HeapRegion::GrainBytes);
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX);
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX
                            G1PPRL_TYPE_H_FORMAT
                            G1PPRL_ADDR_BASE_H_FORMAT
--- 2891,2909 ----
    if (!log_is_enabled(Trace, gc, liveness)) {
      return;
    }
  
    G1CollectedHeap* g1h = G1CollectedHeap::heap();
!   MemRegion reserved = g1h->reserved_region();
    double now = os::elapsedTime();
  
    // Print the header of the output.
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX" PHASE %s @ %1.3f", phase_name, now);
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX" HEAP"
                            G1PPRL_SUM_ADDR_FORMAT("reserved")
                            G1PPRL_SUM_BYTE_FORMAT("region-size"),
!                           p2i(reserved.start()), p2i(reserved.end()),
                            HeapRegion::GrainBytes);
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX);
    log_trace(gc, liveness)(G1PPRL_LINE_PREFIX
                            G1PPRL_TYPE_H_FORMAT
                            G1PPRL_ADDR_BASE_H_FORMAT