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

rev 48019 : 8191821: Finer granularity for GC verification
Reviewed-by:

*** 1013,1025 ****
    }
  
    SvcGCMarker sgcm(SvcGCMarker::OTHER);
  
    if (VerifyDuringGC) {
!     HandleMark hm;  // handle scope
!     g1h->prepare_for_verify();
!     Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (before)");
    }
    g1h->verifier()->check_bitmaps("Remark Start");
  
    G1Policy* g1p = g1h->g1_policy();
    g1p->record_concurrent_mark_remark_start();
--- 1013,1023 ----
    }
  
    SvcGCMarker sgcm(SvcGCMarker::OTHER);
  
    if (VerifyDuringGC) {
!     g1h->verifier()->verify(G1HeapVerifier::G1VerifyRemark, VerifyOption_G1UsePrevMarking, "During GC (before)");
    }
    g1h->verifier()->check_bitmaps("Remark Start");
  
    G1Policy* g1p = g1h->g1_policy();
    g1p->record_concurrent_mark_remark_start();
*** 1036,1048 ****
      // We overflowed.  Restart concurrent marking.
      _restart_for_overflow = true;
  
      // Verify the heap w.r.t. the previous marking bitmap.
      if (VerifyDuringGC) {
!       HandleMark hm;  // handle scope
!       g1h->prepare_for_verify();
!       Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (overflow)");
      }
  
      // Clear the marking state because we will be restarting
      // marking due to overflowing the global mark stack.
      reset_marking_state();
--- 1034,1044 ----
      // We overflowed.  Restart concurrent marking.
      _restart_for_overflow = true;
  
      // Verify the heap w.r.t. the previous marking bitmap.
      if (VerifyDuringGC) {
!       g1h->verifier()->verify(G1HeapVerifier::G1VerifyRemark, VerifyOption_G1UsePrevMarking, "During GC (overflow)");
      }
  
      // Clear the marking state because we will be restarting
      // marking due to overflowing the global mark stack.
      reset_marking_state();
*** 1053,1065 ****
      // threads to have SATB queues with active set to true.
      satb_mq_set.set_active_all_threads(false, /* new active value */
                                         true /* expected_active */);
  
      if (VerifyDuringGC) {
!       HandleMark hm;  // handle scope
!       g1h->prepare_for_verify();
!       Universe::verify(VerifyOption_G1UseNextMarking, "During GC (after)");
      }
      g1h->verifier()->check_bitmaps("Remark End");
      assert(!restart_for_overflow(), "sanity");
      // Completely reset the marking state since marking completed
      set_non_marking_state();
--- 1049,1059 ----
      // threads to have SATB queues with active set to true.
      satb_mq_set.set_active_all_threads(false, /* new active value */
                                         true /* expected_active */);
  
      if (VerifyDuringGC) {
!       g1h->verifier()->verify(G1HeapVerifier::G1VerifyRemark, VerifyOption_G1UseNextMarking, "During GC (after)");
      }
      g1h->verifier()->check_bitmaps("Remark End");
      assert(!restart_for_overflow(), "sanity");
      // Completely reset the marking state since marking completed
      set_non_marking_state();
*** 1187,1199 ****
    }
  
    g1h->verifier()->verify_region_sets_optional();
  
    if (VerifyDuringGC) {
!     HandleMark hm;  // handle scope
!     g1h->prepare_for_verify();
!     Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (before)");
    }
    g1h->verifier()->check_bitmaps("Cleanup Start");
  
    G1Policy* g1p = g1h->g1_policy();
    g1p->record_concurrent_mark_cleanup_start();
--- 1181,1191 ----
    }
  
    g1h->verifier()->verify_region_sets_optional();
  
    if (VerifyDuringGC) {
!     g1h->verifier()->verify(G1HeapVerifier::G1VerifyCleanup, VerifyOption_G1UsePrevMarking, "During GC (before)");
    }
    g1h->verifier()->check_bitmaps("Cleanup Start");
  
    G1Policy* g1p = g1h->g1_policy();
    g1p->record_concurrent_mark_cleanup_start();
*** 1261,1273 ****
    // Clean up will have freed any regions completely full of garbage.
    // Update the soft reference policy with the new heap occupancy.
    Universe::update_heap_info_at_gc();
  
    if (VerifyDuringGC) {
!     HandleMark hm;  // handle scope
!     g1h->prepare_for_verify();
!     Universe::verify(VerifyOption_G1UsePrevMarking, "During GC (after)");
    }
  
    g1h->verifier()->check_bitmaps("Cleanup End");
  
    g1h->verifier()->verify_region_sets_optional();
--- 1253,1263 ----
    // Clean up will have freed any regions completely full of garbage.
    // Update the soft reference policy with the new heap occupancy.
    Universe::update_heap_info_at_gc();
  
    if (VerifyDuringGC) {
!     g1h->verifier()->verify(G1HeapVerifier::G1VerifyCleanup, VerifyOption_G1UsePrevMarking, "During GC (after)");
    }
  
    g1h->verifier()->check_bitmaps("Cleanup End");
  
    g1h->verifier()->verify_region_sets_optional();