comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp @ 2153:377371490991

Merge
author johnc
date Thu, 20 Jan 2011 13:57:12 -0800
parents 0fa27f37d4d4
children abdfc822206f
comparison
equal deleted inserted replaced
2148:02b6913287da 2153:377371490991
26 #define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP 26 #define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP
27 27
28 #include "gc_implementation/g1/concurrentMark.hpp" 28 #include "gc_implementation/g1/concurrentMark.hpp"
29 #include "gc_implementation/g1/g1CollectedHeap.hpp" 29 #include "gc_implementation/g1/g1CollectedHeap.hpp"
30 #include "gc_implementation/g1/g1CollectorPolicy.hpp" 30 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
31 #include "gc_implementation/g1/heapRegionSeq.hpp" 31 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
32 #include "utilities/taskqueue.hpp" 32 #include "utilities/taskqueue.hpp"
33 33
34 // Inline functions for G1CollectedHeap 34 // Inline functions for G1CollectedHeap
35 35
36 inline HeapRegion* 36 inline HeapRegion*
133 return NULL; 133 return NULL;
134 } 134 }
135 135
136 inline void 136 inline void
137 G1CollectedHeap::retire_cur_alloc_region_common(HeapRegion* cur_alloc_region) { 137 G1CollectedHeap::retire_cur_alloc_region_common(HeapRegion* cur_alloc_region) {
138 assert_heap_locked_or_at_safepoint(); 138 assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
139 assert(cur_alloc_region != NULL && cur_alloc_region == _cur_alloc_region, 139 assert(cur_alloc_region != NULL && cur_alloc_region == _cur_alloc_region,
140 "pre-condition of the call"); 140 "pre-condition of the call");
141 assert(cur_alloc_region->is_young(), 141 assert(cur_alloc_region->is_young(),
142 "we only support young current alloc regions"); 142 "we only support young current alloc regions");
143 143