1.1 --- a/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp Wed Jan 18 09:50:16 2012 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp Wed Feb 15 13:06:53 2012 -0500
1.3 @@ -131,8 +131,8 @@
1.4 ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
1.5
1.6 // Generates the format string
1.7 -#define ergo_format(_action_, _extra_format_) \
1.8 - " %1.3f: [G1Ergonomics (%s) " _action_ _extra_format_ "]"
1.9 +#define ergo_format(_extra_format_) \
1.10 + " %1.3f: [G1Ergonomics (%s) %s" _extra_format_ "]"
1.11
1.12 // Conditionally, prints an ergonomic decision record. _extra_format_
1.13 // is the format string for the optional items we'd like to print
1.14 @@ -145,20 +145,21 @@
1.15 // them to the print method. For convenience, we have wrapper macros
1.16 // below which take a specific number of arguments and set the rest to
1.17 // a default value.
1.18 -#define ergo_verbose_common(_tag_, _action_, _extra_format_, \
1.19 +#define ergo_verbose_common(_tag_, _action_, _extra_format_, \
1.20 _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_) \
1.21 - do { \
1.22 - if (G1ErgoVerbose::enabled((_tag_))) { \
1.23 - gclog_or_tty->print_cr(ergo_format(_action_, _extra_format_), \
1.24 - os::elapsedTime(), \
1.25 - G1ErgoVerbose::to_string((_tag_)), \
1.26 - (_arg0_), (_arg1_), (_arg2_), \
1.27 - (_arg3_), (_arg4_), (_arg5_)); \
1.28 - } \
1.29 + do { \
1.30 + if (G1ErgoVerbose::enabled((_tag_))) { \
1.31 + gclog_or_tty->print_cr(ergo_format(_extra_format_), \
1.32 + os::elapsedTime(), \
1.33 + G1ErgoVerbose::to_string((_tag_)), \
1.34 + (_action_), \
1.35 + (_arg0_), (_arg1_), (_arg2_), \
1.36 + (_arg3_), (_arg4_), (_arg5_)); \
1.37 + } \
1.38 } while (0)
1.39
1.40
1.41 -#define ergo_verbose(_tag_, _action_) \
1.42 +#define ergo_verbose(_tag_, _action_) \
1.43 ergo_verbose_common(_tag_, _action_, "", 0, 0, 0, 0, 0, 0)
1.44
1.45 #define ergo_verbose0(_tag_, _action_, _extra_format_) \
