--- old/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp 2018-02-20 23:17:49.964933969 +0100 +++ new/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp 2018-02-20 23:17:49.744926449 +0100 @@ -24,13 +24,14 @@ #include "precompiled.hpp" #include "gc/shared/adaptiveSizePolicy.hpp" -#include "gc/shared/collectorPolicy.hpp" #include "gc/shared/gcCause.hpp" #include "gc/shared/gcUtil.inline.hpp" +#include "gc/shared/softRefPolicy.hpp" #include "gc/shared/workgroup.hpp" #include "logging/log.hpp" #include "runtime/timer.hpp" #include "utilities/ostream.hpp" + elapsedTimer AdaptiveSizePolicy::_minor_timer; elapsedTimer AdaptiveSizePolicy::_major_timer; bool AdaptiveSizePolicy::_debug_perturbation = false; @@ -409,7 +410,7 @@ size_t max_eden_size, bool is_full_gc, GCCause::Cause gc_cause, - CollectorPolicy* collector_policy) { + SoftRefPolicy* soft_ref_policy) { // Ignore explicit GC's. Exiting here does not set the flag and // does not reset the count. Updating of the averages for system @@ -502,11 +503,11 @@ // GC time limit may or may not have been reached. We // are approaching that condition and so as not to // throw an out-of-memory before all SoftRef's have been - // cleared, set _should_clear_all_soft_refs in CollectorPolicy. + // cleared, set _should_clear_all_soft_refs in SoftRefPolicy. // The clearing will be done on the next GC. bool near_limit = gc_overhead_limit_near(); if (near_limit) { - collector_policy->set_should_clear_all_soft_refs(true); + soft_ref_policy->set_should_clear_all_soft_refs(true); log_trace(gc, ergo)("Nearing GC overhead limit, will be clearing all SoftReference"); } }