src/hotspot/share/gc/parallel/psParallelCompact.cpp

rev 57840 : imported patch 8215297-remove-ptt
rev 57842 : [mq]: 8238220-rename-owsttaskterminator

*** 47,61 ****
  #include "gc/shared/gcLocker.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
- #include "gc/shared/owstTaskTerminator.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/referenceProcessorPhaseTimes.hpp"
  #include "gc/shared/spaceDecorator.inline.hpp"
  #include "gc/shared/weakProcessor.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #include "gc/shared/workgroup.hpp"
  #include "logging/log.hpp"
  #include "memory/iterator.inline.hpp"
--- 47,61 ----
  #include "gc/shared/gcLocker.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/referenceProcessorPhaseTimes.hpp"
  #include "gc/shared/spaceDecorator.inline.hpp"
+ #include "gc/shared/taskTerminator.hpp"
  #include "gc/shared/weakProcessor.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #include "gc/shared/workgroup.hpp"
  #include "logging/log.hpp"
  #include "memory/iterator.inline.hpp"
*** 1968,1978 ****
    log_debug(gc, task, time)("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " " JLONG_FORMAT,
                           marking_start.ticks(), compaction_start.ticks(),
                           collection_exit.ticks());
  
  #ifdef TRACESPINNING
!   OWSTTaskTerminator::print_termination_counts();
  #endif
  
    AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections());
  
    _gc_timer.register_gc_end();
--- 1968,1978 ----
    log_debug(gc, task, time)("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " " JLONG_FORMAT,
                           marking_start.ticks(), compaction_start.ticks(),
                           collection_exit.ticks());
  
  #ifdef TRACESPINNING
!   TaskTerminator::print_termination_counts();
  #endif
  
    AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections());
  
    _gc_timer.register_gc_end();
*** 2148,2158 ****
  
    // Do the real work
    cm->follow_marking_stacks();
  }
  
! static void steal_marking_work(OWSTTaskTerminator& terminator, uint worker_id) {
    assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(worker_id);
  
--- 2148,2158 ----
  
    // Do the real work
    cm->follow_marking_stacks();
  }
  
! static void steal_marking_work(TaskTerminator& terminator, uint worker_id) {
    assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(worker_id);
  
*** 2172,2182 ****
  
  class MarkFromRootsTask : public AbstractGangTask {
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    StrongRootsScope _strong_roots_scope; // needed for Threads::possibly_parallel_threads_do
    SequentialSubTasksDone _subtasks;
!   OWSTTaskTerminator _terminator;
    uint _active_workers;
  
  public:
    MarkFromRootsTask(uint active_workers) :
        AbstractGangTask("MarkFromRootsTask"),
--- 2172,2182 ----
  
  class MarkFromRootsTask : public AbstractGangTask {
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    StrongRootsScope _strong_roots_scope; // needed for Threads::possibly_parallel_threads_do
    SequentialSubTasksDone _subtasks;
!   TaskTerminator _terminator;
    uint _active_workers;
  
  public:
    MarkFromRootsTask(uint active_workers) :
        AbstractGangTask("MarkFromRootsTask"),
*** 2205,2215 ****
  
  class PCRefProcTask : public AbstractGangTask {
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    ProcessTask& _task;
    uint _ergo_workers;
!   OWSTTaskTerminator _terminator;
  
  public:
    PCRefProcTask(ProcessTask& task, uint ergo_workers) :
        AbstractGangTask("PCRefProcTask"),
        _task(task),
--- 2205,2215 ----
  
  class PCRefProcTask : public AbstractGangTask {
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    ProcessTask& _task;
    uint _ergo_workers;
!   TaskTerminator _terminator;
  
  public:
    PCRefProcTask(ProcessTask& task, uint ergo_workers) :
        AbstractGangTask("PCRefProcTask"),
        _task(task),
*** 2585,2595 ****
      }
    }
  }
  #endif // #ifdef ASSERT
  
! static void compaction_with_stealing_work(OWSTTaskTerminator* terminator, uint worker_id) {
    assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(worker_id);
  
--- 2585,2595 ----
      }
    }
  }
  #endif // #ifdef ASSERT
  
! static void compaction_with_stealing_work(TaskTerminator* terminator, uint worker_id) {
    assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
  
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(worker_id);
  
*** 2621,2631 ****
  }
  
  class UpdateDensePrefixAndCompactionTask: public AbstractGangTask {
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    TaskQueue& _tq;
!   OWSTTaskTerminator _terminator;
    uint _active_workers;
  
  public:
    UpdateDensePrefixAndCompactionTask(TaskQueue& tq, uint active_workers) :
        AbstractGangTask("UpdateDensePrefixAndCompactionTask"),
--- 2621,2631 ----
  }
  
  class UpdateDensePrefixAndCompactionTask: public AbstractGangTask {
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    TaskQueue& _tq;
!   TaskTerminator _terminator;
    uint _active_workers;
  
  public:
    UpdateDensePrefixAndCompactionTask(TaskQueue& tq, uint active_workers) :
        AbstractGangTask("UpdateDensePrefixAndCompactionTask"),