infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-27 02:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

8139892: Allow G1CollectorPolicy to specify if reference processing should be enabled

Browse Source 
Reviewed-by: mgerdin, kbarrett, tbenson
This commit is contained in:
Erik Helin 2015-10-19 16:33:12 +02:00
parent a97787ba26
commit 7bb30f51ab
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
View File

@ -3826,7 +3826,11 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
// reference processing currently works in G1.
// Enable discovery in the STW reference processor
ref_processor_stw()->enable_discovery();
if (g1_policy()->should_process_references()) {
ref_processor_stw()->enable_discovery();
} else {
ref_processor_stw()->disable_discovery();
}
{
// We want to temporarily turn off discovery by the
@ -4973,6 +4977,17 @@ public:
}
};
void G1CollectedHeap::process_weak_jni_handles() {
double ref_proc_start = os::elapsedTime();
G1STWIsAliveClosure is_alive(this);
G1KeepAliveClosure keep_alive(this);
JNIHandles::weak_oops_do(&is_alive, &keep_alive);
double ref_proc_time = os::elapsedTime() - ref_proc_start;
g1_policy()->phase_times()->record_ref_proc_time(ref_proc_time * 1000.0);
}
// Weak Reference processing during an evacuation pause (part 1).
void G1CollectedHeap::process_discovered_references(G1ParScanThreadStateSet* per_thread_states) {
double ref_proc_start = os::elapsedTime();
@ -5157,7 +5172,12 @@ void G1CollectedHeap::evacuate_collection_set(EvacuationInfo& evacuation_info, G
// as we may have to copy some 'reachable' referent
// objects (and their reachable sub-graphs) that were
// not copied during the pause.
process_discovered_references(per_thread_states);
if (g1_policy()->should_process_references()) {
process_discovered_references(per_thread_states);
} else {
ref_processor_stw()->verify_no_references_recorded();
process_weak_jni_handles();
}
if (G1StringDedup::is_enabled()) {
double fixup_start = os::elapsedTime();
@ -5188,7 +5208,11 @@ void G1CollectedHeap::evacuate_collection_set(EvacuationInfo& evacuation_info, G
// will log these updates (and dirty their associated
// cards). We need these updates logged to update any
// RSets.
enqueue_discovered_references(per_thread_states);
if (g1_policy()->should_process_references()) {
enqueue_discovered_references(per_thread_states);
} else {
g1_policy()->phase_times()->record_ref_enq_time(0);
}
}
void G1CollectedHeap::post_evacuate_collection_set(EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* per_thread_states) {

2
hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp
View File

@ -292,6 +292,8 @@ private:
void trace_heap(GCWhen::Type when, const GCTracer* tracer);
void process_weak_jni_handles();
// These are macros so that, if the assert fires, we get the correct
// line number, file, etc.

4
hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp
View File

@ -783,6 +783,10 @@ public:
return _young_gen_sizer->adaptive_young_list_length();
}
virtual bool should_process_references() const {
return true;
}
private:
//
// Survivor regions policy.