src/share/vm/oops/markOop.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 23,39 ****
   */
  
  #include "precompiled.hpp"
  #include "oops/markOop.hpp"
  #include "runtime/thread.inline.hpp"
  
  PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
  
  void markOopDesc::print_on(outputStream* st) const {
!   if (is_locked()) {
!     st->print("locked(" INTPTR_FORMAT ")->", value());
!     markOop(*(markOop*)value())->print_on(st);
    } else {
      assert(is_unlocked() || has_bias_pattern(), "just checking");
      st->print("mark(");
      if (has_bias_pattern())  st->print("biased,");
      st->print("hash %#lx,", hash());
--- 23,62 ----
   */
  
  #include "precompiled.hpp"
  #include "oops/markOop.hpp"
  #include "runtime/thread.inline.hpp"
+ #include "runtime/objectMonitor.inline.hpp"
  
  PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
  
  void markOopDesc::print_on(outputStream* st) const {
!   if (is_marked()) {
!     st->print(" marked(" INTPTR_FORMAT ")", value());
!   } else if (is_locked()) {
!     st->print(" locked(" INTPTR_FORMAT ")->", value());
!     if (is_neutral()) {
!       st->print("is_neutral");
!       if (has_no_hash()) st->print(" no_hash");
!       else st->print(" hash=" INTPTR_FORMAT, hash());
!       st->print(" age=%d", age());
!     } else if (has_bias_pattern()) {
!       st->print("is_biased");
!       JavaThread* jt = biased_locker();
!       st->print(" biased_locker=" INTPTR_FORMAT, p2i(jt));
!     } else if (has_monitor()) {
!       ObjectMonitor* mon = monitor();
!       if (mon == NULL)
!         st->print("monitor=NULL");
!       else {
!         BasicLock * bl = (BasicLock *) mon->owner();
!         st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}",
!                 mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
!       }
!     } else {
!       st->print("??");
!     }
    } else {
      assert(is_unlocked() || has_bias_pattern(), "just checking");
      st->print("mark(");
      if (has_bias_pattern()) st->print("biased,");
      st->print("hash %#lx,", hash());