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

rev 53581 : [mq]: move_files
rev 53582 : imported patch rename

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2018, 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) 2001, 2019, 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.
*** 21,36 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc/g1/g1CardTable.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1ConcurrentRefine.hpp"
  #include "gc/g1/g1FromCardCache.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/g1RootClosures.hpp"
--- 21,36 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc/g1/g1CardTable.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1ConcurrentRefine.hpp"
+ #include "gc/g1/g1DirtyCardQueue.hpp"
  #include "gc/g1/g1FromCardCache.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/g1RootClosures.hpp"
*** 298,308 ****
      delete _scan_state;
    }
  }
  
  uint G1RemSet::num_par_rem_sets() {
!   return DirtyCardQueueSet::num_par_ids() + G1ConcurrentRefine::max_num_threads() + MAX2(ConcGCThreads, ParallelGCThreads);
  }
  
  void G1RemSet::initialize(size_t capacity, uint max_regions) {
    G1FromCardCache::initialize(num_par_rem_sets(), max_regions);
    _scan_state->initialize(max_regions);
--- 298,308 ----
      delete _scan_state;
    }
  }
  
  uint G1RemSet::num_par_rem_sets() {
!   return G1DirtyCardQueueSet::num_par_ids() + G1ConcurrentRefine::max_num_threads() + MAX2(ConcGCThreads, ParallelGCThreads);
  }
  
  void G1RemSet::initialize(size_t capacity, uint max_regions) {
    G1FromCardCache::initialize(num_par_rem_sets(), max_regions);
    _scan_state->initialize(max_regions);
*** 454,464 ****
    p->record_time_secs(G1GCPhaseTimes::CodeRoots, worker_i, cl.strong_code_root_scan_time().seconds());
    p->add_time_secs(G1GCPhaseTimes::ObjCopy, worker_i, cl.strong_code_root_trim_partially_time().seconds());
  }
  
  // Closure used for updating rem sets. Only called during an evacuation pause.
! class G1RefineCardClosure: public CardTableEntryClosure {
    G1RemSet* _g1rs;
    G1ScanObjsDuringUpdateRSClosure* _update_rs_cl;
  
    size_t _cards_scanned;
    size_t _cards_skipped;
--- 454,464 ----
    p->record_time_secs(G1GCPhaseTimes::CodeRoots, worker_i, cl.strong_code_root_scan_time().seconds());
    p->add_time_secs(G1GCPhaseTimes::ObjCopy, worker_i, cl.strong_code_root_trim_partially_time().seconds());
  }
  
  // Closure used for updating rem sets. Only called during an evacuation pause.
! class G1RefineCardClosure: public G1CardTableEntryClosure {
    G1RemSet* _g1rs;
    G1ScanObjsDuringUpdateRSClosure* _update_rs_cl;
  
    size_t _cards_scanned;
    size_t _cards_skipped;
*** 518,528 ****
    update_rem_set(pss, worker_i);
    scan_rem_set(pss, worker_i);;
  }
  
  void G1RemSet::prepare_for_oops_into_collection_set_do() {
!   DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
    dcqs.concatenate_logs();
  
    _scan_state->reset();
  }
  
--- 518,528 ----
    update_rem_set(pss, worker_i);
    scan_rem_set(pss, worker_i);;
  }
  
  void G1RemSet::prepare_for_oops_into_collection_set_do() {
!   G1DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
    dcqs.concatenate_logs();
  
    _scan_state->reset();
  }
  
*** 675,685 ****
      // worked.  (In fact, it's pretty likely.)
      if (*card_ptr != G1CardTable::dirty_card_val()) {
        *card_ptr = G1CardTable::dirty_card_val();
        MutexLockerEx x(Shared_DirtyCardQ_lock,
                        Mutex::_no_safepoint_check_flag);
!       DirtyCardQueue* sdcq =
          G1BarrierSet::dirty_card_queue_set().shared_dirty_card_queue();
        sdcq->enqueue(card_ptr);
      }
    } else {
      _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
--- 675,685 ----
      // worked.  (In fact, it's pretty likely.)
      if (*card_ptr != G1CardTable::dirty_card_val()) {
        *card_ptr = G1CardTable::dirty_card_val();
        MutexLockerEx x(Shared_DirtyCardQ_lock,
                        Mutex::_no_safepoint_check_flag);
!       G1DirtyCardQueue* sdcq =
          G1BarrierSet::dirty_card_queue_set().shared_dirty_card_queue();
        sdcq->enqueue(card_ptr);
      }
    } else {
      _num_conc_refined_cards++; // Unsynchronized update, only used for logging.