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

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

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 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,32 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
  #include "runtime/atomic.hpp"
  
  G1HotCardCache::G1HotCardCache(G1CollectedHeap *g1h):
    _g1h(g1h), _use_cache(false), _card_counts(g1h),
--- 21,32 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
+ #include "gc/g1/g1DirtyCardQueue.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
  #include "runtime/atomic.hpp"
  
  G1HotCardCache::G1HotCardCache(G1CollectedHeap *g1h):
    _g1h(g1h), _use_cache(false), _card_counts(g1h),
*** 81,91 ****
                                          &_hot_cache[masked_index],
                                          current_ptr);
    return (previous_ptr == current_ptr) ? previous_ptr : card_ptr;
  }
  
! void G1HotCardCache::drain(CardTableEntryClosure* cl, uint worker_i) {
    assert(default_use_cache(), "Drain only necessary if we use the hot card cache.");
  
    assert(_hot_cache != NULL, "Logic");
    assert(!use_cache(), "cache should be disabled");
  
--- 81,91 ----
                                          &_hot_cache[masked_index],
                                          current_ptr);
    return (previous_ptr == current_ptr) ? previous_ptr : card_ptr;
  }
  
! void G1HotCardCache::drain(G1CardTableEntryClosure* cl, uint worker_i) {
    assert(default_use_cache(), "Drain only necessary if we use the hot card cache.");
  
    assert(_hot_cache != NULL, "Logic");
    assert(!use_cache(), "cache should be disabled");