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

rev 13237 : imported patch 8183226-periodic-rem-set-summary-accesses-uninitialized-stuff
rev 13238 : imported patch 8183226-eridk-sjohanss-review
rev 13239 : imported patch 8183226-eridk-review2
rev 13240 : imported patch 8183128-cleanup-refinecardtableentryclosure
rev 13241 : imported patch 8183128-erikd-review

*** 34,43 ****
--- 34,44 ----
  #include "gc/g1/g1RemSet.inline.hpp"
  #include "gc/g1/g1SATBCardTableModRefBS.inline.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
+ #include "gc/g1/suspendibleThreadSet.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "utilities/align.hpp"
*** 290,301 ****
    _prev_period_summary(),
    _into_cset_dirty_card_queue_set(false)
  {
    // Initialize the card queue set used to hold cards containing
    // references into the collection set.
!   _into_cset_dirty_card_queue_set.initialize(NULL, // Should never be called by the Java code
!                                              DirtyCardQ_CBL_mon,
                                               DirtyCardQ_FL_lock,
                                               -1, // never trigger processing
                                               -1, // no limit on length
                                               Shared_DirtyCardQ_lock,
                                               &JavaThread::dirty_card_queue_set());
--- 291,301 ----
    _prev_period_summary(),
    _into_cset_dirty_card_queue_set(false)
  {
    // Initialize the card queue set used to hold cards containing
    // references into the collection set.
!   _into_cset_dirty_card_queue_set.initialize(DirtyCardQ_CBL_mon,
                                               DirtyCardQ_FL_lock,
                                               -1, // never trigger processing
                                               -1, // no limit on length
                                               Shared_DirtyCardQ_lock,
                                               &JavaThread::dirty_card_queue_set());
*** 517,537 ****
    update_rem_set(&into_cset_dcq, pss, worker_i);
    scan_rem_set(pss, heap_region_codeblobs, worker_i);;
  }
  
  void G1RemSet::prepare_for_oops_into_collection_set_do() {
-   _g1->set_refine_cte_cl_concurrency(false);
    DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
    dcqs.concatenate_logs();
  
    _scan_state->reset();
  }
  
  void G1RemSet::cleanup_after_oops_into_collection_set_do() {
    G1GCPhaseTimes* phase_times = _g1->g1_policy()->phase_times();
-   // Cleanup after copy
-   _g1->set_refine_cte_cl_concurrency(true);
  
    // Set all cards back to clean.
    double start = os::elapsedTime();
    _scan_state->clear_card_table(_g1->workers());
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);
--- 517,534 ----
*** 801,811 ****
  
  void G1RemSet::print_summary_info() {
    Log(gc, remset, exit) log;
    if (log.is_trace()) {
      log.trace(" Cumulative RS summary");
!     G1RemSetSummary current;
      ResourceMark rm;
      current.print_on(log.trace_stream());
    }
  }
  
--- 798,808 ----
  
  void G1RemSet::print_summary_info() {
    Log(gc, remset, exit) log;
    if (log.is_trace()) {
      log.trace(" Cumulative RS summary");
!     G1RemSetSummary current(this);
      ResourceMark rm;
      current.print_on(log.trace_stream());
    }
  }