src/share/vm/gc/g1/g1RemSetSummary.cpp

rev 13167 : imported patch 8179677-rename-conc-refined-cards
rev 13168 : [mq]: 8179677-erik-review

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 50,60 ****
      _counter++;
    }
  };
  
  void G1RemSetSummary::update() {
!   _num_refined_cards = remset()->conc_refine_cards();
    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
    _num_processed_buf_mutator = dcqs.processed_buffers_mut();
    _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();
  
    _num_coarsenings = HeapRegionRemSet::n_coarsenings();
--- 50,60 ----
      _counter++;
    }
  };
  
  void G1RemSetSummary::update() {
!   _num_conc_refined_cards = remset()->num_conc_refined_cards();
    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
    _num_processed_buf_mutator = dcqs.processed_buffers_mut();
    _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();
  
    _num_coarsenings = HeapRegionRemSet::n_coarsenings();
*** 91,101 ****
    update();
  }
  
  G1RemSetSummary::G1RemSetSummary() :
    _remset(NULL),
!   _num_refined_cards(0),
    _num_processed_buf_mutator(0),
    _num_processed_buf_rs_threads(0),
    _num_coarsenings(0),
    _rs_threads_vtimes(NULL),
    _num_vtimes(0),
--- 91,101 ----
    update();
  }
  
  G1RemSetSummary::G1RemSetSummary() :
    _remset(NULL),
!   _num_conc_refined_cards(0),
    _num_processed_buf_mutator(0),
    _num_processed_buf_rs_threads(0),
    _num_coarsenings(0),
    _rs_threads_vtimes(NULL),
    _num_vtimes(0),
*** 111,121 ****
  void G1RemSetSummary::set(G1RemSetSummary* other) {
    assert(other != NULL, "just checking");
    assert(remset() == other->remset(), "just checking");
    assert(_num_vtimes == other->_num_vtimes, "just checking");
  
!   _num_refined_cards = other->num_concurrent_refined_cards();
  
    _num_processed_buf_mutator = other->num_processed_buf_mutator();
    _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads();
  
    _num_coarsenings = other->_num_coarsenings;
--- 111,121 ----
  void G1RemSetSummary::set(G1RemSetSummary* other) {
    assert(other != NULL, "just checking");
    assert(remset() == other->remset(), "just checking");
    assert(_num_vtimes == other->_num_vtimes, "just checking");
  
!   _num_conc_refined_cards = other->num_conc_refined_cards();
  
    _num_processed_buf_mutator = other->num_processed_buf_mutator();
    _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads();
  
    _num_coarsenings = other->_num_coarsenings;
*** 128,138 ****
  void G1RemSetSummary::subtract_from(G1RemSetSummary* other) {
    assert(other != NULL, "just checking");
    assert(remset() == other->remset(), "just checking");
    assert(_num_vtimes == other->_num_vtimes, "just checking");
  
!   _num_refined_cards = other->num_concurrent_refined_cards() - _num_refined_cards;
  
    _num_processed_buf_mutator = other->num_processed_buf_mutator() - _num_processed_buf_mutator;
    _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads() - _num_processed_buf_rs_threads;
  
    _num_coarsenings = other->num_coarsenings() - _num_coarsenings;
--- 128,138 ----
  void G1RemSetSummary::subtract_from(G1RemSetSummary* other) {
    assert(other != NULL, "just checking");
    assert(remset() == other->remset(), "just checking");
    assert(_num_vtimes == other->_num_vtimes, "just checking");
  
!   _num_conc_refined_cards = other->num_conc_refined_cards() - _num_conc_refined_cards;
  
    _num_processed_buf_mutator = other->num_processed_buf_mutator() - _num_processed_buf_mutator;
    _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads() - _num_processed_buf_rs_threads;
  
    _num_coarsenings = other->num_coarsenings() - _num_coarsenings;
*** 350,361 ****
    }
  };
  
  void G1RemSetSummary::print_on(outputStream* out) {
    out->print_cr(" Recent concurrent refinement statistics");
!   out->print_cr("  Processed " SIZE_FORMAT " cards",
!                 num_concurrent_refined_cards());
    out->print_cr("  Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total());
    out->print_cr("     " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.",
                  num_processed_buf_total(),
                  percent_of(num_processed_buf_rs_threads(), num_processed_buf_total()));
    out->print_cr("     " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.",
--- 350,360 ----
    }
  };
  
  void G1RemSetSummary::print_on(outputStream* out) {
    out->print_cr(" Recent concurrent refinement statistics");
!   out->print_cr("  Processed " SIZE_FORMAT " cards concurrently", num_conc_refined_cards());
    out->print_cr("  Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total());
    out->print_cr("     " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.",
                  num_processed_buf_total(),
                  percent_of(num_processed_buf_rs_threads(), num_processed_buf_total()));
    out->print_cr("     " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.",