src/hotspot/share/gc/g1/g1HeapVerifier.cpp
changeset 49643 a3453bbd5418
parent 49632 64f9ebc85e67
child 49659 0ed1370f52bb
equal deleted inserted replaced
49642:7bad9c9efdf3 49643:a3453bbd5418
   422                                      &blobsCl);
   422                                      &blobsCl);
   423   }
   423   }
   424 
   424 
   425   bool failures = rootsCl.failures() || codeRootsCl.failures();
   425   bool failures = rootsCl.failures() || codeRootsCl.failures();
   426 
   426 
   427   if (!_g1h->g1_policy()->collector_state()->full_collection()) {
   427   if (!_g1h->g1_policy()->collector_state()->in_full_gc()) {
   428     // If we're verifying during a full GC then the region sets
   428     // If we're verifying during a full GC then the region sets
   429     // will have been torn down at the start of the GC. Therefore
   429     // will have been torn down at the start of the GC. Therefore
   430     // verifying the region sets will fail. So we only verify
   430     // verifying the region sets will fail. So we only verify
   431     // the region sets when not in a full GC.
   431     // the region sets when not in a full GC.
   432     log_debug(gc, verify)("HeapRegionSets");
   432     log_debug(gc, verify)("HeapRegionSets");
   649   HeapWord* end    = hr->end();
   649   HeapWord* end    = hr->end();
   650 
   650 
   651   bool res_p = verify_no_bits_over_tams("prev", prev_bitmap, ptams, end);
   651   bool res_p = verify_no_bits_over_tams("prev", prev_bitmap, ptams, end);
   652 
   652 
   653   bool res_n = true;
   653   bool res_n = true;
   654   // We reset mark_in_progress() before we reset _cmThread->in_progress() and in this window
   654   // We reset mark_or_rebuild_in_progress() before we reset _cmThread->in_progress() and in this window
   655   // we do the clearing of the next bitmap concurrently. Thus, we can not verify the bitmap
   655   // we do the clearing of the next bitmap concurrently. Thus, we can not verify the bitmap
   656   // if we happen to be in that state.
   656   // if we happen to be in that state.
   657   if (_g1h->collector_state()->mark_in_progress() || !_g1h->_cmThread->in_progress()) {
   657   if (_g1h->collector_state()->mark_or_rebuild_in_progress() || !_g1h->_cmThread->in_progress()) {
   658     res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
   658     res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
   659   }
   659   }
   660   if (!res_p || !res_n) {
   660   if (!res_p || !res_n) {
   661     log_error(gc, verify)("#### Bitmap verification failed for " HR_FORMAT, HR_FORMAT_PARAMS(hr));
   661     log_error(gc, verify)("#### Bitmap verification failed for " HR_FORMAT, HR_FORMAT_PARAMS(hr));
   662     log_error(gc, verify)("#### Caller: %s", caller);
   662     log_error(gc, verify)("#### Caller: %s", caller);