src/share/vm/memory/metaspace.cpp

rev 8039 : [mq]: container_count

*** 344,354 ****
  
    uintx container_count() { return _container_count; }
    void inc_container_count();
    void dec_container_count();
  #ifdef ASSERT
!   uint container_count_slow();
    void verify_container_count();
  #endif
  
    // used and capacity in this single entry in the list
    size_t used_words_in_vs() const;
--- 344,354 ----
  
    uintx container_count() { return _container_count; }
    void inc_container_count();
    void dec_container_count();
  #ifdef ASSERT
!   uintx container_count_slow();
    void verify_container_count();
  #endif
  
    // used and capacity in this single entry in the list
    size_t used_words_in_vs() const;
*** 461,472 ****
      chunk = (Metachunk*) next;
    }
  }
  
  #ifdef ASSERT
! uint VirtualSpaceNode::container_count_slow() {
!   uint count = 0;
    Metachunk* chunk = first_chunk();
    Metachunk* invalid_chunk = (Metachunk*) top();
    while (chunk < invalid_chunk ) {
      MetaWord* next = ((MetaWord*)chunk) + chunk->word_size();
      // Don't count the chunks on the free lists.  Those are
--- 461,472 ----
      chunk = (Metachunk*) next;
    }
  }
  
  #ifdef ASSERT
! uintx VirtualSpaceNode::container_count_slow() {
!   uintx count = 0;
    Metachunk* chunk = first_chunk();
    Metachunk* invalid_chunk = (Metachunk*) top();
    while (chunk < invalid_chunk ) {
      MetaWord* next = ((MetaWord*)chunk) + chunk->word_size();
      // Don't count the chunks on the free lists.  Those are
*** 796,821 ****
              Monitor::_safepoint_check_never);
  
  void VirtualSpaceNode::inc_container_count() {
    assert_lock_strong(SpaceManager::expand_lock());
    _container_count++;
!   assert(_container_count == container_count_slow(),
!          err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
!                  " container_count_slow() " SIZE_FORMAT,
!                  _container_count, container_count_slow()));
  }
  
  void VirtualSpaceNode::dec_container_count() {
    assert_lock_strong(SpaceManager::expand_lock());
    _container_count--;
  }
  
  #ifdef ASSERT
  void VirtualSpaceNode::verify_container_count() {
    assert(_container_count == container_count_slow(),
!     err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
!             " container_count_slow() " SIZE_FORMAT, _container_count, container_count_slow()));
  }
  #endif
  
  // BlockFreelist methods
  
--- 796,818 ----
              Monitor::_safepoint_check_never);
  
  void VirtualSpaceNode::inc_container_count() {
    assert_lock_strong(SpaceManager::expand_lock());
    _container_count++;
!   DEBUG_ONLY(verify_container_count();)
  }
  
  void VirtualSpaceNode::dec_container_count() {
    assert_lock_strong(SpaceManager::expand_lock());
    _container_count--;
  }
  
  #ifdef ASSERT
  void VirtualSpaceNode::verify_container_count() {
    assert(_container_count == container_count_slow(),
!     err_msg("Inconsistency in container_count _container_count " UINTX_FORMAT
!             " container_count_slow() " UINTX_FORMAT, _container_count, container_count_slow()));
  }
  #endif
  
  // BlockFreelist methods