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

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 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) 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.
*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1ConcurrentRefine.hpp"
  #include "gc/g1/g1ConcurrentRefineThread.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.inline.hpp"
  #include "runtime/java.hpp"
*** 375,385 ****
  }
  
  void G1ConcurrentRefine::adjust(double update_rs_time,
                                  size_t update_rs_processed_buffers,
                                  double goal_ms) {
!   DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
  
    if (G1UseAdaptiveConcRefinement) {
      update_zones(update_rs_time, update_rs_processed_buffers, goal_ms);
  
      // Change the barrier params
--- 376,386 ----
  }
  
  void G1ConcurrentRefine::adjust(double update_rs_time,
                                  size_t update_rs_processed_buffers,
                                  double goal_ms) {
!   DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
  
    if (G1UseAdaptiveConcRefinement) {
      update_zones(update_rs_time, update_rs_processed_buffers, goal_ms);
  
      // Change the barrier params
*** 423,433 ****
      _thread_control.maybe_activate_next(worker_id);
    }
  }
  
  bool G1ConcurrentRefine::do_refinement_step(uint worker_id) {
!   DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
  
    size_t curr_buffer_num = dcqs.completed_buffers_num();
    // If the number of the buffers falls down into the yellow zone,
    // that means that the transition period after the evacuation pause has ended.
    // Since the value written to the DCQS is the same for all threads, there is no
--- 424,434 ----
      _thread_control.maybe_activate_next(worker_id);
    }
  }
  
  bool G1ConcurrentRefine::do_refinement_step(uint worker_id) {
!   DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
  
    size_t curr_buffer_num = dcqs.completed_buffers_num();
    // If the number of the buffers falls down into the yellow zone,
    // that means that the transition period after the evacuation pause has ended.
    // Since the value written to the DCQS is the same for all threads, there is no