src/hotspot/share/runtime/thread.cpp

rev 48227 : 8193135: get rid of redundant _smr_ prefix/infix in ThreadSMRSupport stuff
Reviewed-by:

*** 3471,3481 ****
           MACRO_current_p != MACRO_end;                                                                                    \
           MACRO_current_p++,                                                                                               \
               X = (JavaThread*)prefetch_and_load_ptr((void**)MACRO_current_p, (intx)MACRO_scan_interval))
  
  // All JavaThreads
! #define ALL_JAVA_THREADS(X) DO_JAVA_THREADS(ThreadsSMRSupport::get_smr_java_thread_list(), X)
  
  // All JavaThreads + all non-JavaThreads (i.e., every thread in the system)
  void Threads::threads_do(ThreadClosure* tc) {
    assert_locked_or_safepoint(Threads_lock);
    // ALL_JAVA_THREADS iterates through all JavaThreads
--- 3471,3481 ----
           MACRO_current_p != MACRO_end;                                                                                    \
           MACRO_current_p++,                                                                                               \
               X = (JavaThread*)prefetch_and_load_ptr((void**)MACRO_current_p, (intx)MACRO_scan_interval))
  
  // All JavaThreads
! #define ALL_JAVA_THREADS(X) DO_JAVA_THREADS(ThreadsSMRSupport::get_java_thread_list(), X)
  
  // All JavaThreads + all non-JavaThreads (i.e., every thread in the system)
  void Threads::threads_do(ThreadClosure* tc) {
    assert_locked_or_safepoint(Threads_lock);
    // ALL_JAVA_THREADS iterates through all JavaThreads
*** 4380,4390 ****
  
    // Extra scope needed for Thread_lock, so we can check
    // that we do not remove thread without safepoint code notice
    { MutexLocker ml(Threads_lock);
  
!     assert(ThreadsSMRSupport::get_smr_java_thread_list()->includes(p), "p must be present");
  
      // Maintain fast thread list
      ThreadsSMRSupport::remove_thread(p);
  
      JavaThread* current = _thread_list;
--- 4380,4390 ----
  
    // Extra scope needed for Thread_lock, so we can check
    // that we do not remove thread without safepoint code notice
    { MutexLocker ml(Threads_lock);
  
!     assert(ThreadsSMRSupport::get_java_thread_list()->includes(p), "p must be present");
  
      // Maintain fast thread list
      ThreadsSMRSupport::remove_thread(p);
  
      JavaThread* current = _thread_list;
*** 4608,4618 ****
    if (print_concurrent_locks) {
      concurrent_locks.dump_at_safepoint();
    }
  #endif // INCLUDE_SERVICES
  
!   ThreadsSMRSupport::print_smr_info_on(st);
    st->cr();
  
    ALL_JAVA_THREADS(p) {
      ResourceMark rm;
      p->print_on(st);
--- 4608,4618 ----
    if (print_concurrent_locks) {
      concurrent_locks.dump_at_safepoint();
    }
  #endif // INCLUDE_SERVICES
  
!   ThreadsSMRSupport::print_info_on(st);
    st->cr();
  
    ALL_JAVA_THREADS(p) {
      ResourceMark rm;
      p->print_on(st);
*** 4677,4687 ****
  // that VM is not at safepoint and/or current thread is inside signal handler.
  // Don't print stack trace, as the stack may not be walkable. Don't allocate
  // memory (even in resource area), it might deadlock the error handler.
  void Threads::print_on_error(outputStream* st, Thread* current, char* buf,
                               int buflen) {
!   ThreadsSMRSupport::print_smr_info_on(st);
    st->cr();
  
    bool found_current = false;
    st->print_cr("Java Threads: ( => current thread )");
    ALL_JAVA_THREADS(thread) {
--- 4677,4687 ----
  // that VM is not at safepoint and/or current thread is inside signal handler.
  // Don't print stack trace, as the stack may not be walkable. Don't allocate
  // memory (even in resource area), it might deadlock the error handler.
  void Threads::print_on_error(outputStream* st, Thread* current, char* buf,
                               int buflen) {
!   ThreadsSMRSupport::print_info_on(st);
    st->cr();
  
    bool found_current = false;
    st->print_cr("Java Threads: ( => current thread )");
    ALL_JAVA_THREADS(thread) {