Mercurial > hg > truffle
diff src/share/vm/runtime/globals.cpp @ 4780:31a5b9aad4bc
Merge
author | jrose |
---|---|
date | Fri, 13 Jan 2012 00:27:53 -0800 |
parents | 4f25538b54c9 |
children | 80fe40862b02 |
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.cpp Thu Jan 12 12:28:59 2012 -0800 +++ b/src/share/vm/runtime/globals.cpp Fri Jan 13 00:27:53 2012 -0800 @@ -488,7 +488,7 @@ } } -void CommandLineFlags::printSetFlags() { +void CommandLineFlags::printSetFlags(outputStream* out) { // Print which flags were set on the command line // note: this method is called before the thread structure is in place // which means resource allocation cannot be used. @@ -507,11 +507,11 @@ // Print for (int i = 0; i < length; i++) { if (array[i]->origin /* naked field! */) { - array[i]->print_as_flag(tty); - tty->print(" "); + array[i]->print_as_flag(out); + out->print(" "); } } - tty->cr(); + out->cr(); FREE_C_HEAP_ARRAY(Flag*, array); } @@ -524,7 +524,7 @@ #endif // PRODUCT -void CommandLineFlags::printFlags(bool withComments) { +void CommandLineFlags::printFlags(outputStream* out, bool withComments) { // Print the flags sorted by name // note: this method is called before the thread structure is in place // which means resource allocation cannot be used. @@ -541,10 +541,10 @@ qsort(array, length, sizeof(Flag*), compare_flags); // Print - tty->print_cr("[Global flags]"); + out->print_cr("[Global flags]"); for (int i = 0; i < length; i++) { if (array[i]->is_unlocked()) { - array[i]->print_on(tty, withComments); + array[i]->print_on(out, withComments); } } FREE_C_HEAP_ARRAY(Flag*, array);