Skip to content
Permalink
Browse files

8238220: Rename OWSTTaskTerminator to TaskTerminator

Reviewed-by: sjohanss, sangheki
  • Loading branch information
Thomas Schatzl
Thomas Schatzl committed Feb 3, 2020
1 parent 76675e9 commit 77ad678fce74346d14fcf72890db455029c87e75
@@ -76,10 +76,10 @@
#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/taskTerminator.hpp"
#include "gc/shared/taskqueue.inline.hpp"
#include "gc/shared/weakProcessor.inline.hpp"
#include "gc/shared/workerPolicy.hpp"
@@ -1133,7 +1133,7 @@ void G1CollectedHeap::print_heap_after_full_collection(G1HeapTransition* heap_tr
print_heap_after_gc();
print_heap_regions();
#ifdef TRACESPINNING
OWSTTaskTerminator::print_termination_counts();
TaskTerminator::print_termination_counts();
#endif
}

@@ -3141,7 +3141,7 @@ void G1CollectedHeap::do_collection_pause_at_safepoint_helper(double target_paus
verify_after_young_collection(verify_type);

#ifdef TRACESPINNING
OWSTTaskTerminator::print_termination_counts();
TaskTerminator::print_termination_counts();
#endif

gc_epilogue(false);
@@ -3477,14 +3477,14 @@ class G1STWRefProcTaskProxy: public AbstractGangTask {
G1CollectedHeap* _g1h;
G1ParScanThreadStateSet* _pss;
RefToScanQueueSet* _task_queues;
OWSTTaskTerminator* _terminator;
TaskTerminator* _terminator;

public:
G1STWRefProcTaskProxy(ProcessTask& proc_task,
G1CollectedHeap* g1h,
G1ParScanThreadStateSet* per_thread_states,
RefToScanQueueSet *task_queues,
OWSTTaskTerminator* terminator) :
TaskTerminator* terminator) :
AbstractGangTask("Process reference objects in parallel"),
_proc_task(proc_task),
_g1h(g1h),
@@ -3528,7 +3528,7 @@ void G1STWRefProcTaskExecutor::execute(ProcessTask& proc_task, uint ergo_workers
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);
TaskTerminator terminator(ergo_workers, _queues);
G1STWRefProcTaskProxy proc_task_proxy(proc_task, _g1h, _pss, _queues, &terminator);

_workers->run_task(&proc_task_proxy, ergo_workers);
@@ -3815,7 +3815,7 @@ class G1EvacuateRegionsBaseTask : public AbstractGangTask {
G1CollectedHeap* _g1h;
G1ParScanThreadStateSet* _per_thread_states;
RefToScanQueueSet* _task_queues;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;
uint _num_workers;

void evacuate_live_objects(G1ParScanThreadState* pss,
@@ -1482,18 +1482,18 @@ class G1ParEvacuateFollowersClosure : public VoidClosure {
G1CollectedHeap* _g1h;
G1ParScanThreadState* _par_scan_state;
RefToScanQueueSet* _queues;
OWSTTaskTerminator* _terminator;
TaskTerminator* _terminator;
G1GCPhaseTimes::GCParPhases _phase;

G1ParScanThreadState* par_scan_state() { return _par_scan_state; }
RefToScanQueueSet* queues() { return _queues; }
OWSTTaskTerminator* terminator() { return _terminator; }
TaskTerminator* terminator() { return _terminator; }

public:
G1ParEvacuateFollowersClosure(G1CollectedHeap* g1h,
G1ParScanThreadState* par_scan_state,
RefToScanQueueSet* queues,
OWSTTaskTerminator* terminator,
TaskTerminator* terminator,
G1GCPhaseTimes::GCParPhases phase)
: _start_term(0.0), _term_time(0.0), _term_attempts(0),
_g1h(g1h), _par_scan_state(par_scan_state),
@@ -46,10 +46,10 @@
#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/taskTerminator.hpp"
#include "gc/shared/taskqueue.inline.hpp"
#include "gc/shared/weakProcessor.inline.hpp"
#include "gc/shared/workerPolicy.hpp"
@@ -30,7 +30,7 @@
#include "gc/g1/g1HeapVerifier.hpp"
#include "gc/g1/g1RegionMarkStatsCache.hpp"
#include "gc/g1/heapRegionSet.hpp"
#include "gc/shared/owstTaskTerminator.hpp"
#include "gc/shared/taskTerminator.hpp"
#include "gc/shared/taskqueue.hpp"
#include "gc/shared/verifyOption.hpp"
#include "gc/shared/workgroup.hpp"
@@ -329,7 +329,7 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
G1CMTask** _tasks; // Task queue array (max_worker_id length)

G1CMTaskQueueSet* _task_queues; // Task queue set
OWSTTaskTerminator _terminator; // For termination
TaskTerminator _terminator; // For termination

// Two sync barriers that are used to synchronize tasks when an
// overflow occurs. The algorithm is the following. All tasks enter
@@ -418,7 +418,7 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
HeapWord* finger() { return _finger; }
bool concurrent() { return _concurrent; }
uint active_tasks() { return _num_active_tasks; }
OWSTTaskTerminator* terminator() { return &_terminator; }
TaskTerminator* terminator() { return &_terminator; }

// Claims the next available region to be scanned by a marking
// task/thread. It might return NULL if the next region is empty or
@@ -36,7 +36,7 @@

class G1FullGCMarkTask : public G1FullGCTask {
G1RootProcessor _root_processor;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;

public:
G1FullGCMarkTask(G1FullCollector* collector);
@@ -25,8 +25,8 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.hpp"
#include "gc/g1/g1FullGCMarker.inline.hpp"
#include "gc/shared/owstTaskTerminator.hpp"
#include "gc/shared/referenceProcessor.hpp"
#include "gc/shared/taskTerminator.hpp"
#include "gc/shared/verifyOption.hpp"
#include "memory/iterator.inline.hpp"

@@ -50,7 +50,7 @@ G1FullGCMarker::~G1FullGCMarker() {

void G1FullGCMarker::complete_marking(OopQueueSet* oop_stacks,
ObjArrayTaskQueueSet* array_stacks,
OWSTTaskTerminator* terminator) {
TaskTerminator* terminator) {
do {
drain_stack();
ObjArrayTask steal_array;
@@ -87,7 +87,7 @@ class G1FullGCMarker : public CHeapObj<mtGC> {
inline void drain_stack();
void complete_marking(OopQueueSet* oop_stacks,
ObjArrayTaskQueueSet* array_stacks,
OWSTTaskTerminator* terminator);
TaskTerminator* terminator);

// Closure getters
CLDToOopClosure* cld_closure() { return &_cld_closure; }
@@ -61,7 +61,7 @@ class G1FullGCReferenceProcessingExecutor: public AbstractRefProcTaskExecutor {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
ProcessTask& _proc_task;
G1FullCollector* _collector;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;

public:
G1RefProcTaskProxy(ProcessTask& proc_task,
@@ -49,11 +49,11 @@
#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/taskTerminator.hpp"
#include "gc/shared/weakProcessor.hpp"
#include "gc/shared/workerPolicy.hpp"
#include "gc/shared/workgroup.hpp"
@@ -1970,7 +1970,7 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
collection_exit.ticks());

#ifdef TRACESPINNING
OWSTTaskTerminator::print_termination_counts();
TaskTerminator::print_termination_counts();
#endif

AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections());
@@ -2150,7 +2150,7 @@ static void mark_from_roots_work(ParallelRootType::Value root_type, uint worker_
cm->follow_marking_stacks();
}

static void steal_marking_work(OWSTTaskTerminator& terminator, uint worker_id) {
static void steal_marking_work(TaskTerminator& terminator, uint worker_id) {
assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");

ParCompactionManager* cm =
@@ -2174,7 +2174,7 @@ class MarkFromRootsTask : public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
StrongRootsScope _strong_roots_scope; // needed for Threads::possibly_parallel_threads_do
SequentialSubTasksDone _subtasks;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;
uint _active_workers;

public:
@@ -2207,7 +2207,7 @@ class PCRefProcTask : public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
ProcessTask& _task;
uint _ergo_workers;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;

public:
PCRefProcTask(ProcessTask& task, uint ergo_workers) :
@@ -2587,7 +2587,7 @@ void PSParallelCompact::write_block_fill_histogram()
}
#endif // #ifdef ASSERT

static void compaction_with_stealing_work(OWSTTaskTerminator* terminator, uint worker_id) {
static void compaction_with_stealing_work(TaskTerminator* terminator, uint worker_id) {
assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");

ParCompactionManager* cm =
@@ -2623,7 +2623,7 @@ static void compaction_with_stealing_work(OWSTTaskTerminator* terminator, uint w
class UpdateDensePrefixAndCompactionTask: public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
TaskQueue& _tq;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;
uint _active_workers;

public:
@@ -43,12 +43,12 @@
#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/scavengableNMethods.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"
@@ -139,7 +139,7 @@ static void scavenge_roots_work(ParallelRootType::Value root_type, uint worker_i
pm->drain_stacks(false);
}

static void steal_work(OWSTTaskTerminator& terminator, uint worker_id) {
static void steal_work(TaskTerminator& terminator, uint worker_id) {
assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");

PSPromotionManager* pm =
@@ -219,7 +219,7 @@ class PSRefProcTaskExecutor: public AbstractRefProcTaskExecutor {

class PSRefProcTask : public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;
ProcessTask& _task;
uint _active_workers;

@@ -315,7 +315,7 @@ class ScavengeRootsTask : public AbstractGangTask {
HeapWord* _gen_top;
uint _active_workers;
bool _is_empty;
OWSTTaskTerminator _terminator;
TaskTerminator _terminator;

public:
ScavengeRootsTask(PSOldGen* old_gen,
@@ -732,7 +732,7 @@ bool PSScavenge::invoke_no_policy() {
scavenge_exit.ticks());

#ifdef TRACESPINNING
OWSTTaskTerminator::print_termination_counts();
TaskTerminator::print_termination_counts();
#endif

AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections());
@@ -678,7 +678,7 @@ void GenCollectedHeap::do_collection(bool full,
}

#ifdef TRACESPINNING
OWSTTaskTerminator::print_termination_counts();
TaskTerminator::print_termination_counts();
#endif
}

0 comments on commit 77ad678

Please sign in to comment.