src/hotspot/share/runtime/thread.cpp

rev 49939 : imported patch 8191798.eosterlund.open.patch.00
rev 49940 : imported patch 8191798.dcubed.open.cr0.00

*** 241,251 ****
    set_last_handle_mark(NULL);
  
    // This initial value ==> never claimed.
    _oops_do_parity = 0;
    _threads_hazard_ptr = NULL;
!   _nested_threads_hazard_ptr = NULL;
    _nested_threads_hazard_ptr_cnt = 0;
    _rcu_counter = 0;
  
    // the handle mark links itself to last_handle_mark
    new HandleMark(this);
--- 241,251 ----
    set_last_handle_mark(NULL);
  
    // This initial value ==> never claimed.
    _oops_do_parity = 0;
    _threads_hazard_ptr = NULL;
!   _threads_list_ptr = NULL;
    _nested_threads_hazard_ptr_cnt = 0;
    _rcu_counter = 0;
  
    // the handle mark links itself to last_handle_mark
    new HandleMark(this);
*** 879,915 ****
        st->print("os_prio=%d ", os_prio);
      }
      st->print("tid=" INTPTR_FORMAT " ", p2i(this));
      osthread()->print_on(st);
    }
!   if (_threads_hazard_ptr != NULL) {
!     st->print("_threads_hazard_ptr=" INTPTR_FORMAT, p2i(_threads_hazard_ptr));
!   }
!   if (_nested_threads_hazard_ptr != NULL) {
!     print_nested_threads_hazard_ptrs_on(st);
!   }
    st->print(" ");
    debug_only(if (WizardMode) print_owned_locks_on(st);)
  }
  
- void Thread::print_nested_threads_hazard_ptrs_on(outputStream* st) const {
-   assert(_nested_threads_hazard_ptr != NULL, "must be set to print");
- 
-   if (EnableThreadSMRStatistics) {
-     st->print(", _nested_threads_hazard_ptr_cnt=%u", _nested_threads_hazard_ptr_cnt);
-   }
-   st->print(", _nested_threads_hazard_ptrs=");
-   for (NestedThreadsList* node = _nested_threads_hazard_ptr; node != NULL;
-        node = node->next()) {
-     if (node != _nested_threads_hazard_ptr) {
-       // First node does not need a comma-space separator.
-       st->print(", ");
-     }
-     st->print(INTPTR_FORMAT, p2i(node->t_list()));
-   }
- }
- 
  // Thread::print_on_error() is called by fatal error handler. Don't use
  // any lock or allocate memory.
  void Thread::print_on_error(outputStream* st, char* buf, int buflen) const {
    assert(!(is_Compiler_thread() || is_Java_thread()), "Can't call name() here if it allocates");
  
--- 879,893 ----
        st->print("os_prio=%d ", os_prio);
      }
      st->print("tid=" INTPTR_FORMAT " ", p2i(this));
      osthread()->print_on(st);
    }
!   ThreadsSMRSupport::print_info_on(this, st);
    st->print(" ");
    debug_only(if (WizardMode) print_owned_locks_on(st);)
  }
  
  // Thread::print_on_error() is called by fatal error handler. Don't use
  // any lock or allocate memory.
  void Thread::print_on_error(outputStream* st, char* buf, int buflen) const {
    assert(!(is_Compiler_thread() || is_Java_thread()), "Can't call name() here if it allocates");
  
*** 928,943 ****
  
    if (osthread()) {
      st->print(" [id=%d]", osthread()->thread_id());
    }
  
!   if (_threads_hazard_ptr != NULL) {
!     st->print(" _threads_hazard_ptr=" INTPTR_FORMAT, p2i(_threads_hazard_ptr));
!   }
!   if (_nested_threads_hazard_ptr != NULL) {
!     print_nested_threads_hazard_ptrs_on(st);
!   }
  }
  
  void Thread::print_value_on(outputStream* st) const {
    if (is_Named_thread()) {
      st->print(" \"%s\" ", name());
--- 906,916 ----
  
    if (osthread()) {
      st->print(" [id=%d]", osthread()->thread_id());
    }
  
!   ThreadsSMRSupport::print_info_on(this, st);
  }
  
  void Thread::print_value_on(outputStream* st) const {
    if (is_Named_thread()) {
      st->print(" \"%s\" ", name());
*** 2993,3008 ****
    }
    st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ")",
              p2i(stack_end()), p2i(stack_base()));
    st->print("]");
  
!   if (_threads_hazard_ptr != NULL) {
!     st->print(" _threads_hazard_ptr=" INTPTR_FORMAT, p2i(_threads_hazard_ptr));
!   }
!   if (_nested_threads_hazard_ptr != NULL) {
!     print_nested_threads_hazard_ptrs_on(st);
!   }
    return;
  }
  
  // Verification
  
--- 2966,2976 ----
    }
    st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ")",
              p2i(stack_end()), p2i(stack_base()));
    st->print("]");
  
!   ThreadsSMRSupport::print_info_on(this, st);
    return;
  }
  
  // Verification