src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp

rev 57914 : 8238162: Shenandoah: Remove ShenandoahTaskTerminator wrapper

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2019, Red Hat, Inc. 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, 2020, Red Hat, Inc. 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.
*** 24,33 ****
--- 24,34 ----
  
  #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
  #define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
  
  #include "gc/shared/taskqueue.hpp"
+ #include "gc/shared/taskTerminator.hpp"
  #include "gc/shenandoah/shenandoahOopClosures.hpp"
  #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
  #include "gc/shenandoah/shenandoahTaskqueue.hpp"
  
  class ShenandoahStrDedupQueue;
*** 55,71 ****
    inline void do_chunked_array(ShenandoahObjToScanQueue* q, T* cl, oop array, int chunk, int pow);
  
    inline void count_liveness(jushort* live_data, oop obj);
  
    template <class T, bool CANCELLABLE>
!   void mark_loop_work(T* cl, jushort* live_data, uint worker_id, ShenandoahTaskTerminator *t);
  
    template <bool CANCELLABLE>
!   void mark_loop_prework(uint worker_id, ShenandoahTaskTerminator *terminator, ReferenceProcessor *rp, bool strdedup);
  
  public:
!   void mark_loop(uint worker_id, ShenandoahTaskTerminator* terminator, ReferenceProcessor *rp,
                   bool cancellable, bool strdedup) {
      if (cancellable) {
        mark_loop_prework<true>(worker_id, terminator, rp, strdedup);
      } else {
        mark_loop_prework<false>(worker_id, terminator, rp, strdedup);
--- 56,72 ----
    inline void do_chunked_array(ShenandoahObjToScanQueue* q, T* cl, oop array, int chunk, int pow);
  
    inline void count_liveness(jushort* live_data, oop obj);
  
    template <class T, bool CANCELLABLE>
!   void mark_loop_work(T* cl, jushort* live_data, uint worker_id, TaskTerminator *t);
  
    template <bool CANCELLABLE>
!   void mark_loop_prework(uint worker_id, TaskTerminator *terminator, ReferenceProcessor *rp, bool strdedup);
  
  public:
!   void mark_loop(uint worker_id, TaskTerminator* terminator, ReferenceProcessor *rp,
                   bool cancellable, bool strdedup) {
      if (cancellable) {
        mark_loop_prework<true>(worker_id, terminator, rp, strdedup);
      } else {
        mark_loop_prework<false>(worker_id, terminator, rp, strdedup);