comparison src/share/vm/gc_implementation/g1/concurrentMark.cpp @ 6865:4202510ee0fe

8000831: Heap verification output incorrect/incomplete Summary: Restore non-silent output of heap verification. Reviewed-by: ysr, brutisso, jmasa
author johnc
date Mon, 15 Oct 2012 10:02:42 -0700
parents 8a5ea0a9ccc4
children 442f942757c0
comparison
equal deleted inserted replaced
6864:dd2b66d09ccd 6865:4202510ee0fe
1118 1118
1119 if (VerifyDuringGC) { 1119 if (VerifyDuringGC) {
1120 HandleMark hm; // handle scope 1120 HandleMark hm; // handle scope
1121 gclog_or_tty->print(" VerifyDuringGC:(before)"); 1121 gclog_or_tty->print(" VerifyDuringGC:(before)");
1122 Universe::heap()->prepare_for_verify(); 1122 Universe::heap()->prepare_for_verify();
1123 Universe::verify(/* silent */ false, 1123 Universe::verify(/* silent */ false,
1124 /* option */ VerifyOption_G1UsePrevMarking); 1124 /* option */ VerifyOption_G1UsePrevMarking);
1125 } 1125 }
1126 1126
1127 G1CollectorPolicy* g1p = g1h->g1_policy(); 1127 G1CollectorPolicy* g1p = g1h->g1_policy();
1128 g1p->record_concurrent_mark_remark_start(); 1128 g1p->record_concurrent_mark_remark_start();
1129 1129
1157 1157
1158 if (VerifyDuringGC) { 1158 if (VerifyDuringGC) {
1159 HandleMark hm; // handle scope 1159 HandleMark hm; // handle scope
1160 gclog_or_tty->print(" VerifyDuringGC:(after)"); 1160 gclog_or_tty->print(" VerifyDuringGC:(after)");
1161 Universe::heap()->prepare_for_verify(); 1161 Universe::heap()->prepare_for_verify();
1162 Universe::verify(/* silent */ false, 1162 Universe::verify(/* silent */ false,
1163 /* option */ VerifyOption_G1UseNextMarking); 1163 /* option */ VerifyOption_G1UseNextMarking);
1164 } 1164 }
1165 assert(!restart_for_overflow(), "sanity"); 1165 assert(!restart_for_overflow(), "sanity");
1166 } 1166 }
1167 1167
1168 // Reset the marking state if marking completed 1168 // Reset the marking state if marking completed
1809 1809
1810 if (VerifyDuringGC) { 1810 if (VerifyDuringGC) {
1811 HandleMark hm; // handle scope 1811 HandleMark hm; // handle scope
1812 gclog_or_tty->print(" VerifyDuringGC:(before)"); 1812 gclog_or_tty->print(" VerifyDuringGC:(before)");
1813 Universe::heap()->prepare_for_verify(); 1813 Universe::heap()->prepare_for_verify();
1814 Universe::verify(/* silent */ false, 1814 Universe::verify(/* silent */ false,
1815 /* option */ VerifyOption_G1UsePrevMarking); 1815 /* option */ VerifyOption_G1UsePrevMarking);
1816 } 1816 }
1817 1817
1818 G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy(); 1818 G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
1819 g1p->record_concurrent_mark_cleanup_start(); 1819 g1p->record_concurrent_mark_cleanup_start();
1820 1820
1964 1964
1965 if (VerifyDuringGC) { 1965 if (VerifyDuringGC) {
1966 HandleMark hm; // handle scope 1966 HandleMark hm; // handle scope
1967 gclog_or_tty->print(" VerifyDuringGC:(after)"); 1967 gclog_or_tty->print(" VerifyDuringGC:(after)");
1968 Universe::heap()->prepare_for_verify(); 1968 Universe::heap()->prepare_for_verify();
1969 Universe::verify(/* silent */ false, 1969 Universe::verify(/* silent */ false,
1970 /* option */ VerifyOption_G1UsePrevMarking); 1970 /* option */ VerifyOption_G1UsePrevMarking);
1971 } 1971 }
1972 1972
1973 g1h->verify_region_sets_optional(); 1973 g1h->verify_region_sets_optional();
1974 } 1974 }
1975 1975