archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152962: CMSCollector::shouldConcurrentCollect incorrectly logs against the debug stream

Browse source 
Reviewed-by: brutisso, sjohanss
This commit is contained in:
Stefan Karlsson 2016-04-11 08:51:53 +02:00
parent 2ca745d47a
commit 388236cc3d
1 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
View file

@ -425,7 +425,7 @@ void CMSStats::print_on(outputStream *st) const {
st->print(",cms_consumption_rate=%g,time_until_full=%g", st->print(",cms_consumption_rate=%g,time_until_full=%g",
cms_consumption_rate(), time_until_cms_gen_full()); cms_consumption_rate(), time_until_cms_gen_full());
} }
st->print(" "); st->cr();
} }
#endif // #ifndef PRODUCT #endif // #ifndef PRODUCT
@ -1108,8 +1108,10 @@ bool ConcurrentMarkSweepGeneration::should_collect(bool full,
} }
bool CMSCollector::shouldConcurrentCollect() { bool CMSCollector::shouldConcurrentCollect() {
LogTarget(Trace, gc) log;
if (_full_gc_requested) { if (_full_gc_requested) {
log_trace(gc)("CMSCollector: collect because of explicit gc request (or GCLocker)"); log.print("CMSCollector: collect because of explicit gc request (or GCLocker)");
return true; return true;
} }
@ -1117,21 +1119,22 @@ bool CMSCollector::shouldConcurrentCollect() {
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Print out lots of information which affects the initiation of // Print out lots of information which affects the initiation of
// a collection. // a collection.
Log(gc) log; if (log.is_enabled() && stats().valid()) {
if (log.is_trace() && stats().valid()) { log.print("CMSCollector shouldConcurrentCollect: ");
log.trace("CMSCollector shouldConcurrentCollect: ");
ResourceMark rm; LogStream out(log);
stats().print_on(log.debug_stream()); stats().print_on(&out);
log.trace("time_until_cms_gen_full %3.7f", stats().time_until_cms_gen_full());
log.trace("free=" SIZE_FORMAT, _cmsGen->free()); log.print("time_until_cms_gen_full %3.7f", stats().time_until_cms_gen_full());
log.trace("contiguous_available=" SIZE_FORMAT, _cmsGen->contiguous_available()); log.print("free=" SIZE_FORMAT, _cmsGen->free());
log.trace("promotion_rate=%g", stats().promotion_rate()); log.print("contiguous_available=" SIZE_FORMAT, _cmsGen->contiguous_available());
log.trace("cms_allocation_rate=%g", stats().cms_allocation_rate()); log.print("promotion_rate=%g", stats().promotion_rate());
log.trace("occupancy=%3.7f", _cmsGen->occupancy()); log.print("cms_allocation_rate=%g", stats().cms_allocation_rate());
log.trace("initiatingOccupancy=%3.7f", _cmsGen->initiating_occupancy()); log.print("occupancy=%3.7f", _cmsGen->occupancy());
log.trace("cms_time_since_begin=%3.7f", stats().cms_time_since_begin()); log.print("initiatingOccupancy=%3.7f", _cmsGen->initiating_occupancy());
log.trace("cms_time_since_end=%3.7f", stats().cms_time_since_end()); log.print("cms_time_since_begin=%3.7f", stats().cms_time_since_begin());
log.trace("metadata initialized %d", MetaspaceGC::should_concurrent_collect()); log.print("cms_time_since_end=%3.7f", stats().cms_time_since_end());
log.print("metadata initialized %d", MetaspaceGC::should_concurrent_collect());
} }
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -1149,7 +1152,7 @@ bool CMSCollector::shouldConcurrentCollect() {
// this branch will not fire after the first successful CMS // this branch will not fire after the first successful CMS
// collection because the stats should then be valid. // collection because the stats should then be valid.
if (_cmsGen->occupancy() >= _bootstrap_occupancy) { if (_cmsGen->occupancy() >= _bootstrap_occupancy) {
log_trace(gc)(" CMSCollector: collect for bootstrapping statistics: occupancy = %f, boot occupancy = %f", log.print(" CMSCollector: collect for bootstrapping statistics: occupancy = %f, boot occupancy = %f",
_cmsGen->occupancy(), _bootstrap_occupancy); _cmsGen->occupancy(), _bootstrap_occupancy);
return true; return true;
} }
@ -1162,7 +1165,7 @@ bool CMSCollector::shouldConcurrentCollect() {
// XXX We need to make sure that the gen expansion // XXX We need to make sure that the gen expansion
// criterion dovetails well with this. XXX NEED TO FIX THIS // criterion dovetails well with this. XXX NEED TO FIX THIS
if (_cmsGen->should_concurrent_collect()) { if (_cmsGen->should_concurrent_collect()) {
log_trace(gc)("CMS old gen initiated"); log.print("CMS old gen initiated");
return true; return true;
} }
@ -1173,12 +1176,12 @@ bool CMSCollector::shouldConcurrentCollect() {
assert(gch->collector_policy()->is_generation_policy(), assert(gch->collector_policy()->is_generation_policy(),
"You may want to check the correctness of the following"); "You may want to check the correctness of the following");
if (gch->incremental_collection_will_fail(true /* consult_young */)) { if (gch->incremental_collection_will_fail(true /* consult_young */)) {
log_trace(gc)("CMSCollector: collect because incremental collection will fail "); log.print("CMSCollector: collect because incremental collection will fail ");
return true; return true;
} }
if (MetaspaceGC::should_concurrent_collect()) { if (MetaspaceGC::should_concurrent_collect()) {
log_trace(gc)("CMSCollector: collect for metadata allocation "); log.print("CMSCollector: collect for metadata allocation ");
return true; return true;
} }
@ -1193,10 +1196,10 @@ bool CMSCollector::shouldConcurrentCollect() {
// as we want to be able to trigger the first CMS cycle as well) // as we want to be able to trigger the first CMS cycle as well)
if (stats().cms_time_since_begin() >= (CMSTriggerInterval / ((double) MILLIUNITS))) { if (stats().cms_time_since_begin() >= (CMSTriggerInterval / ((double) MILLIUNITS))) {
if (stats().valid()) { if (stats().valid()) {
log_trace(gc)("CMSCollector: collect because of trigger interval (time since last begin %3.7f secs)", log.print("CMSCollector: collect because of trigger interval (time since last begin %3.7f secs)",
stats().cms_time_since_begin()); stats().cms_time_since_begin());
} else { } else {
log_trace(gc)("CMSCollector: collect because of trigger interval (first collection)"); log.print("CMSCollector: collect because of trigger interval (first collection)");
} }
return true; return true;
} }