Mercurial > hg > truffle
comparison src/share/vm/memory/universe.cpp @ 11015:7ee0d5c53c78
Merge
author | chegar |
---|---|
date | Wed, 08 May 2013 15:25:08 +0100 |
parents | b295e132102d b06ac540229e |
children | ce9ecec70f99 |
comparison
equal
deleted
inserted
replaced
11014:4b52137b07c9 | 11015:7ee0d5c53c78 |
---|---|
1288 heap()->print_extended_on(st); | 1288 heap()->print_extended_on(st); |
1289 } | 1289 } |
1290 st->print_cr("}"); | 1290 st->print_cr("}"); |
1291 } | 1291 } |
1292 | 1292 |
1293 void Universe::verify(bool silent, VerifyOption option) { | 1293 void Universe::verify(VerifyOption option, const char* prefix, bool silent) { |
1294 // The use of _verify_in_progress is a temporary work around for | 1294 // The use of _verify_in_progress is a temporary work around for |
1295 // 6320749. Don't bother with a creating a class to set and clear | 1295 // 6320749. Don't bother with a creating a class to set and clear |
1296 // it since it is only used in this method and the control flow is | 1296 // it since it is only used in this method and the control flow is |
1297 // straight forward. | 1297 // straight forward. |
1298 _verify_in_progress = true; | 1298 _verify_in_progress = true; |
1305 | 1305 |
1306 ResourceMark rm; | 1306 ResourceMark rm; |
1307 HandleMark hm; // Handles created during verification can be zapped | 1307 HandleMark hm; // Handles created during verification can be zapped |
1308 _verify_count++; | 1308 _verify_count++; |
1309 | 1309 |
1310 if (!silent) gclog_or_tty->print(prefix); | |
1310 if (!silent) gclog_or_tty->print("[Verifying "); | 1311 if (!silent) gclog_or_tty->print("[Verifying "); |
1311 if (!silent) gclog_or_tty->print("threads "); | 1312 if (!silent) gclog_or_tty->print("threads "); |
1312 Threads::verify(); | 1313 Threads::verify(); |
1314 if (!silent) gclog_or_tty->print("heap "); | |
1313 heap()->verify(silent, option); | 1315 heap()->verify(silent, option); |
1314 | |
1315 if (!silent) gclog_or_tty->print("syms "); | 1316 if (!silent) gclog_or_tty->print("syms "); |
1316 SymbolTable::verify(); | 1317 SymbolTable::verify(); |
1317 if (!silent) gclog_or_tty->print("strs "); | 1318 if (!silent) gclog_or_tty->print("strs "); |
1318 StringTable::verify(); | 1319 StringTable::verify(); |
1319 { | 1320 { |