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

rev 57895 : [mq]: 8215297-remove-ptt

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2020, 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.
*** 44,53 ****
--- 44,54 ----
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/gcVMOperations.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
+ #include "gc/shared/owstTaskTerminator.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/strongRootsScope.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
*** 598,608 ****
    assert(active_tasks <= _max_num_tasks, "we should not have more");
  
    _num_active_tasks = active_tasks;
    // Need to update the three data structures below according to the
    // number of active threads for this phase.
!   _terminator.terminator()->reset_for_reuse((int) active_tasks);
    _first_overflow_barrier_sync.set_n_workers((int) active_tasks);
    _second_overflow_barrier_sync.set_n_workers((int) active_tasks);
  }
  
  void G1ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurrent) {
--- 599,609 ----
    assert(active_tasks <= _max_num_tasks, "we should not have more");
  
    _num_active_tasks = active_tasks;
    // Need to update the three data structures below according to the
    // number of active threads for this phase.
!   _terminator.reset_for_reuse(active_tasks);
    _first_overflow_barrier_sync.set_n_workers((int) active_tasks);
    _second_overflow_barrier_sync.set_n_workers((int) active_tasks);
  }
  
  void G1ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurrent) {