From 69a95c674155f84331bdd8e41ff9813fb24f1e8d Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Mon, 17 Aug 2020 11:36:09 +0200 Subject: [PATCH] 8251837: Rename get_safepoint_workers to safepoint_workers Reviewed-by: tschatzl --- src/hotspot/share/gc/g1/g1CollectedHeap.hpp | 2 +- src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp | 2 +- src/hotspot/share/gc/shared/collectedHeap.hpp | 2 +- src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp | 2 +- src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp | 2 +- src/hotspot/share/gc/z/zCollectedHeap.cpp | 2 +- src/hotspot/share/gc/z/zCollectedHeap.hpp | 2 +- src/hotspot/share/memory/heapInspection.cpp | 2 +- src/hotspot/share/runtime/safepoint.cpp | 2 +- src/hotspot/share/services/heapDumper.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp index d3496a4ac01..45b39a86a97 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp @@ -1437,7 +1437,7 @@ class G1CollectedHeap : public CollectedHeap { virtual bool supports_concurrent_gc_breakpoints() const; bool is_heterogeneous_heap() const; - virtual WorkGang* get_safepoint_workers() { return _workers; } + virtual WorkGang* safepoint_workers() { return _workers; } // The methods below are here for convenience and dispatch the // appropriate method depending on value of the given VerifyOption diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp index b470d5303f2..64da505ec23 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp @@ -220,7 +220,7 @@ class ParallelScavengeHeap : public CollectedHeap { virtual void gc_threads_do(ThreadClosure* tc) const; virtual void print_tracing_info() const; - virtual WorkGang* get_safepoint_workers() { return &_workers; } + virtual WorkGang* safepoint_workers() { return &_workers; } PreGenGCValues get_pre_gc_values() const; void print_heap_change(const PreGenGCValues& pre_gc_values) const; diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp index 01f9c8d6d77..73e4e89c9cd 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.hpp @@ -499,7 +499,7 @@ class CollectedHeap : public CHeapObj { // concurrent marking) for an intermittent non-GC safepoint. // If this method returns NULL, SafepointSynchronize will // perform cleanup tasks serially in the VMThread. - virtual WorkGang* get_safepoint_workers() { return NULL; } + virtual WorkGang* safepoint_workers() { return NULL; } // Support for object pinning. This is used by JNI Get*Critical() // and Release*Critical() family of functions. If supported, the GC diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index 72d9450336c..c049d258437 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -195,7 +195,7 @@ class ShenandoahHeap : public CollectedHeap { void assert_gc_workers(uint nworker) NOT_DEBUG_RETURN; WorkGang* workers() const; - WorkGang* get_safepoint_workers(); + WorkGang* safepoint_workers(); void gc_threads_do(ThreadClosure* tcl) const; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp index 2bf8de018f9..e207a27daf9 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp @@ -66,7 +66,7 @@ inline WorkGang* ShenandoahHeap::workers() const { return _workers; } -inline WorkGang* ShenandoahHeap::get_safepoint_workers() { +inline WorkGang* ShenandoahHeap::safepoint_workers() { return _safepoint_workers; } diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp index ce6b196c28b..a3b09849fdc 100644 --- a/src/hotspot/share/gc/z/zCollectedHeap.cpp +++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp @@ -273,7 +273,7 @@ void ZCollectedHeap::verify_nmethod(nmethod* nm) { // Does nothing } -WorkGang* ZCollectedHeap::get_safepoint_workers() { +WorkGang* ZCollectedHeap::safepoint_workers() { return _runtime_workers.workers(); } diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp index b54c70c083d..9d482a6a1de 100644 --- a/src/hotspot/share/gc/z/zCollectedHeap.hpp +++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp @@ -105,7 +105,7 @@ class ZCollectedHeap : public CollectedHeap { virtual void flush_nmethod(nmethod* nm); virtual void verify_nmethod(nmethod* nmethod); - virtual WorkGang* get_safepoint_workers(); + virtual WorkGang* safepoint_workers(); virtual void gc_threads_do(ThreadClosure* tc) const; diff --git a/src/hotspot/share/memory/heapInspection.cpp b/src/hotspot/share/memory/heapInspection.cpp index 1cae00073f7..0df3254900a 100644 --- a/src/hotspot/share/memory/heapInspection.cpp +++ b/src/hotspot/share/memory/heapInspection.cpp @@ -576,7 +576,7 @@ uintx HeapInspection::populate_table(KlassInfoTable* cit, BoolObjectClosure *fil if (parallel_thread_num > 1) { ResourceMark rm; - WorkGang* gang = Universe::heap()->get_safepoint_workers(); + WorkGang* gang = Universe::heap()->safepoint_workers(); if (gang != NULL) { // The GC provided a WorkGang to be used during a safepoint. diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp index 2c179c8d341..1103ceb5ede 100644 --- a/src/hotspot/share/runtime/safepoint.cpp +++ b/src/hotspot/share/runtime/safepoint.cpp @@ -587,7 +587,7 @@ void SafepointSynchronize::do_cleanup_tasks() { CollectedHeap* heap = Universe::heap(); assert(heap != NULL, "heap not initialized yet?"); - WorkGang* cleanup_workers = heap->get_safepoint_workers(); + WorkGang* cleanup_workers = heap->safepoint_workers(); if (cleanup_workers != NULL) { // Parallel cleanup using GC provided thread pool. uint num_cleanup_workers = cleanup_workers->active_workers(); diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp index 61584ffac71..64b06cb585e 100644 --- a/src/hotspot/share/services/heapDumper.cpp +++ b/src/hotspot/share/services/heapDumper.cpp @@ -1789,7 +1789,7 @@ void VM_HeapDumper::doit() { set_global_dumper(); set_global_writer(); - WorkGang* gang = ch->get_safepoint_workers(); + WorkGang* gang = ch->safepoint_workers(); if (gang == NULL) { work(0);