mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-22 03:54:33 +02:00
6684579: SoftReference processing can be made more efficient
For current soft-ref clearing policies, we can decide at marking time if a soft-reference will definitely not be cleared, postponing the decision of whether it will definitely be cleared to the final reference processing phase. This can be especially beneficial in the case of concurrent collectors where the marking is usually concurrent but reference processing is usually not. Reviewed-by: jmasa
This commit is contained in:
parent
db6bef2c70
commit
7d7cf3f8af
18 changed files with 137 additions and 164 deletions
|
@ -172,6 +172,7 @@ void PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
|
|||
COMPILER2_PRESENT(DerivedPointerTable::clear());
|
||||
|
||||
ref_processor()->enable_discovery();
|
||||
ref_processor()->snap_policy(clear_all_softrefs);
|
||||
|
||||
mark_sweep_phase1(clear_all_softrefs);
|
||||
|
||||
|
@ -517,20 +518,9 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
|
|||
|
||||
// Process reference objects found during marking
|
||||
{
|
||||
ReferencePolicy *soft_ref_policy;
|
||||
if (clear_all_softrefs) {
|
||||
soft_ref_policy = new AlwaysClearPolicy();
|
||||
} else {
|
||||
#ifdef COMPILER2
|
||||
soft_ref_policy = new LRUMaxHeapPolicy();
|
||||
#else
|
||||
soft_ref_policy = new LRUCurrentHeapPolicy();
|
||||
#endif // COMPILER2
|
||||
}
|
||||
assert(soft_ref_policy != NULL,"No soft reference policy");
|
||||
ref_processor()->snap_policy(clear_all_softrefs);
|
||||
ref_processor()->process_discovered_references(
|
||||
soft_ref_policy, is_alive_closure(), mark_and_push_closure(),
|
||||
follow_stack_closure(), NULL);
|
||||
is_alive_closure(), mark_and_push_closure(), follow_stack_closure(), NULL);
|
||||
}
|
||||
|
||||
// Follow system dictionary roots and unload classes
|
||||
|
|
|
@ -1578,6 +1578,7 @@ void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
|
|||
COMPILER2_PRESENT(DerivedPointerTable::clear());
|
||||
|
||||
ref_processor()->enable_discovery();
|
||||
ref_processor()->snap_policy(maximum_heap_compaction);
|
||||
|
||||
bool marked_for_unloading = false;
|
||||
|
||||
|
@ -1894,26 +1895,14 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
|
|||
// Process reference objects found during marking
|
||||
{
|
||||
TraceTime tm_r("reference processing", print_phases(), true, gclog_or_tty);
|
||||
ReferencePolicy *soft_ref_policy;
|
||||
if (maximum_heap_compaction) {
|
||||
soft_ref_policy = new AlwaysClearPolicy();
|
||||
} else {
|
||||
#ifdef COMPILER2
|
||||
soft_ref_policy = new LRUMaxHeapPolicy();
|
||||
#else
|
||||
soft_ref_policy = new LRUCurrentHeapPolicy();
|
||||
#endif // COMPILER2
|
||||
}
|
||||
assert(soft_ref_policy != NULL, "No soft reference policy");
|
||||
if (ref_processor()->processing_is_mt()) {
|
||||
RefProcTaskExecutor task_executor;
|
||||
ref_processor()->process_discovered_references(
|
||||
soft_ref_policy, is_alive_closure(), &mark_and_push_closure,
|
||||
&follow_stack_closure, &task_executor);
|
||||
is_alive_closure(), &mark_and_push_closure, &follow_stack_closure,
|
||||
&task_executor);
|
||||
} else {
|
||||
ref_processor()->process_discovered_references(
|
||||
soft_ref_policy, is_alive_closure(), &mark_and_push_closure,
|
||||
&follow_stack_closure, NULL);
|
||||
is_alive_closure(), &mark_and_push_closure, &follow_stack_closure, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -330,6 +330,7 @@ bool PSScavenge::invoke_no_policy() {
|
|||
COMPILER2_PRESENT(DerivedPointerTable::clear());
|
||||
|
||||
reference_processor()->enable_discovery();
|
||||
reference_processor()->snap_policy(false);
|
||||
|
||||
// We track how much was promoted to the next generation for
|
||||
// the AdaptiveSizePolicy.
|
||||
|
@ -394,24 +395,16 @@ bool PSScavenge::invoke_no_policy() {
|
|||
|
||||
// Process reference objects discovered during scavenge
|
||||
{
|
||||
#ifdef COMPILER2
|
||||
ReferencePolicy *soft_ref_policy = new LRUMaxHeapPolicy();
|
||||
#else
|
||||
ReferencePolicy *soft_ref_policy = new LRUCurrentHeapPolicy();
|
||||
#endif // COMPILER2
|
||||
|
||||
reference_processor()->snap_policy(false); // not always_clear
|
||||
PSKeepAliveClosure keep_alive(promotion_manager);
|
||||
PSEvacuateFollowersClosure evac_followers(promotion_manager);
|
||||
assert(soft_ref_policy != NULL,"No soft reference policy");
|
||||
if (reference_processor()->processing_is_mt()) {
|
||||
PSRefProcTaskExecutor task_executor;
|
||||
reference_processor()->process_discovered_references(
|
||||
soft_ref_policy, &_is_alive_closure, &keep_alive, &evac_followers,
|
||||
&task_executor);
|
||||
&_is_alive_closure, &keep_alive, &evac_followers, &task_executor);
|
||||
} else {
|
||||
reference_processor()->process_discovered_references(
|
||||
soft_ref_policy, &_is_alive_closure, &keep_alive, &evac_followers,
|
||||
NULL);
|
||||
&_is_alive_closure, &keep_alive, &evac_followers, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue