Skip to content

Commit 99eccaf

Browse files
coleenpcoleenp
committed
8247878: Move Management strong oops to OopStorage
Use OopStorage for strong oops stored with memory and thread sampling and dumping, and remove oops_do and GC calls. Reviewed-by: dholmes, kbarrett
1 parent c7d8485 commit 99eccaf

34 files changed

Lines changed: 134 additions & 264 deletions

‎src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) :
6060
_gc_par_phases[ThreadRoots] = new WorkerDataArray<double>("ThreadRoots", "Thread Roots (ms):", max_gc_threads);
6161
_gc_par_phases[UniverseRoots] = new WorkerDataArray<double>("UniverseRoots", "Universe Roots (ms):", max_gc_threads);
6262
_gc_par_phases[ObjectSynchronizerRoots] = new WorkerDataArray<double>("ObjectSynchronizerRoots", "ObjectSynchronizer Roots (ms):", max_gc_threads);
63-
_gc_par_phases[ManagementRoots] = new WorkerDataArray<double>("ManagementRoots", "Management Roots (ms):", max_gc_threads);
6463
_gc_par_phases[CLDGRoots] = new WorkerDataArray<double>("CLDGRoots", "CLDG Roots (ms):", max_gc_threads);
6564
AOT_ONLY(_gc_par_phases[AOTCodeRoots] = new WorkerDataArray<double>("AOTCodeRoots", "AOT Root Scan (ms):", max_gc_threads);)
6665
_gc_par_phases[CMRefRoots] = new WorkerDataArray<double>("CMRefRoots", "CM RefProcessor Roots (ms):", max_gc_threads);

‎src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
5050
ThreadRoots,
5151
UniverseRoots,
5252
ObjectSynchronizerRoots,
53-
ManagementRoots,
5453
CLDGRoots,
5554
AOT_ONLY(AOTCodeRoots COMMA)
5655
CMRefRoots,

‎src/hotspot/share/gc/g1/g1RootProcessor.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "memory/allocation.inline.hpp"
4646
#include "memory/universe.hpp"
4747
#include "runtime/mutex.hpp"
48-
#include "services/management.hpp"
4948
#include "utilities/macros.hpp"
5049

5150
G1RootProcessor::G1RootProcessor(G1CollectedHeap* g1h, uint n_workers) :
@@ -196,13 +195,6 @@ void G1RootProcessor::process_vm_roots(G1RootClosures* closures,
196195
}
197196
}
198197

199-
{
200-
G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::ManagementRoots, worker_id);
201-
if (_process_strong_tasks.try_claim_task(G1RP_PS_Management_oops_do)) {
202-
Management::oops_do(strong_roots);
203-
}
204-
}
205-
206198
#if INCLUDE_AOT
207199
if (UseAOT) {
208200
G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::AOTCodeRoots, worker_id);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
#include "runtime/handles.inline.hpp"
7676
#include "runtime/safepoint.hpp"
7777
#include "runtime/vmThread.hpp"
78-
#include "services/management.hpp"
7978
#include "services/memTracker.hpp"
8079
#include "services/memoryService.hpp"
8180
#include "utilities/align.hpp"
@@ -2020,10 +2019,6 @@ static void mark_from_roots_work(ParallelRootType::Value root_type, uint worker_
20202019
ObjectSynchronizer::oops_do(&mark_and_push_closure);
20212020
break;
20222021

2023-
case ParallelRootType::management:
2024-
Management::oops_do(&mark_and_push_closure);
2025-
break;
2026-
20272022
case ParallelRootType::class_loader_data:
20282023
{
20292024
CLDToOopClosure cld_closure(&mark_and_push_closure, ClassLoaderData::_claim_strong);
@@ -2236,7 +2231,6 @@ void PSParallelCompact::adjust_roots(ParCompactionManager* cm) {
22362231
Universe::oops_do(&oop_closure);
22372232
Threads::oops_do(&oop_closure, NULL);
22382233
ObjectSynchronizer::oops_do(&oop_closure);
2239-
Management::oops_do(&oop_closure);
22402234
OopStorageSet::strong_oops_do(&oop_closure);
22412235
CLDToOopClosure cld_closure(&oop_closure, ClassLoaderData::_claim_strong);
22422236
ClassLoaderDataGraph::cld_do(&cld_closure);

‎src/hotspot/share/gc/parallel/psRootType.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class ParallelRootType : public AllStatic {
3636
enum Value {
3737
universe,
3838
object_synchronizer,
39-
management,
4039
class_loader_data,
4140
code_cache,
4241
//"threads" are handled in parallel as a special case

‎src/hotspot/share/gc/parallel/psScavenge.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
#include "runtime/threadCritical.hpp"
6868
#include "runtime/vmThread.hpp"
6969
#include "runtime/vmOperations.hpp"
70-
#include "services/management.hpp"
7170
#include "services/memoryService.hpp"
7271
#include "utilities/stack.inline.hpp"
7372

@@ -108,10 +107,6 @@ static void scavenge_roots_work(ParallelRootType::Value root_type, uint worker_i
108107
}
109108
break;
110109

111-
case ParallelRootType::management:
112-
Management::oops_do(&roots_closure);
113-
break;
114-
115110
case ParallelRootType::code_cache:
116111
{
117112
MarkingCodeBlobClosure code_closure(&roots_to_old_closure, CodeBlobToOopClosure::FixRelocations);

‎src/hotspot/share/gc/shared/genCollectedHeap.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
#include "runtime/handles.inline.hpp"
6868
#include "runtime/java.hpp"
6969
#include "runtime/vmThread.hpp"
70-
#include "services/management.hpp"
7170
#include "services/memoryService.hpp"
7271
#include "utilities/autoRestore.hpp"
7372
#include "utilities/debug.hpp"
@@ -829,9 +828,6 @@ void GenCollectedHeap::process_roots(StrongRootsScope* scope,
829828
if (_process_strong_tasks->try_claim_task(GCH_PS_ObjectSynchronizer_oops_do)) {
830829
ObjectSynchronizer::oops_do(strong_roots);
831830
}
832-
if (_process_strong_tasks->try_claim_task(GCH_PS_Management_oops_do)) {
833-
Management::oops_do(strong_roots);
834-
}
835831
#if INCLUDE_AOT
836832
if (UseAOT && _process_strong_tasks->try_claim_task(GCH_PS_aot_oops_do)) {
837833
AOTLoader::oops_do(strong_roots);

‎src/hotspot/share/gc/shared/genCollectedHeap.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ class GenCollectedHeap : public CollectedHeap {
107107
enum GCH_strong_roots_tasks {
108108
GCH_PS_Universe_oops_do,
109109
GCH_PS_ObjectSynchronizer_oops_do,
110-
GCH_PS_Management_oops_do,
111110
GCH_PS_OopStorageSet_oops_do,
112111
GCH_PS_ClassLoaderDataGraph_oops_do,
113112
GCH_PS_CodeCache_oops_do,

‎src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class outputStream;
4141
f(CNT_PREFIX ## VMStrongRoots, DESC_PREFIX "VM Strong Roots") \
4242
f(CNT_PREFIX ## VMWeakRoots, DESC_PREFIX "VM Weak Roots") \
4343
f(CNT_PREFIX ## ObjectSynchronizerRoots, DESC_PREFIX "Synchronizer Roots") \
44-
f(CNT_PREFIX ## ManagementRoots, DESC_PREFIX "Management Roots") \
4544
f(CNT_PREFIX ## CLDGRoots, DESC_PREFIX "CLDG Roots") \
4645
f(CNT_PREFIX ## JVMTIWeakRoots, DESC_PREFIX "JVMTI Weak Roots") \
4746
f(CNT_PREFIX ## JFRWeakRoots, DESC_PREFIX "JFR Weak Roots") \

‎src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "memory/resourceArea.hpp"
4141
#include "memory/universe.hpp"
4242
#include "runtime/thread.hpp"
43-
#include "services/management.hpp"
4443

4544
ShenandoahSerialRoot::ShenandoahSerialRoot(ShenandoahSerialRoot::OopsDo oops_do,
4645
ShenandoahPhaseTimings::Phase phase, ShenandoahPhaseTimings::ParPhase par_phase) :
@@ -56,14 +55,12 @@ void ShenandoahSerialRoot::oops_do(OopClosure* cl, uint worker_id) {
5655

5756
ShenandoahSerialRoots::ShenandoahSerialRoots(ShenandoahPhaseTimings::Phase phase) :
5857
_universe_root(&Universe::oops_do, phase, ShenandoahPhaseTimings::UniverseRoots),
59-
_object_synchronizer_root(&ObjectSynchronizer::oops_do, phase, ShenandoahPhaseTimings::ObjectSynchronizerRoots),
60-
_management_root(&Management::oops_do, phase, ShenandoahPhaseTimings::ManagementRoots) {
58+
_object_synchronizer_root(&ObjectSynchronizer::oops_do, phase, ShenandoahPhaseTimings::ObjectSynchronizerRoots) {
6159
}
6260

6361
void ShenandoahSerialRoots::oops_do(OopClosure* cl, uint worker_id) {
6462
_universe_root.oops_do(cl, worker_id);
6563
_object_synchronizer_root.oops_do(cl, worker_id);
66-
_management_root.oops_do(cl, worker_id);
6764
}
6865

6966
ShenandoahWeakSerialRoot::ShenandoahWeakSerialRoot(ShenandoahWeakSerialRoot::WeakOopsDo weak_oops_do,

0 commit comments

Comments
 (0)