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

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

*** 74,87 ****
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/generationSpec.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "gc/shared/locationPrinter.inline.hpp"
  #include "gc/shared/oopStorageParState.hpp"
- #include "gc/shared/owstTaskTerminator.hpp"
  #include "gc/shared/preservedMarks.inline.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/referenceProcessor.inline.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
--- 74,87 ----
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/generationSpec.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "gc/shared/locationPrinter.inline.hpp"
  #include "gc/shared/oopStorageParState.hpp"
  #include "gc/shared/preservedMarks.inline.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/referenceProcessor.inline.hpp"
+ #include "gc/shared/taskTerminator.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
*** 1131,1141 ****
    print_hrm_post_compaction();
    heap_transition->print();
    print_heap_after_gc();
    print_heap_regions();
  #ifdef TRACESPINNING
!   OWSTTaskTerminator::print_termination_counts();
  #endif
  }
  
  bool G1CollectedHeap::do_full_collection(bool explicit_gc,
                                           bool clear_all_soft_refs) {
--- 1131,1141 ----
    print_hrm_post_compaction();
    heap_transition->print();
    print_heap_after_gc();
    print_heap_regions();
  #ifdef TRACESPINNING
!   TaskTerminator::print_termination_counts();
  #endif
  }
  
  bool G1CollectedHeap::do_full_collection(bool explicit_gc,
                                           bool clear_all_soft_refs) {
*** 3126,3136 ****
        }
  
        verify_after_young_collection(verify_type);
  
  #ifdef TRACESPINNING
!       OWSTTaskTerminator::print_termination_counts();
  #endif
  
        gc_epilogue(false);
      }
  
--- 3126,3136 ----
        }
  
        verify_after_young_collection(verify_type);
  
  #ifdef TRACESPINNING
!       TaskTerminator::print_termination_counts();
  #endif
  
        gc_epilogue(false);
      }
  
*** 3464,3481 ****
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    ProcessTask&     _proc_task;
    G1CollectedHeap* _g1h;
    G1ParScanThreadStateSet* _pss;
    RefToScanQueueSet* _task_queues;
!   OWSTTaskTerminator* _terminator;
  
  public:
    G1STWRefProcTaskProxy(ProcessTask& proc_task,
                          G1CollectedHeap* g1h,
                          G1ParScanThreadStateSet* per_thread_states,
                          RefToScanQueueSet *task_queues,
!                         OWSTTaskTerminator* terminator) :
      AbstractGangTask("Process reference objects in parallel"),
      _proc_task(proc_task),
      _g1h(g1h),
      _pss(per_thread_states),
      _task_queues(task_queues),
--- 3464,3481 ----
    typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
    ProcessTask&     _proc_task;
    G1CollectedHeap* _g1h;
    G1ParScanThreadStateSet* _pss;
    RefToScanQueueSet* _task_queues;
!   TaskTerminator* _terminator;
  
  public:
    G1STWRefProcTaskProxy(ProcessTask& proc_task,
                          G1CollectedHeap* g1h,
                          G1ParScanThreadStateSet* per_thread_states,
                          RefToScanQueueSet *task_queues,
!                         TaskTerminator* terminator) :
      AbstractGangTask("Process reference objects in parallel"),
      _proc_task(proc_task),
      _g1h(g1h),
      _pss(per_thread_states),
      _task_queues(task_queues),
*** 3515,3525 ****
    assert(_workers != NULL, "Need parallel worker threads.");
  
    assert(_workers->active_workers() >= ergo_workers,
           "Ergonomically chosen workers (%u) should be less than or equal to active workers (%u)",
           ergo_workers, _workers->active_workers());
!   OWSTTaskTerminator terminator(ergo_workers, _queues);
    G1STWRefProcTaskProxy proc_task_proxy(proc_task, _g1h, _pss, _queues, &terminator);
  
    _workers->run_task(&proc_task_proxy, ergo_workers);
  }
  
--- 3515,3525 ----
    assert(_workers != NULL, "Need parallel worker threads.");
  
    assert(_workers->active_workers() >= ergo_workers,
           "Ergonomically chosen workers (%u) should be less than or equal to active workers (%u)",
           ergo_workers, _workers->active_workers());
!   TaskTerminator terminator(ergo_workers, _queues);
    G1STWRefProcTaskProxy proc_task_proxy(proc_task, _g1h, _pss, _queues, &terminator);
  
    _workers->run_task(&proc_task_proxy, ergo_workers);
  }
  
*** 3802,3812 ****
  class G1EvacuateRegionsBaseTask : public AbstractGangTask {
  protected:
    G1CollectedHeap* _g1h;
    G1ParScanThreadStateSet* _per_thread_states;
    RefToScanQueueSet* _task_queues;
!   OWSTTaskTerminator _terminator;
    uint _num_workers;
  
    void evacuate_live_objects(G1ParScanThreadState* pss,
                               uint worker_id,
                               G1GCPhaseTimes::GCParPhases objcopy_phase,
--- 3802,3812 ----
  class G1EvacuateRegionsBaseTask : public AbstractGangTask {
  protected:
    G1CollectedHeap* _g1h;
    G1ParScanThreadStateSet* _per_thread_states;
    RefToScanQueueSet* _task_queues;
!   TaskTerminator _terminator;
    uint _num_workers;
  
    void evacuate_live_objects(G1ParScanThreadState* pss,
                               uint worker_id,
                               G1GCPhaseTimes::GCParPhases objcopy_phase,