src/share/vm/gc/g1/satbMarkQueue.cpp

*** 197,208 ****
    print(name, _buf, _index, _sz);
  }
  
  void SATBMarkQueue::print(const char* name,
                            void** buf, size_t index, size_t sz) {
!   gclog_or_tty->print_cr("  SATB BUFFER [%s] buf: " PTR_FORMAT " "
!                          "index: " SIZE_FORMAT " sz: " SIZE_FORMAT,
                           name, p2i(buf), index, sz);
  }
  #endif // PRODUCT
  
  SATBMarkQueueSet::SATBMarkQueueSet() :
--- 197,207 ----
    print(name, _buf, _index, _sz);
  }
  
  void SATBMarkQueue::print(const char* name,
                            void** buf, size_t index, size_t sz) {
!   tty->print_cr("  SATB BUFFER [%s] buf: " PTR_FORMAT " index: " SIZE_FORMAT " sz: " SIZE_FORMAT,
                  name, p2i(buf), index, sz);
  }
  #endif // PRODUCT
  
  SATBMarkQueueSet::SATBMarkQueueSet() :
*** 220,239 ****
    t->satb_mark_queue().handle_zero_index();
  }
  
  #ifdef ASSERT
  void SATBMarkQueueSet::dump_active_states(bool expected_active) {
!   gclog_or_tty->print_cr("Expected SATB active state: %s",
!                          expected_active ? "ACTIVE" : "INACTIVE");
!   gclog_or_tty->print_cr("Actual SATB active states:");
!   gclog_or_tty->print_cr("  Queue set: %s", is_active() ? "ACTIVE" : "INACTIVE");
    for (JavaThread* t = Threads::first(); t; t = t->next()) {
!     gclog_or_tty->print_cr("  Thread \"%s\" queue: %s", t->name(),
!                            t->satb_mark_queue().is_active() ? "ACTIVE" : "INACTIVE");
    }
!   gclog_or_tty->print_cr("  Shared queue: %s",
!                          shared_satb_queue()->is_active() ? "ACTIVE" : "INACTIVE");
  }
  
  void SATBMarkQueueSet::verify_active_states(bool expected_active) {
    // Verify queue set state
    if (is_active() != expected_active) {
--- 219,235 ----
    t->satb_mark_queue().handle_zero_index();
  }
  
  #ifdef ASSERT
  void SATBMarkQueueSet::dump_active_states(bool expected_active) {
!   log_info(gc, verify)("Expected SATB active state: %s", expected_active ? "ACTIVE" : "INACTIVE");
!   log_info(gc, verify)("Actual SATB active states:");
!   log_info(gc, verify)("  Queue set: %s", is_active() ? "ACTIVE" : "INACTIVE");
    for (JavaThread* t = Threads::first(); t; t = t->next()) {
!     log_info(gc, verify)("  Thread \"%s\" queue: %s", t->name(), t->satb_mark_queue().is_active() ? "ACTIVE" : "INACTIVE");
    }
!   log_info(gc, verify)("  Shared queue: %s", shared_satb_queue()->is_active() ? "ACTIVE" : "INACTIVE");
  }
  
  void SATBMarkQueueSet::verify_active_states(bool expected_active) {
    // Verify queue set state
    if (is_active() != expected_active) {
*** 316,327 ****
  
  void SATBMarkQueueSet::print_all(const char* msg) {
    char buffer[SATB_PRINTER_BUFFER_SIZE];
    assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint.");
  
!   gclog_or_tty->cr();
!   gclog_or_tty->print_cr("SATB BUFFERS [%s]", msg);
  
    BufferNode* nd = _completed_buffers_head;
    int i = 0;
    while (nd != NULL) {
      void** buf = BufferNode::make_buffer_from_node(nd);
--- 312,323 ----
  
  void SATBMarkQueueSet::print_all(const char* msg) {
    char buffer[SATB_PRINTER_BUFFER_SIZE];
    assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint.");
  
!   tty->cr();
!   tty->print_cr("SATB BUFFERS [%s]", msg);
  
    BufferNode* nd = _completed_buffers_head;
    int i = 0;
    while (nd != NULL) {
      void** buf = BufferNode::make_buffer_from_node(nd);
*** 336,346 ****
      t->satb_mark_queue().print(buffer);
    }
  
    shared_satb_queue()->print("Shared");
  
!   gclog_or_tty->cr();
  }
  #endif // PRODUCT
  
  void SATBMarkQueueSet::abandon_partial_marking() {
    BufferNode* buffers_to_delete = NULL;
--- 332,342 ----
      t->satb_mark_queue().print(buffer);
    }
  
    shared_satb_queue()->print("Shared");
  
!   tty->cr();
  }
  #endif // PRODUCT
  
  void SATBMarkQueueSet::abandon_partial_marking() {
    BufferNode* buffers_to_delete = NULL;