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

8149541: Use log_error() instead of log_info() when verification reports a problem

Browse source 
Reviewed-by: jwilhelm, tbenson
This commit is contained in:
Bengt Rutisson 2016-02-11 08:55:36 +01:00
parent e82f5cf677
commit 413f61e977
8 changed files with 104 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
View file

@ -2206,13 +2206,13 @@ class VerifyAllBlksClosure: public BlkClosure {
} }
if (res == 0) { if (res == 0) {
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
log.info("Livelock: no rank reduction!"); log.error("Livelock: no rank reduction!");
log.info(" Current: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n" log.error(" Current: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n"
" Previous: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n", " Previous: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n",
p2i(addr), res, was_obj ?"true":"false", was_live ?"true":"false", p2i(addr), res, was_obj ?"true":"false", was_live ?"true":"false",
p2i(_last_addr), _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false"); p2i(_last_addr), _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false");
ResourceMark rm; ResourceMark rm;
_sp->print_on(log.info_stream()); _sp->print_on(log.error_stream());
guarantee(false, "Verification failed."); guarantee(false, "Verification failed.");
} }
_last_addr = addr; _last_addr = addr;

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

@ -2224,8 +2224,8 @@ class VerifyMarkedClosure: public BitMapClosure {
if (!_marks->isMarked(addr)) { if (!_marks->isMarked(addr)) {
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
ResourceMark rm; ResourceMark rm;
oop(addr)->print_on(log.info_stream()); oop(addr)->print_on(log.error_stream());
log.info(" (" INTPTR_FORMAT " should have been marked)", p2i(addr)); log.error(" (" INTPTR_FORMAT " should have been marked)", p2i(addr));
_failed = true; _failed = true;
} }
return true; return true;
@ -2350,9 +2350,9 @@ void CMSCollector::verify_after_remark_work_1() {
verification_mark_bm()->iterate(&vcl); verification_mark_bm()->iterate(&vcl);
if (vcl.failed()) { if (vcl.failed()) {
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
log.info("Verification failed"); log.error("Failed marking verification after remark");
ResourceMark rm; ResourceMark rm;
gch->print_on(log.info_stream()); gch->print_on(log.error_stream());
fatal("CMS: failed marking verification after remark"); fatal("CMS: failed marking verification after remark");
} }
} }
@ -5880,8 +5880,8 @@ void MarkRefsIntoVerifyClosure::do_oop(oop obj) {
if (!_cms_bm->isMarked(addr)) { if (!_cms_bm->isMarked(addr)) {
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
ResourceMark rm; ResourceMark rm;
oop(addr)->print_on(log.info_stream()); oop(addr)->print_on(log.error_stream());
log.info(" (" INTPTR_FORMAT " should have been marked)", p2i(addr)); log.error(" (" INTPTR_FORMAT " should have been marked)", p2i(addr));
fatal("... aborting"); fatal("... aborting");
} }
} }
@ -6661,8 +6661,8 @@ void PushAndMarkVerifyClosure::do_oop(oop obj) {
if (!_cms_bm->isMarked(addr)) { if (!_cms_bm->isMarked(addr)) {
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
ResourceMark rm; ResourceMark rm;
oop(addr)->print_on(log.info_stream()); oop(addr)->print_on(log.error_stream());
log.info(" (" INTPTR_FORMAT " should have been marked)", p2i(addr)); log.error(" (" INTPTR_FORMAT " should have been marked)", p2i(addr));
fatal("... aborting"); fatal("... aborting");
} }

8
hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
View file

@ -2147,8 +2147,8 @@ public:
virtual bool doHeapRegion(HeapRegion* hr) { virtual bool doHeapRegion(HeapRegion* hr) {
unsigned region_gc_time_stamp = hr->get_gc_time_stamp(); unsigned region_gc_time_stamp = hr->get_gc_time_stamp();
if (_gc_time_stamp != region_gc_time_stamp) { if (_gc_time_stamp != region_gc_time_stamp) {
log_info(gc, verify)("Region " HR_FORMAT " has GC time stamp = %d, expected %d", HR_FORMAT_PARAMS(hr), log_error(gc, verify)("Region " HR_FORMAT " has GC time stamp = %d, expected %d", HR_FORMAT_PARAMS(hr),
region_gc_time_stamp, _gc_time_stamp); region_gc_time_stamp, _gc_time_stamp);
_failures = true; _failures = true;
} }
return false; return false;
@ -5185,8 +5185,8 @@ public:
NoYoungRegionsClosure() : _success(true) { } NoYoungRegionsClosure() : _success(true) { }
bool doHeapRegion(HeapRegion* r) { bool doHeapRegion(HeapRegion* r) {
if (r->is_young()) { if (r->is_young()) {
log_info(gc, verify)("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young", log_error(gc, verify)("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
p2i(r->bottom()), p2i(r->end())); p2i(r->bottom()), p2i(r->end()));
_success = false; _success = false;
} }
return false; return false;

6
hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp
View file

@ -758,7 +758,7 @@ G1CollectorPolicy::verify_young_ages(HeapRegion* head,
curr = curr->get_next_young_region()) { curr = curr->get_next_young_region()) {
SurvRateGroup* group = curr->surv_rate_group(); SurvRateGroup* group = curr->surv_rate_group();
if (group == NULL && !curr->is_survivor()) { if (group == NULL && !curr->is_survivor()) {
log_info(gc, verify)("## %s: encountered NULL surv_rate_group", name); log_error(gc, verify)("## %s: encountered NULL surv_rate_group", name);
ret = false; ret = false;
} }
@ -766,12 +766,12 @@ G1CollectorPolicy::verify_young_ages(HeapRegion* head,
int age = curr->age_in_surv_rate_group(); int age = curr->age_in_surv_rate_group();
if (age < 0) { if (age < 0) {
log_info(gc, verify)("## %s: encountered negative age", name); log_error(gc, verify)("## %s: encountered negative age", name);
ret = false; ret = false;
} }
if (age <= prev_age) { if (age <= prev_age) {
log_info(gc, verify)("## %s: region ages are not strictly increasing (%d, %d)", name, age, prev_age); log_error(gc, verify)("## %s: region ages are not strictly increasing (%d, %d)", name, age, prev_age);
ret = false; ret = false;
} }
prev_age = age; prev_age = age;

42
hotspot/src/share/vm/gc/g1/g1HeapVerifier.cpp
View file

@ -63,10 +63,10 @@ public:
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
log.info("Root location " PTR_FORMAT " points to dead obj " PTR_FORMAT, p2i(p), p2i(obj)); log.info("Root location " PTR_FORMAT " points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
if (_vo == VerifyOption_G1UseMarkWord) { if (_vo == VerifyOption_G1UseMarkWord) {
log.info(" Mark word: " PTR_FORMAT, p2i(obj->mark())); log.error(" Mark word: " PTR_FORMAT, p2i(obj->mark()));
} }
ResourceMark rm; ResourceMark rm;
obj->print_on(log.info_stream()); obj->print_on(log.error_stream());
_failures = true; _failures = true;
} }
} }
@ -111,10 +111,10 @@ class G1VerifyCodeRootOopClosure: public OopClosure {
// Verify that the strong code root list for this region // Verify that the strong code root list for this region
// contains the nmethod // contains the nmethod
if (!hrrs->strong_code_roots_list_contains(_nm)) { if (!hrrs->strong_code_roots_list_contains(_nm)) {
log_info(gc, verify)("Code root location " PTR_FORMAT " " log_error(gc, verify)("Code root location " PTR_FORMAT " "
"from nmethod " PTR_FORMAT " not in strong " "from nmethod " PTR_FORMAT " not in strong "
"code roots for region [" PTR_FORMAT "," PTR_FORMAT ")", "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
p2i(p), p2i(_nm), p2i(hr->bottom()), p2i(hr->end())); p2i(p), p2i(_nm), p2i(hr->bottom()), p2i(hr->end()));
_failures = true; _failures = true;
} }
} }
@ -292,8 +292,8 @@ public:
r->object_iterate(&not_dead_yet_cl); r->object_iterate(&not_dead_yet_cl);
if (_vo != VerifyOption_G1UseNextMarking) { if (_vo != VerifyOption_G1UseNextMarking) {
if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) { if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
log_info(gc, verify)("[" PTR_FORMAT "," PTR_FORMAT "] max_live_bytes " SIZE_FORMAT " < calculated " SIZE_FORMAT, log_error(gc, verify)("[" PTR_FORMAT "," PTR_FORMAT "] max_live_bytes " SIZE_FORMAT " < calculated " SIZE_FORMAT,
p2i(r->bottom()), p2i(r->end()), r->max_live_bytes(), not_dead_yet_cl.live_bytes()); p2i(r->bottom()), p2i(r->end()), r->max_live_bytes(), not_dead_yet_cl.live_bytes());
_failures = true; _failures = true;
} }
} else { } else {
@ -402,13 +402,13 @@ void G1HeapVerifier::verify(VerifyOption vo) {
} }
if (failures) { if (failures) {
log_info(gc, verify)("Heap after failed verification:"); log_error(gc, verify)("Heap after failed verification:");
// It helps to have the per-region information in the output to // It helps to have the per-region information in the output to
// help us track down what went wrong. This is why we call // help us track down what went wrong. This is why we call
// print_extended_on() instead of print_on(). // print_extended_on() instead of print_on().
LogHandle(gc, verify) log; LogHandle(gc, verify) log;
ResourceMark rm; ResourceMark rm;
_g1h->print_extended_on(log.info_stream()); _g1h->print_extended_on(log.error_stream());
} }
guarantee(!failures, "there should not have been any failures"); guarantee(!failures, "there should not have been any failures");
} }
@ -597,8 +597,8 @@ bool G1HeapVerifier::verify_no_bits_over_tams(const char* bitmap_name, G1CMBitMa
"tams: " PTR_FORMAT " end: " PTR_FORMAT, p2i(tams), p2i(end)); "tams: " PTR_FORMAT " end: " PTR_FORMAT, p2i(tams), p2i(end));
HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end); HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end);
if (result < end) { if (result < end) {
log_info(gc, verify)("## wrong marked address on %s bitmap: " PTR_FORMAT, bitmap_name, p2i(result)); log_error(gc, verify)("## wrong marked address on %s bitmap: " PTR_FORMAT, bitmap_name, p2i(result));
log_info(gc, verify)("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT, bitmap_name, p2i(tams), p2i(end)); log_error(gc, verify)("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT, bitmap_name, p2i(tams), p2i(end));
return false; return false;
} }
return true; return true;
@ -623,8 +623,8 @@ bool G1HeapVerifier::verify_bitmaps(const char* caller, HeapRegion* hr) {
res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
} }
if (!res_p || !res_n) { if (!res_p || !res_n) {
log_info(gc, verify)("#### Bitmap verification failed for " HR_FORMAT, HR_FORMAT_PARAMS(hr)); log_error(gc, verify)("#### Bitmap verification failed for " HR_FORMAT, HR_FORMAT_PARAMS(hr));
log_info(gc, verify)("#### Caller: %s", caller); log_error(gc, verify)("#### Caller: %s", caller);
return false; return false;
} }
return true; return true;
@ -676,41 +676,41 @@ class G1CheckCSetFastTableClosure : public HeapRegionClosure {
InCSetState cset_state = (InCSetState) G1CollectedHeap::heap()->_in_cset_fast_test.get_by_index(i); InCSetState cset_state = (InCSetState) G1CollectedHeap::heap()->_in_cset_fast_test.get_by_index(i);
if (hr->is_humongous()) { if (hr->is_humongous()) {
if (hr->in_collection_set()) { if (hr->in_collection_set()) {
log_info(gc, verify)("## humongous region %u in CSet", i); log_error(gc, verify)("## humongous region %u in CSet", i);
_failures = true; _failures = true;
return true; return true;
} }
if (cset_state.is_in_cset()) { if (cset_state.is_in_cset()) {
log_info(gc, verify)("## inconsistent cset state " CSETSTATE_FORMAT " for humongous region %u", cset_state.value(), i); log_error(gc, verify)("## inconsistent cset state " CSETSTATE_FORMAT " for humongous region %u", cset_state.value(), i);
_failures = true; _failures = true;
return true; return true;
} }
if (hr->is_continues_humongous() && cset_state.is_humongous()) { if (hr->is_continues_humongous() && cset_state.is_humongous()) {
log_info(gc, verify)("## inconsistent cset state " CSETSTATE_FORMAT " for continues humongous region %u", cset_state.value(), i); log_error(gc, verify)("## inconsistent cset state " CSETSTATE_FORMAT " for continues humongous region %u", cset_state.value(), i);
_failures = true; _failures = true;
return true; return true;
} }
} else { } else {
if (cset_state.is_humongous()) { if (cset_state.is_humongous()) {
log_info(gc, verify)("## inconsistent cset state " CSETSTATE_FORMAT " for non-humongous region %u", cset_state.value(), i); log_error(gc, verify)("## inconsistent cset state " CSETSTATE_FORMAT " for non-humongous region %u", cset_state.value(), i);
_failures = true; _failures = true;
return true; return true;
} }
if (hr->in_collection_set() != cset_state.is_in_cset()) { if (hr->in_collection_set() != cset_state.is_in_cset()) {
log_info(gc, verify)("## in CSet %d / cset state " CSETSTATE_FORMAT " inconsistency for region %u", log_error(gc, verify)("## in CSet %d / cset state " CSETSTATE_FORMAT " inconsistency for region %u",
hr->in_collection_set(), cset_state.value(), i); hr->in_collection_set(), cset_state.value(), i);
_failures = true; _failures = true;
return true; return true;
} }
if (cset_state.is_in_cset()) { if (cset_state.is_in_cset()) {
if (hr->is_young() != (cset_state.is_young())) { if (hr->is_young() != (cset_state.is_young())) {
log_info(gc, verify)("## is_young %d / cset state " CSETSTATE_FORMAT " inconsistency for region %u", log_error(gc, verify)("## is_young %d / cset state " CSETSTATE_FORMAT " inconsistency for region %u",
hr->is_young(), cset_state.value(), i); hr->is_young(), cset_state.value(), i);
_failures = true; _failures = true;
return true; return true;
} }
if (hr->is_old() != (cset_state.is_old())) { if (hr->is_old() != (cset_state.is_old())) {
log_info(gc, verify)("## is_old %d / cset state " CSETSTATE_FORMAT " inconsistency for region %u", log_error(gc, verify)("## is_old %d / cset state " CSETSTATE_FORMAT " inconsistency for region %u",
hr->is_old(), cset_state.value(), i); hr->is_old(), cset_state.value(), i);
_failures = true; _failures = true;
return true; return true;

98
hotspot/src/share/vm/gc/g1/heapRegion.cpp
View file

@ -479,7 +479,7 @@ class VerifyStrongCodeRootOopClosure: public OopClosure {
// Object is in the region. Check that its less than top // Object is in the region. Check that its less than top
if (_hr->top() <= (HeapWord*)obj) { if (_hr->top() <= (HeapWord*)obj) {
// Object is above top // Object is above top
log_info(gc, verify)("Object " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ") is above top " PTR_FORMAT, log_error(gc, verify)("Object " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ") is above top " PTR_FORMAT,
p2i(obj), p2i(_hr->bottom()), p2i(_hr->end()), p2i(_hr->top())); p2i(obj), p2i(_hr->bottom()), p2i(_hr->end()), p2i(_hr->top()));
_failures = true; _failures = true;
return; return;
@ -513,19 +513,19 @@ public:
if (nm != NULL) { if (nm != NULL) {
// Verify that the nemthod is live // Verify that the nemthod is live
if (!nm->is_alive()) { if (!nm->is_alive()) {
log_info(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod " PTR_FORMAT " in its strong code roots", log_error(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod " PTR_FORMAT " in its strong code roots",
p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm)); p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
_failures = true; _failures = true;
} else { } else {
VerifyStrongCodeRootOopClosure oop_cl(_hr, nm); VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
nm->oops_do(&oop_cl); nm->oops_do(&oop_cl);
if (!oop_cl.has_oops_in_region()) { if (!oop_cl.has_oops_in_region()) {
log_info(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod " PTR_FORMAT " in its strong code roots with no pointers into region", log_error(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod " PTR_FORMAT " in its strong code roots with no pointers into region",
p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm)); p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
_failures = true; _failures = true;
} else if (oop_cl.failures()) { } else if (oop_cl.failures()) {
log_info(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] has other failures for nmethod " PTR_FORMAT, log_error(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] has other failures for nmethod " PTR_FORMAT,
p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm)); p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
_failures = true; _failures = true;
} }
} }
@ -558,8 +558,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
// on its strong code root list // on its strong code root list
if (is_empty()) { if (is_empty()) {
if (strong_code_roots_length > 0) { if (strong_code_roots_length > 0) {
log_info(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] is empty but has " SIZE_FORMAT " code root entries", log_error(gc, verify)("region [" PTR_FORMAT "," PTR_FORMAT "] is empty but has " SIZE_FORMAT " code root entries",
p2i(bottom()), p2i(end()), strong_code_roots_length); p2i(bottom()), p2i(end()), strong_code_roots_length);
*failures = true; *failures = true;
} }
return; return;
@ -567,8 +567,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
if (is_continues_humongous()) { if (is_continues_humongous()) {
if (strong_code_roots_length > 0) { if (strong_code_roots_length > 0) {
log_info(gc, verify)("region " HR_FORMAT " is a continuation of a humongous region but has " SIZE_FORMAT " code root entries", log_error(gc, verify)("region " HR_FORMAT " is a continuation of a humongous region but has " SIZE_FORMAT " code root entries",
HR_FORMAT_PARAMS(this), strong_code_roots_length); HR_FORMAT_PARAMS(this), strong_code_roots_length);
*failures = true; *failures = true;
} }
return; return;
@ -661,26 +661,26 @@ public:
Mutex::_no_safepoint_check_flag); Mutex::_no_safepoint_check_flag);
if (!_failures) { if (!_failures) {
log.info("----------"); log.error("----------");
} }
ResourceMark rm; ResourceMark rm;
if (!_g1h->is_in_closed_subset(obj)) { if (!_g1h->is_in_closed_subset(obj)) {
HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
log.info("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")", log.error("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")",
p2i(p), p2i(_containing_obj), p2i(from->bottom()), p2i(from->end())); p2i(p), p2i(_containing_obj), p2i(from->bottom()), p2i(from->end()));
print_object(log.info_stream(), _containing_obj); print_object(log.error_stream(), _containing_obj);
log.info("points to obj " PTR_FORMAT " not in the heap", p2i(obj)); log.error("points to obj " PTR_FORMAT " not in the heap", p2i(obj));
} else { } else {
HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj); HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
log.info("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")", log.error("Field " PTR_FORMAT " of live obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")",
p2i(p), p2i(_containing_obj), p2i(from->bottom()), p2i(from->end())); p2i(p), p2i(_containing_obj), p2i(from->bottom()), p2i(from->end()));
print_object(log.info_stream(), _containing_obj); print_object(log.error_stream(), _containing_obj);
log.info("points to dead obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")", log.error("points to dead obj " PTR_FORMAT " in region [" PTR_FORMAT ", " PTR_FORMAT ")",
p2i(obj), p2i(to->bottom()), p2i(to->end())); p2i(obj), p2i(to->bottom()), p2i(to->end()));
print_object(log.info_stream(), obj); print_object(log.error_stream(), obj);
} }
log.info("----------"); log.error("----------");
_failures = true; _failures = true;
failed = true; failed = true;
_n_failures++; _n_failures++;
@ -730,17 +730,17 @@ public:
Mutex::_no_safepoint_check_flag); Mutex::_no_safepoint_check_flag);
if (!_failures) { if (!_failures) {
log.info("----------"); log.error("----------");
} }
log.info("Missing rem set entry:"); log.error("Missing rem set entry:");
log.info("Field " PTR_FORMAT " of obj " PTR_FORMAT ", in region " HR_FORMAT, log.error("Field " PTR_FORMAT " of obj " PTR_FORMAT ", in region " HR_FORMAT,
p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from)); p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
ResourceMark rm; ResourceMark rm;
_containing_obj->print_on(log.info_stream()); _containing_obj->print_on(log.error_stream());
log.info("points to obj " PTR_FORMAT " in region " HR_FORMAT, p2i(obj), HR_FORMAT_PARAMS(to)); log.error("points to obj " PTR_FORMAT " in region " HR_FORMAT, p2i(obj), HR_FORMAT_PARAMS(to));
obj->print_on(log.info_stream()); obj->print_on(log.error_stream());
log.info("Obj head CTE = %d, field CTE = %d.", cv_obj, cv_field); log.error("Obj head CTE = %d, field CTE = %d.", cv_obj, cv_field);
log.info("----------"); log.error("----------");
_failures = true; _failures = true;
if (!failed) _n_failures++; if (!failed) _n_failures++;
} }
@ -774,13 +774,13 @@ void HeapRegion::verify(VerifyOption vo,
(vo == VerifyOption_G1UsePrevMarking && (vo == VerifyOption_G1UsePrevMarking &&
ClassLoaderDataGraph::unload_list_contains(klass)); ClassLoaderDataGraph::unload_list_contains(klass));
if (!is_metaspace_object) { if (!is_metaspace_object) {
log_info(gc, verify)("klass " PTR_FORMAT " of object " PTR_FORMAT " " log_error(gc, verify)("klass " PTR_FORMAT " of object " PTR_FORMAT " "
"not metadata", p2i(klass), p2i(obj)); "not metadata", p2i(klass), p2i(obj));
*failures = true; *failures = true;
return; return;
} else if (!klass->is_klass()) { } else if (!klass->is_klass()) {
log_info(gc, verify)("klass " PTR_FORMAT " of object " PTR_FORMAT " " log_error(gc, verify)("klass " PTR_FORMAT " of object " PTR_FORMAT " "
"not a klass", p2i(klass), p2i(obj)); "not a klass", p2i(klass), p2i(obj));
*failures = true; *failures = true;
return; return;
} else { } else {
@ -811,7 +811,7 @@ void HeapRegion::verify(VerifyOption vo,
} }
} }
} else { } else {
log_info(gc, verify)(PTR_FORMAT " not an oop", p2i(obj)); log_error(gc, verify)(PTR_FORMAT " not an oop", p2i(obj));
*failures = true; *failures = true;
return; return;
} }
@ -827,13 +827,13 @@ void HeapRegion::verify(VerifyOption vo,
if (is_region_humongous) { if (is_region_humongous) {
oop obj = oop(this->humongous_start_region()->bottom()); oop obj = oop(this->humongous_start_region()->bottom());
if ((HeapWord*)obj > bottom() || (HeapWord*)obj + obj->size() < bottom()) { if ((HeapWord*)obj > bottom() || (HeapWord*)obj + obj->size() < bottom()) {
log_info(gc, verify)("this humongous region is not part of its' humongous object " PTR_FORMAT, p2i(obj)); log_error(gc, verify)("this humongous region is not part of its' humongous object " PTR_FORMAT, p2i(obj));
} }
} }
if (!is_region_humongous && p != top()) { if (!is_region_humongous && p != top()) {
log_info(gc, verify)("end of last object " PTR_FORMAT " " log_error(gc, verify)("end of last object " PTR_FORMAT " "
"does not match top " PTR_FORMAT, p2i(p), p2i(top())); "does not match top " PTR_FORMAT, p2i(p), p2i(top()));
*failures = true; *failures = true;
return; return;
} }
@ -847,9 +847,9 @@ void HeapRegion::verify(VerifyOption vo,
HeapWord* addr_1 = p; HeapWord* addr_1 = p;
HeapWord* b_start_1 = _bot_part.block_start_const(addr_1); HeapWord* b_start_1 = _bot_part.block_start_const(addr_1);
if (b_start_1 != p) { if (b_start_1 != p) {
log_info(gc, verify)("BOT look up for top: " PTR_FORMAT " " log_error(gc, verify)("BOT look up for top: " PTR_FORMAT " "
" yielded " PTR_FORMAT ", expecting " PTR_FORMAT, " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
p2i(addr_1), p2i(b_start_1), p2i(p)); p2i(addr_1), p2i(b_start_1), p2i(p));
*failures = true; *failures = true;
return; return;
} }
@ -859,9 +859,9 @@ void HeapRegion::verify(VerifyOption vo,
if (addr_2 < the_end) { if (addr_2 < the_end) {
HeapWord* b_start_2 = _bot_part.block_start_const(addr_2); HeapWord* b_start_2 = _bot_part.block_start_const(addr_2);
if (b_start_2 != p) { if (b_start_2 != p) {
log_info(gc, verify)("BOT look up for top + 1: " PTR_FORMAT " " log_error(gc, verify)("BOT look up for top + 1: " PTR_FORMAT " "
" yielded " PTR_FORMAT ", expecting " PTR_FORMAT, " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
p2i(addr_2), p2i(b_start_2), p2i(p)); p2i(addr_2), p2i(b_start_2), p2i(p));
*failures = true; *failures = true;
return; return;
} }
@ -873,9 +873,9 @@ void HeapRegion::verify(VerifyOption vo,
if (addr_3 < the_end) { if (addr_3 < the_end) {
HeapWord* b_start_3 = _bot_part.block_start_const(addr_3); HeapWord* b_start_3 = _bot_part.block_start_const(addr_3);
if (b_start_3 != p) { if (b_start_3 != p) {
log_info(gc, verify)("BOT look up for top + diff: " PTR_FORMAT " " log_error(gc, verify)("BOT look up for top + diff: " PTR_FORMAT " "
" yielded " PTR_FORMAT ", expecting " PTR_FORMAT, " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
p2i(addr_3), p2i(b_start_3), p2i(p)); p2i(addr_3), p2i(b_start_3), p2i(p));
*failures = true; *failures = true;
return; return;
} }
@ -885,9 +885,9 @@ void HeapRegion::verify(VerifyOption vo,
HeapWord* addr_4 = the_end - 1; HeapWord* addr_4 = the_end - 1;
HeapWord* b_start_4 = _bot_part.block_start_const(addr_4); HeapWord* b_start_4 = _bot_part.block_start_const(addr_4);
if (b_start_4 != p) { if (b_start_4 != p) {
log_info(gc, verify)("BOT look up for end - 1: " PTR_FORMAT " " log_error(gc, verify)("BOT look up for end - 1: " PTR_FORMAT " "
" yielded " PTR_FORMAT ", expecting " PTR_FORMAT, " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
p2i(addr_4), p2i(b_start_4), p2i(p)); p2i(addr_4), p2i(b_start_4), p2i(p));
*failures = true; *failures = true;
return; return;
} }
@ -924,7 +924,7 @@ void HeapRegion::verify_rem_set(VerifyOption vo, bool* failures) const {
return; return;
} }
} else { } else {
log_info(gc, verify)(PTR_FORMAT " not an oop", p2i(obj)); log_error(gc, verify)(PTR_FORMAT " not an oop", p2i(obj));
*failures = true; *failures = true;
return; return;
} }

10
hotspot/src/share/vm/gc/g1/satbMarkQueue.cpp
View file

@ -221,13 +221,13 @@ void SATBMarkQueueSet::handle_zero_index_for_thread(JavaThread* t) {
#ifdef ASSERT #ifdef ASSERT
void SATBMarkQueueSet::dump_active_states(bool expected_active) { void SATBMarkQueueSet::dump_active_states(bool expected_active) {
log_info(gc, verify)("Expected SATB active state: %s", expected_active ? "ACTIVE" : "INACTIVE"); log_error(gc, verify)("Expected SATB active state: %s", expected_active ? "ACTIVE" : "INACTIVE");
log_info(gc, verify)("Actual SATB active states:"); log_error(gc, verify)("Actual SATB active states:");
log_info(gc, verify)(" Queue set: %s", is_active() ? "ACTIVE" : "INACTIVE"); log_error(gc, verify)(" Queue set: %s", is_active() ? "ACTIVE" : "INACTIVE");
for (JavaThread* t = Threads::first(); t; t = t->next()) { for (JavaThread* t = Threads::first(); t; t = t->next()) {
log_info(gc, verify)(" Thread \"%s\" queue: %s", t->name(), t->satb_mark_queue().is_active() ? "ACTIVE" : "INACTIVE"); log_error(gc, verify)(" Thread \"%s\" queue: %s", t->name(), t->satb_mark_queue().is_active() ? "ACTIVE" : "INACTIVE");
} }
log_info(gc, verify)(" Shared queue: %s", shared_satb_queue()->is_active() ? "ACTIVE" : "INACTIVE"); log_error(gc, verify)(" Shared queue: %s", shared_satb_queue()->is_active() ? "ACTIVE" : "INACTIVE");
} }
void SATBMarkQueueSet::verify_active_states(bool expected_active) { void SATBMarkQueueSet::verify_active_states(bool expected_active) {

20
hotspot/src/share/vm/gc/g1/youngList.cpp
View file

@ -99,10 +99,10 @@ bool YoungList::check_list_well_formed() {
HeapRegion* last = NULL; HeapRegion* last = NULL;
while (curr != NULL) { while (curr != NULL) {
if (!curr->is_young()) { if (!curr->is_young()) {
log_info(gc, verify)("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " " log_error(gc, verify)("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " "
"incorrectly tagged (y: %d, surv: %d)", "incorrectly tagged (y: %d, surv: %d)",
p2i(curr->bottom()), p2i(curr->end()), p2i(curr->bottom()), p2i(curr->end()),
curr->is_young(), curr->is_survivor()); curr->is_young(), curr->is_survivor());
ret = false; ret = false;
} }
++length; ++length;
@ -112,8 +112,8 @@ bool YoungList::check_list_well_formed() {
ret = ret && (length == _length); ret = ret && (length == _length);
if (!ret) { if (!ret) {
log_info(gc, verify)("### YOUNG LIST seems not well formed!"); log_error(gc, verify)("### YOUNG LIST seems not well formed!");
log_info(gc, verify)("### list has %u entries, _length is %u", length, _length); log_error(gc, verify)("### list has %u entries, _length is %u", length, _length);
} }
return ret; return ret;
@ -123,19 +123,19 @@ bool YoungList::check_list_empty(bool check_sample) {
bool ret = true; bool ret = true;
if (_length != 0) { if (_length != 0) {
log_info(gc, verify)("### YOUNG LIST should have 0 length, not %u", _length); log_error(gc, verify)("### YOUNG LIST should have 0 length, not %u", _length);
ret = false; ret = false;
} }
if (check_sample && _last_sampled_rs_lengths != 0) { if (check_sample && _last_sampled_rs_lengths != 0) {
log_info(gc, verify)("### YOUNG LIST has non-zero last sampled RS lengths"); log_error(gc, verify)("### YOUNG LIST has non-zero last sampled RS lengths");
ret = false; ret = false;
} }
if (_head != NULL) { if (_head != NULL) {
log_info(gc, verify)("### YOUNG LIST does not have a NULL head"); log_error(gc, verify)("### YOUNG LIST does not have a NULL head");
ret = false; ret = false;
} }
if (!ret) { if (!ret) {
log_info(gc, verify)("### YOUNG LIST does not seem empty"); log_error(gc, verify)("### YOUNG LIST does not seem empty");
} }
return ret; return ret;