src/share/vm/utilities/vmError.cpp

rev 12854 : [mq]: gcinterface.patch

*** 797,807 ****
       }
  
    STEP("printing heap information")
  
       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();
       }
  
--- 797,807 ----
       }
  
    STEP("printing heap information")
  
       if (_verbose && Universe::is_fully_initialized()) {
!        GC::gc()->heap()->print_on_error(st);
         st->cr();
         st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));
         st->cr();
       }
  
*** 974,984 ****
  
    // STEP("printing heap information")
  
    if (Universe::is_fully_initialized()) {
      MutexLocker hl(Heap_lock);
!     Universe::heap()->print_on_error(st);
      st->cr();
      st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));
      st->cr();
    }
  
--- 974,984 ----
  
    // STEP("printing heap information")
  
    if (Universe::is_fully_initialized()) {
      MutexLocker hl(Heap_lock);
!     GC::gc()->heap()->print_on_error(st);
      st->cr();
      st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));
      st->cr();
    }
  
*** 1445,1455 ****
    tty->print_cr("#");
    tty->print_cr("# java.lang.OutOfMemoryError: %s", _message);
    tty->print_cr("# -XX:OnOutOfMemoryError=\"%s\"", OnOutOfMemoryError);
  
    // make heap parsability
!   Universe::heap()->ensure_parsability(false);  // no need to retire TLABs
  
    char* cmd;
    const char* ptr = OnOutOfMemoryError;
    while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
      tty->print("#   Executing ");
--- 1445,1455 ----
    tty->print_cr("#");
    tty->print_cr("# java.lang.OutOfMemoryError: %s", _message);
    tty->print_cr("# -XX:OnOutOfMemoryError=\"%s\"", OnOutOfMemoryError);
  
    // make heap parsability
!   GC::gc()->heap()->ensure_parsability(false);  // no need to retire TLABs
  
    char* cmd;
    const char* ptr = OnOutOfMemoryError;
    while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
      tty->print("#   Executing ");