Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/deoptimization.cpp	Fri Nov 16 15:49:46 2012 -0800
     1.2 +++ b/src/share/vm/runtime/deoptimization.cpp	Wed Nov 21 05:57:12 2012 -0800
     1.3 @@ -1242,8 +1242,8 @@
     1.4    nmethodLocker nl(fr.pc());
     1.5  
     1.6    // Log a message
     1.7 -  Events::log_deopt_message(thread, "Uncommon trap %d fr.pc " INTPTR_FORMAT,
     1.8 -                            trap_request, fr.pc());
     1.9 +  Events::log(thread, "Uncommon trap: trap_request=" PTR32_FORMAT " fr.pc=" INTPTR_FORMAT,
    1.10 +              trap_request, fr.pc());
    1.11  
    1.12    {
    1.13      ResourceMark rm;
    1.14 @@ -1274,6 +1274,11 @@
    1.15      MethodData* trap_mdo =
    1.16        get_method_data(thread, trap_method, create_if_missing);
    1.17  
    1.18 +    // Log a message
    1.19 +    Events::log_deopt_message(thread, "Uncommon trap: reason=%s action=%s pc=" INTPTR_FORMAT " method=%s @ %d",
    1.20 +                              trap_reason_name(reason), trap_action_name(action), fr.pc(),
    1.21 +                              trap_method->name_and_sig_as_C_string(), trap_bci);
    1.22 +
    1.23      // Print a bunch of diagnostics, if requested.
    1.24      if (TraceDeoptimization || LogCompilation) {
    1.25        ResourceMark rm;

     2.1 --- a/src/share/vm/utilities/events.hpp	Fri Nov 16 15:49:46 2012 -0800
     2.2 +++ b/src/share/vm/utilities/events.hpp	Wed Nov 21 05:57:12 2012 -0800
     2.3 @@ -135,11 +135,11 @@
     2.4  };
     2.5  
     2.6  // A simple wrapper class for fixed size text messages.
     2.7 -class StringLogMessage : public FormatBuffer<132> {
     2.8 +class StringLogMessage : public FormatBuffer<256> {
     2.9   public:
    2.10    // Wrap this buffer in a stringStream.
    2.11    stringStream stream() {
    2.12 -    return stringStream(_buf, sizeof(_buf));
    2.13 +    return stringStream(_buf, size());
    2.14    }
    2.15  };
    2.16