src/share/vm/gc_implementation/g1/concurrentMark.cpp

rev 8069 : imported patch g1_cleanup

*** 1324,1334 ****
  
    SvcGCMarker sgcm(SvcGCMarker::OTHER);
  
    if (VerifyDuringGC) {
      HandleMark hm;  // handle scope
!     Universe::heap()->prepare_for_verify();
      Universe::verify(VerifyOption_G1UsePrevMarking,
                       " VerifyDuringGC:(before)");
    }
    g1h->check_bitmaps("Remark Start");
  
--- 1324,1334 ----
  
    SvcGCMarker sgcm(SvcGCMarker::OTHER);
  
    if (VerifyDuringGC) {
      HandleMark hm;  // handle scope
!     g1h->prepare_for_verify();
      Universe::verify(VerifyOption_G1UsePrevMarking,
                       " VerifyDuringGC:(before)");
    }
    g1h->check_bitmaps("Remark Start");
  
*** 1351,1361 ****
      }
  
      // Verify the heap w.r.t. the previous marking bitmap.
      if (VerifyDuringGC) {
        HandleMark hm;  // handle scope
!       Universe::heap()->prepare_for_verify();
        Universe::verify(VerifyOption_G1UsePrevMarking,
                         " VerifyDuringGC:(overflow)");
      }
  
      // Clear the marking state because we will be restarting
--- 1351,1361 ----
      }
  
      // Verify the heap w.r.t. the previous marking bitmap.
      if (VerifyDuringGC) {
        HandleMark hm;  // handle scope
!       g1h->prepare_for_verify();
        Universe::verify(VerifyOption_G1UsePrevMarking,
                         " VerifyDuringGC:(overflow)");
      }
  
      // Clear the marking state because we will be restarting
*** 1377,1387 ****
      satb_mq_set.set_active_all_threads(false, /* new active value */
                                         true /* expected_active */);
  
      if (VerifyDuringGC) {
        HandleMark hm;  // handle scope
!       Universe::heap()->prepare_for_verify();
        Universe::verify(VerifyOption_G1UseNextMarking,
                         " VerifyDuringGC:(after)");
      }
      g1h->check_bitmaps("Remark End");
      assert(!restart_for_overflow(), "sanity");
--- 1377,1387 ----
      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,
                         " VerifyDuringGC:(after)");
      }
      g1h->check_bitmaps("Remark End");
      assert(!restart_for_overflow(), "sanity");
*** 1985,2001 ****
  
    g1h->verify_region_sets_optional();
  
    if (VerifyDuringGC) {
      HandleMark hm;  // handle scope
!     Universe::heap()->prepare_for_verify();
      Universe::verify(VerifyOption_G1UsePrevMarking,
                       " VerifyDuringGC:(before)");
    }
    g1h->check_bitmaps("Cleanup Start");
  
!   G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
    g1p->record_concurrent_mark_cleanup_start();
  
    double start = os::elapsedTime();
  
    HeapRegionRemSet::reset_for_cleanup_tasks();
--- 1985,2001 ----
  
    g1h->verify_region_sets_optional();
  
    if (VerifyDuringGC) {
      HandleMark hm;  // handle scope
!     g1h->prepare_for_verify();
      Universe::verify(VerifyOption_G1UsePrevMarking,
                       " VerifyDuringGC:(before)");
    }
    g1h->check_bitmaps("Cleanup Start");
  
!   G1CollectorPolicy* g1p = g1h->g1_policy();
    g1p->record_concurrent_mark_cleanup_start();
  
    double start = os::elapsedTime();
  
    HeapRegionRemSet::reset_for_cleanup_tasks();
*** 2096,2106 ****
    // Update the soft reference policy with the new heap occupancy.
    Universe::update_heap_info_at_gc();
  
    if (VerifyDuringGC) {
      HandleMark hm;  // handle scope
!     Universe::heap()->prepare_for_verify();
      Universe::verify(VerifyOption_G1UsePrevMarking,
                       " VerifyDuringGC:(after)");
    }
  
    g1h->check_bitmaps("Cleanup End");
--- 2096,2106 ----
    // 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,
                       " VerifyDuringGC:(after)");
    }
  
    g1h->check_bitmaps("Cleanup End");