src/share/vm/runtime/thread.cpp

*** 834,844 ****
  }
  
  void Thread::print_on(outputStream* st) const {
    // get_priority assumes osthread initialized
    if (osthread() != NULL) {
!     st->print("prio=%d tid=" INTPTR_FORMAT " ", get_priority(this), this);
      osthread()->print_on(st);
    }
    debug_only(if (WizardMode) print_owned_locks_on(st);)
  }
  
--- 834,848 ----
  }
  
  void Thread::print_on(outputStream* st) const {
    // get_priority assumes osthread initialized
    if (osthread() != NULL) {
!     int os_prio;
!     if (os::get_native_priority(this, &os_prio) == OS_OK) {
!       st->print("os_prio=%d ", os_prio);
!     }
!     st->print("tid=" INTPTR_FORMAT " ", this);
      osthread()->print_on(st);
    }
    debug_only(if (WizardMode) print_owned_locks_on(st);)
  }
  
*** 2741,2751 ****
  
  // Called by Threads::print() for VM_PrintThreads operation
  void JavaThread::print_on(outputStream *st) const {
    st->print("\"%s\" ", get_thread_name());
    oop thread_oop = threadObj();
!   if (thread_oop != NULL && java_lang_Thread::is_daemon(thread_oop))  st->print("daemon ");
    Thread::print_on(st);
    // print guess for valid stack memory region (assume 4K pages); helps lock debugging
    st->print_cr("[" INTPTR_FORMAT "]", (intptr_t)last_Java_sp() & ~right_n_bits(12));
    if (thread_oop != NULL && JDK_Version::is_gte_jdk15x_version()) {
      st->print_cr("   java.lang.Thread.State: %s", java_lang_Thread::thread_status_name(thread_oop));
--- 2745,2759 ----
  
  // Called by Threads::print() for VM_PrintThreads operation
  void JavaThread::print_on(outputStream *st) const {
    st->print("\"%s\" ", get_thread_name());
    oop thread_oop = threadObj();
!   if (thread_oop != NULL) {
!     st->print("#" INT64_FORMAT " ", java_lang_Thread::thread_id(thread_oop));
!     if (java_lang_Thread::is_daemon(thread_oop))  st->print("daemon ");
!     st->print("prio=%d ", java_lang_Thread::priority(thread_oop));
!   }
    Thread::print_on(st);
    // print guess for valid stack memory region (assume 4K pages); helps lock debugging
    st->print_cr("[" INTPTR_FORMAT "]", (intptr_t)last_Java_sp() & ~right_n_bits(12));
    if (thread_oop != NULL && JDK_Version::is_gte_jdk15x_version()) {
      st->print_cr("   java.lang.Thread.State: %s", java_lang_Thread::thread_status_name(thread_oop));
*** 4268,4279 ****
  
    VMThread::vm_thread()->print_on(st);
    st->cr();
    Universe::heap()->print_gc_threads_on(st);
    WatcherThread* wt = WatcherThread::watcher_thread();
!   if (wt != NULL) wt->print_on(st);
    st->cr();
    CompileBroker::print_compiler_threads_on(st);
    st->flush();
  }
  
  // Threads::print_on_error() is called by fatal error handler. It's possible
--- 4276,4289 ----
  
    VMThread::vm_thread()->print_on(st);
    st->cr();
    Universe::heap()->print_gc_threads_on(st);
    WatcherThread* wt = WatcherThread::watcher_thread();
!   if (wt != NULL) {
!     wt->print_on(st);
      st->cr();
+   }
    CompileBroker::print_compiler_threads_on(st);
    st->flush();
  }
  
  // Threads::print_on_error() is called by fatal error handler. It's possible