src/share/vm/utilities/vmError.cpp

rev 9019 : [mq]: format.patch

*** 43,54 ****
  #include "utilities/errorReporter.hpp"
  #include "utilities/events.hpp"
  #include "utilities/top.hpp"
  #include "utilities/vmError.hpp"
  
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
- 
  // List of environment variables that should be reported in error log file.
  const char *env_list[] = {
    // All platforms
    "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
    "JAVA_COMPILER", "PATH", "USERNAME",
--- 43,52 ----
*** 282,299 ****
  
    // test secondary error handling. Test it twice, to test that resetting
    // error handler after a secondary crash works.
    STEP(20, "(test secondary crash 1)")
      if (_verbose && TestCrashInErrorHandler != 0) {
!       st->print_cr("Will crash now (TestCrashInErrorHandler=%d)...",
          TestCrashInErrorHandler);
        controlled_crash(TestCrashInErrorHandler);
      }
  
    STEP(30, "(test secondary crash 2)")
      if (_verbose && TestCrashInErrorHandler != 0) {
!       st->print_cr("Will crash now (TestCrashInErrorHandler=%d)...",
          TestCrashInErrorHandler);
        controlled_crash(TestCrashInErrorHandler);
      }
  
    STEP(40, "(test safefetch in error handler)")
--- 280,297 ----
  
    // test secondary error handling. Test it twice, to test that resetting
    // error handler after a secondary crash works.
    STEP(20, "(test secondary crash 1)")
      if (_verbose && TestCrashInErrorHandler != 0) {
!       st->print_cr("Will crash now (TestCrashInErrorHandler=" UINTX_FORMAT ")...",
          TestCrashInErrorHandler);
        controlled_crash(TestCrashInErrorHandler);
      }
  
    STEP(30, "(test secondary crash 2)")
      if (_verbose && TestCrashInErrorHandler != 0) {
!       st->print_cr("Will crash now (TestCrashInErrorHandler=" UINTX_FORMAT ")...",
          TestCrashInErrorHandler);
        controlled_crash(TestCrashInErrorHandler);
      }
  
    STEP(40, "(test safefetch in error handler)")
*** 358,368 ****
       st->print("#  ");
       // Is it an OS exception/signal?
       if (os::exception_name(_id, buf, sizeof(buf))) {
         st->print("%s", buf);
         st->print(" (0x%x)", _id);                // signal number
!        st->print(" at pc=" PTR_FORMAT, _pc);
       } else {
         if (should_report_bug(_id)) {
           st->print("Internal Error");
         } else {
           st->print("Out of Memory Error");
--- 356,366 ----
       st->print("#  ");
       // Is it an OS exception/signal?
       if (os::exception_name(_id, buf, sizeof(buf))) {
         st->print("%s", buf);
         st->print(" (0x%x)", _id);                // signal number
!        st->print(" at pc=" PTR_FORMAT, p2i(_pc));
       } else {
         if (should_report_bug(_id)) {
           st->print("Internal Error");
         } else {
           st->print("Out of Memory Error");
*** 493,503 ****
    STEP(180, "(printing current thread)" )
  
       // current thread
       if (_verbose) {
         if (_thread) {
!          st->print("Current thread (" PTR_FORMAT "):  ", _thread);
           _thread->print_on_error(st, buf, sizeof(buf));
           st->cr();
         } else {
           st->print_cr("Current thread is native thread");
         }
--- 491,501 ----
    STEP(180, "(printing current thread)" )
  
       // current thread
       if (_verbose) {
         if (_thread) {
!          st->print("Current thread (" PTR_FORMAT "):  ", p2i(_thread));
           _thread->print_on_error(st, buf, sizeof(buf));
           st->cr();
         } else {
           st->print_cr("Current thread is native thread");
         }
*** 532,548 ****
            stack_top = os::current_stack_base();
            stack_size = os::current_stack_size();
         }
  
         address stack_bottom = stack_top - stack_size;
!        st->print("[" PTR_FORMAT "," PTR_FORMAT "]", stack_bottom, stack_top);
  
         frame fr = _context ? os::fetch_frame_from_context(_context)
                             : os::current_frame();
  
         if (fr.sp()) {
!          st->print(",  sp=" PTR_FORMAT, fr.sp());
           size_t free_stack_size = pointer_delta(fr.sp(), stack_bottom, 1024);
           st->print(",  free space=" SIZE_FORMAT "k", free_stack_size);
         }
  
         st->cr();
--- 530,546 ----
            stack_top = os::current_stack_base();
            stack_size = os::current_stack_size();
         }
  
         address stack_bottom = stack_top - stack_size;
!        st->print("[" PTR_FORMAT "," PTR_FORMAT "]", p2i(stack_bottom), p2i(stack_top));
  
         frame fr = _context ? os::fetch_frame_from_context(_context)
                             : os::current_frame();
  
         if (fr.sp()) {
!          st->print(",  sp=" PTR_FORMAT, p2i(fr.sp()));
           size_t free_stack_size = pointer_delta(fr.sp(), stack_bottom, 1024);
           st->print(",  free space=" SIZE_FORMAT "k", free_stack_size);
         }
  
         st->cr();
*** 572,582 ****
  
       // printing Java thread stack trace if it is involved in GC crash
       if (_verbose && _thread && (_thread->is_Named_thread())) {
         JavaThread*  jt = ((NamedThread *)_thread)->processed_thread();
         if (jt != NULL) {
!          st->print_cr("JavaThread " PTR_FORMAT " (nid = " UINTX_FORMAT ") was being processed", jt, jt->osthread()->thread_id());
           print_stack_trace(st, jt, buf, sizeof(buf), true);
         }
       }
  
    STEP(240, "(printing siginfo)" )
--- 570,580 ----
  
       // printing Java thread stack trace if it is involved in GC crash
       if (_verbose && _thread && (_thread->is_Named_thread())) {
         JavaThread*  jt = ((NamedThread *)_thread)->processed_thread();
         if (jt != NULL) {
!          st->print_cr("JavaThread " PTR_FORMAT " (nid = %d) was being processed", p2i(jt), jt->osthread()->thread_id());
           print_stack_trace(st, jt, buf, sizeof(buf), true);
         }
       }
  
    STEP(240, "(printing siginfo)" )
*** 684,694 ****
  
       if (_verbose && Universe::is_fully_initialized()) {
         Universe::heap()->print_on_error(st);
         st->cr();
  
!        st->print_cr("Polling page: " INTPTR_FORMAT, os::get_polling_page());
         st->cr();
       }
  
    STEP(350, "(printing code cache information)" )
  
--- 682,692 ----
  
       if (_verbose && Universe::is_fully_initialized()) {
         Universe::heap()->print_on_error(st);
         st->cr();
  
!        st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));
         st->cr();
       }
  
    STEP(350, "(printing code cache information)" )