Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8252648: Shenandoah: name gang tasks consistently 
Reviewed-by: zgu
Backport-of: a1176dc
  • Loading branch information
@shipilev
shipilev committed Jul 28, 2021
1 parent eaf59e0 commit 8ec02f3
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
View file
Expand Up @@ -85,7 +85,7 @@ class ShenandoahInitMarkRootsTask : public AbstractGangTask {
ShenandoahAllRootScanner* _rp;
public:
ShenandoahInitMarkRootsTask(ShenandoahAllRootScanner* rp) :
AbstractGangTask("Shenandoah init mark roots task"),
AbstractGangTask("Shenandoah Init Mark Roots"),
_rp(rp) {
}

Expand Down Expand Up @@ -127,7 +127,7 @@ class ShenandoahUpdateRootsTask : public AbstractGangTask {
ShenandoahRootUpdater* _root_updater;
public:
ShenandoahUpdateRootsTask(ShenandoahRootUpdater* root_updater) :
AbstractGangTask("Shenandoah update roots task"),
AbstractGangTask("Shenandoah Update Roots"),
_root_updater(root_updater) {
}

Expand All @@ -149,7 +149,7 @@ class ShenandoahConcurrentMarkingTask : public AbstractGangTask {

public:
ShenandoahConcurrentMarkingTask(ShenandoahConcurrentMark* cm, ShenandoahTaskTerminator* terminator) :
AbstractGangTask("Root Region Scan"), _cm(cm), _terminator(terminator) {
AbstractGangTask("Shenandoah Concurrent Mark"), _cm(cm), _terminator(terminator) {
}

void work(uint worker_id) {
Expand Down Expand Up @@ -219,7 +219,7 @@ class ShenandoahFinalMarkingTask : public AbstractGangTask {

public:
ShenandoahFinalMarkingTask(ShenandoahConcurrentMark* cm, ShenandoahTaskTerminator* terminator, bool dedup_string) :
AbstractGangTask("Shenandoah Final Marking"), _cm(cm), _terminator(terminator), _dedup_string(dedup_string) {
AbstractGangTask("Shenandoah Final Mark"), _cm(cm), _terminator(terminator), _dedup_string(dedup_string) {
}

void work(uint worker_id) {
Expand Down Expand Up @@ -602,7 +602,7 @@ class ShenandoahRefProcTaskProxy : public AbstractGangTask {
public:
ShenandoahRefProcTaskProxy(AbstractRefProcTaskExecutor::ProcessTask& proc_task,
ShenandoahTaskTerminator* t) :
AbstractGangTask("Process reference objects in parallel"),
AbstractGangTask("Shenandoah Process Weak References"),
_proc_task(proc_task),
_terminator(t) {
}
Expand Down Expand Up @@ -761,7 +761,7 @@ class ShenandoahPrecleanTask : public AbstractGangTask {

public:
ShenandoahPrecleanTask(ReferenceProcessor* rp) :
AbstractGangTask("Precleaning task"),
AbstractGangTask("Shenandoah Precleaning"),
_rp(rp) {}

void work(uint worker_id) {
Expand Down
10 changes: 5 additions & 5 deletions src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View file
Expand Up @@ -518,7 +518,7 @@ class ShenandoahResetBitmapTask : public AbstractGangTask {

public:
ShenandoahResetBitmapTask() :
AbstractGangTask("Parallel Reset Bitmap Task") {}
AbstractGangTask("Shenandoah Reset Bitmap") {}

void work(uint worker_id) {
ShenandoahHeapRegion* region = _regions.next();
Expand Down Expand Up @@ -960,7 +960,7 @@ class ShenandoahEvacuationTask : public AbstractGangTask {
ShenandoahEvacuationTask(ShenandoahHeap* sh,
ShenandoahCollectionSet* cs,
bool concurrent) :
AbstractGangTask("Parallel Evacuation Task"),
AbstractGangTask("Shenandoah Evacuation"),
_sh(sh),
_cs(cs),
_concurrent(concurrent)
Expand Down Expand Up @@ -1078,7 +1078,7 @@ class ShenandoahEvacuateUpdateRootsTask : public AbstractGangTask {

public:
ShenandoahEvacuateUpdateRootsTask(ShenandoahRootEvacuator* rp) :
AbstractGangTask("Shenandoah evacuate and update roots"),
AbstractGangTask("Shenandoah Evacuate/Update Roots"),
_rp(rp) {}

void work(uint worker_id) {
Expand Down Expand Up @@ -1355,7 +1355,7 @@ class ShenandoahParallelHeapRegionTask : public AbstractGangTask {

public:
ShenandoahParallelHeapRegionTask(ShenandoahHeapRegionClosure* blk) :
AbstractGangTask("Parallel Region Task"),
AbstractGangTask("Shenandoah Parallel Region Operation"),
_heap(ShenandoahHeap::heap()), _blk(blk), _index(0) {}

void work(uint worker_id) {
Expand Down Expand Up @@ -2159,7 +2159,7 @@ class ShenandoahUpdateHeapRefsTask : public AbstractGangTask {
bool _concurrent;
public:
ShenandoahUpdateHeapRefsTask(ShenandoahRegionIterator* regions, bool concurrent) :
AbstractGangTask("Concurrent Update References Task"),
AbstractGangTask("Shenandoah Update References"),
cl(T()),
_heap(ShenandoahHeap::heap()),
_regions(regions),
Expand Down
10 changes: 5 additions & 5 deletions src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
View file
Expand Up @@ -327,7 +327,7 @@ class ShenandoahPrepareForCompactionTask : public AbstractGangTask {

public:
ShenandoahPrepareForCompactionTask(PreservedMarksSet *preserved_marks, ShenandoahHeapRegionSet **worker_slices) :
AbstractGangTask("Shenandoah Prepare For Compaction Task"),
AbstractGangTask("Shenandoah Prepare For Compaction"),
_preserved_marks(preserved_marks),
_heap(ShenandoahHeap::heap()), _worker_slices(worker_slices) {
}
Expand Down Expand Up @@ -719,7 +719,7 @@ class ShenandoahAdjustPointersTask : public AbstractGangTask {

public:
ShenandoahAdjustPointersTask() :
AbstractGangTask("Shenandoah Adjust Pointers Task"),
AbstractGangTask("Shenandoah Adjust Pointers"),
_heap(ShenandoahHeap::heap()) {
}

Expand All @@ -741,7 +741,7 @@ class ShenandoahAdjustRootPointersTask : public AbstractGangTask {
PreservedMarksSet* _preserved_marks;
public:
ShenandoahAdjustRootPointersTask(ShenandoahRootAdjuster* rp, PreservedMarksSet* preserved_marks) :
AbstractGangTask("Shenandoah Adjust Root Pointers Task"),
AbstractGangTask("Shenandoah Adjust Root Pointers"),
_rp(rp),
_preserved_marks(preserved_marks) {}

Expand Down Expand Up @@ -805,7 +805,7 @@ class ShenandoahCompactObjectsTask : public AbstractGangTask {

public:
ShenandoahCompactObjectsTask(ShenandoahHeapRegionSet** worker_slices) :
AbstractGangTask("Shenandoah Compact Objects Task"),
AbstractGangTask("Shenandoah Compact Objects"),
_heap(ShenandoahHeap::heap()),
_worker_slices(worker_slices) {
}
Expand Down Expand Up @@ -953,7 +953,7 @@ class ShenandoahMCResetCompleteBitmapTask : public AbstractGangTask {

public:
ShenandoahMCResetCompleteBitmapTask() :
AbstractGangTask("Parallel Reset Bitmap Task") {
AbstractGangTask("Shenandoah Reset Bitmap") {
}

void work(uint worker_id) {
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/shenandoah/shenandoahParallelCleaning.inline.hpp
View file
Expand Up @@ -35,7 +35,7 @@ ShenandoahParallelWeakRootsCleaningTask<IsAlive, KeepAlive>::ShenandoahParallelW
IsAlive* is_alive,
KeepAlive* keep_alive,
uint num_workers) :
AbstractGangTask("Parallel Weak Root Cleaning Task"),
AbstractGangTask("Shenandoah Weak Root Cleaning"),
_phase(phase), _weak_roots(phase, num_workers),
_is_alive(is_alive), _keep_alive(keep_alive) {
assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
View file
Expand Up @@ -129,7 +129,7 @@ class ShenandoahStringDedupUnlinkOrOopsDoTask : public AbstractGangTask {
ShenandoahStringDedupUnlinkOrOopsDoTask(BoolObjectClosure* is_alive,
OopClosure* keep_alive,
bool allow_resize_and_rehash) :
AbstractGangTask("StringDedupUnlinkOrOopsDoTask"),
AbstractGangTask("Shenandoah String Dedup Unlink/Process"),
_cl(is_alive, keep_alive) {
StringDedup::gc_prologue(allow_resize_and_rehash);
}
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
View file
Expand Up @@ -411,7 +411,7 @@ class ShenandoahVerifierReachableTask : public AbstractGangTask {
ShenandoahRootVerifier* verifier,
const char* label,
ShenandoahVerifier::VerifyOptions options) :
AbstractGangTask("Shenandoah Parallel Verifier Reachable Task"),
AbstractGangTask("Shenandoah Verifier Reachable Objects"),
_label(label),
_verifier(verifier),
_options(options),
Expand Down Expand Up @@ -476,7 +476,7 @@ class ShenandoahVerifierMarkedRegionTask : public AbstractGangTask {
ShenandoahLivenessData* ld,
const char* label,
ShenandoahVerifier::VerifyOptions options) :
AbstractGangTask("Shenandoah Parallel Verifier Marked Region"),
AbstractGangTask("Shenandoah Verifier Marked Objects"),
_label(label),
_options(options),
_heap(ShenandoahHeap::heap()),
Expand Down

1 comment on commit 8ec02f3

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.