infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

8202722: Move marksweep_init into GC code

Browse Source 
Reviewed-by: ehelin, kbarrett
This commit is contained in:
Stefan Karlsson 2018-05-07 16:16:17 +02:00
parent c590979683
commit fc99089e00
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/share/gc/parallel/psMarkSweep.cpp
View File

@ -71,6 +71,7 @@ void PSMarkSweep::initialize() {
_span_based_discoverer.set_span(ParallelScavengeHeap::heap()->reserved_region());
set_ref_processor(new ReferenceProcessor(&_span_based_discoverer)); // a vanilla ref proc
_counters = new CollectorCounters("PSMarkSweep", 1);
MarkSweep::initialize();
}
// This method contains all heap specific policy for invoking mark sweep.

2
src/hotspot/share/gc/serial/markSweep.cpp
View File

@ -265,7 +265,7 @@ MarkSweep::KeepAliveClosure MarkSweep::keep_alive;
void MarkSweep::KeepAliveClosure::do_oop(oop* p) { MarkSweep::KeepAliveClosure::do_oop_work(p); }
void MarkSweep::KeepAliveClosure::do_oop(narrowOop* p) { MarkSweep::KeepAliveClosure::do_oop_work(p); }
void marksweep_init() {
void MarkSweep::initialize() {
MarkSweep::_gc_timer = new (ResourceObj::C_HEAP, mtGC) STWGCTimer();
MarkSweep::_gc_tracer = new (ResourceObj::C_HEAP, mtGC) SerialOldTracer();
}

3
src/hotspot/share/gc/serial/markSweep.hpp
View File

@ -87,7 +87,6 @@ class MarkSweep : AllStatic {
friend class AdjustPointerClosure;
friend class KeepAliveClosure;
friend class VM_MarkSweep;
friend void marksweep_init();
//
// Vars
@ -117,6 +116,8 @@ class MarkSweep : AllStatic {
static KeepAliveClosure keep_alive;
public:
static void initialize();
// Public closures
static IsAliveClosure is_alive;
static FollowRootClosure follow_root_closure;

2
src/hotspot/share/gc/shared/genCollectedHeap.cpp
View File

@ -182,6 +182,8 @@ void GenCollectedHeap::post_initialize() {
initialize_size_policy(def_new_gen->eden()->capacity(),
_old_gen->capacity(),
def_new_gen->from()->capacity());
MarkSweep::initialize();
}
void GenCollectedHeap::ref_processing_init() {

4
src/hotspot/share/runtime/init.cpp
View File

@ -62,9 +62,6 @@ jint universe_init(); // depends on codeCache_init and stubRoutines_ini
void gc_barrier_stubs_init();
void interpreter_init(); // before any methods loaded
void invocationCounter_init(); // before any methods loaded
#if INCLUDE_SERIALGC
void marksweep_init();
#endif
void accessFlags_init();
void templateTable_init();
void InterfaceSupport_init();
@ -119,7 +116,6 @@ jint init_globals() {
gc_barrier_stubs_init(); // depends on universe_init, must be before interpreter_init
interpreter_init(); // before any methods loaded
invocationCounter_init(); // before any methods loaded
SERIALGC_ONLY(marksweep_init());
accessFlags_init();
templateTable_init();
InterfaceSupport_init();