src/hotspot/share/gc/g1/g1HeapVerifier.cpp

rev 51649 : version 1
rev 52017 : All changes for G1 GC moved from 'combined' repo folder
rev 52488 : Merge

*** 537,554 ****
  
  void G1HeapVerifier::verify_region_sets() {
    assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
  
    // First, check the explicit lists.
!   _g1h->_hrm.verify();
  
    // Finally, make sure that the region accounting in the lists is
    // consistent with what we see in the heap.
  
!   VerifyRegionListsClosure cl(&_g1h->_old_set, &_g1h->_archive_set, &_g1h->_humongous_set, &_g1h->_hrm);
    _g1h->heap_region_iterate(&cl);
!   cl.verify_counts(&_g1h->_old_set, &_g1h->_archive_set, &_g1h->_humongous_set, &_g1h->_hrm);
  }
  
  void G1HeapVerifier::prepare_for_verify() {
    if (SafepointSynchronize::is_at_safepoint() || ! UseTLAB) {
      _g1h->ensure_parsability(false);
--- 537,554 ----
  
  void G1HeapVerifier::verify_region_sets() {
    assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
  
    // First, check the explicit lists.
!   _g1h->_hrm->verify();
  
    // Finally, make sure that the region accounting in the lists is
    // consistent with what we see in the heap.
  
!   VerifyRegionListsClosure cl(&_g1h->_old_set, &_g1h->_archive_set, &_g1h->_humongous_set, _g1h->_hrm);
    _g1h->heap_region_iterate(&cl);
!   cl.verify_counts(&_g1h->_old_set, &_g1h->_archive_set, &_g1h->_humongous_set, _g1h->_hrm);
  }
  
  void G1HeapVerifier::prepare_for_verify() {
    if (SafepointSynchronize::is_at_safepoint() || ! UseTLAB) {
      _g1h->ensure_parsability(false);
*** 785,793 ****
    bool failures() const { return _failures; }
  };
  
  bool G1HeapVerifier::check_cset_fast_test() {
    G1CheckCSetFastTableClosure cl;
!   _g1h->_hrm.iterate(&cl);
    return !cl.failures();
  }
  #endif // PRODUCT
--- 785,793 ----
    bool failures() const { return _failures; }
  };
  
  bool G1HeapVerifier::check_cset_fast_test() {
    G1CheckCSetFastTableClosure cl;
!   _g1h->_hrm->iterate(&cl);
    return !cl.failures();
  }
  #endif // PRODUCT