comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @ 12840:aa6f2ea19d8f

Merge
author jcoomes
date Fri, 11 Oct 2013 08:27:21 -0700
parents 798522662fcd 69944b868a32
children 8f07aa079343
comparison
equal deleted inserted replaced
12829:c01f4910f5f5 12840:aa6f2ea19d8f
6033 // not dirty that area (one less thing to have to do while holding 6033 // not dirty that area (one less thing to have to do while holding
6034 // a lock). So we can only verify that [bottom(),pre_dummy_top()] 6034 // a lock). So we can only verify that [bottom(),pre_dummy_top()]
6035 // is dirty. 6035 // is dirty.
6036 G1SATBCardTableModRefBS* ct_bs = g1_barrier_set(); 6036 G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
6037 MemRegion mr(hr->bottom(), hr->pre_dummy_top()); 6037 MemRegion mr(hr->bottom(), hr->pre_dummy_top());
6038 ct_bs->verify_dirty_region(mr); 6038 if (hr->is_young()) {
6039 ct_bs->verify_g1_young_region(mr);
6040 } else {
6041 ct_bs->verify_dirty_region(mr);
6042 }
6039 } 6043 }
6040 6044
6041 void G1CollectedHeap::verify_dirty_young_list(HeapRegion* head) { 6045 void G1CollectedHeap::verify_dirty_young_list(HeapRegion* head) {
6042 G1SATBCardTableModRefBS* ct_bs = g1_barrier_set(); 6046 G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
6043 for (HeapRegion* hr = head; hr != NULL; hr = hr->get_next_young_region()) { 6047 for (HeapRegion* hr = head; hr != NULL; hr = hr->get_next_young_region()) {