comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp @ 3766:c3f1170908be

7045330: G1: Simplify/fix the HeapRegionSeq class 7042285: G1: native memory leak during humongous object allocation 6804436: G1: heap region indices should be size_t Summary: A series of fixes and improvements to the HeapRegionSeq class: a) replace the _regions growable array with a standard C array, b) avoid de-allocating / re-allocating HeapRegion instances when the heap shrinks / grows (fix for 7042285), c) introduce fast method to map address to HeapRegion via a "biased" array pointer, d) embed the _hrs object in G1CollectedHeap, instead of pointing to it via an indirection, e) assume that all the regions added to the HeapRegionSeq instance are contiguous, f) replace int's with size_t's for indexes (and expand that to HeapRegion as part of 6804436), g) remove unnecessary / unused methods, h) rename a couple of fields (_alloc_search_start and _seq_bottom), i) fix iterate_from() not to always start from index 0 irrespective of the region passed to it, j) add a verification method to check the HeapRegionSeq assumptions, k) always call the wrappers for _hrs.iterate(), _hrs_length(), and _hrs.at() from G1CollectedHeap, not those methods directly, and l) unify the code that expands the sequence (by either re-using or creating a new HeapRegion) and make it robust wrt to a HeapRegion allocation failing. Reviewed-by: stefank, johnc, brutisso
author tonyp
date Fri, 10 Jun 2011 13:16:40 -0400
parents abdfc822206f
children f44782f04dd4
comparison
equal deleted inserted replaced
3765:ae5b2f1dcf12 3766:c3f1170908be
32 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" 32 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
33 #include "utilities/taskqueue.hpp" 33 #include "utilities/taskqueue.hpp"
34 34
35 // Inline functions for G1CollectedHeap 35 // Inline functions for G1CollectedHeap
36 36
37 template <class T>
37 inline HeapRegion* 38 inline HeapRegion*
38 G1CollectedHeap::heap_region_containing(const void* addr) const { 39 G1CollectedHeap::heap_region_containing(const T addr) const {
39 HeapRegion* hr = _hrs->addr_to_region(addr); 40 HeapRegion* hr = _hrs.addr_to_region((HeapWord*) addr);
40 // hr can be null if addr in perm_gen 41 // hr can be null if addr in perm_gen
41 if (hr != NULL && hr->continuesHumongous()) { 42 if (hr != NULL && hr->continuesHumongous()) {
42 hr = hr->humongous_start_region(); 43 hr = hr->humongous_start_region();
43 } 44 }
44 return hr; 45 return hr;
45 } 46 }
46 47
48 template <class T>
47 inline HeapRegion* 49 inline HeapRegion*
48 G1CollectedHeap::heap_region_containing_raw(const void* addr) const { 50 G1CollectedHeap::heap_region_containing_raw(const T addr) const {
49 assert(_g1_reserved.contains(addr), "invariant"); 51 assert(_g1_reserved.contains((const void*) addr), "invariant");
50 size_t index = pointer_delta(addr, _g1_reserved.start(), 1) 52 HeapRegion* res = _hrs.addr_to_region_unsafe((HeapWord*) addr);
51 >> HeapRegion::LogOfHRGrainBytes;
52
53 HeapRegion* res = _hrs->at(index);
54 assert(res == _hrs->addr_to_region(addr), "sanity");
55 return res; 53 return res;
56 } 54 }
57 55
58 inline bool G1CollectedHeap::obj_in_cs(oop obj) { 56 inline bool G1CollectedHeap::obj_in_cs(oop obj) {
59 HeapRegion* r = _hrs->addr_to_region(obj); 57 HeapRegion* r = _hrs.addr_to_region((HeapWord*) obj);
60 return r != NULL && r->in_collection_set(); 58 return r != NULL && r->in_collection_set();
61 } 59 }
62 60
63 inline HeapWord* 61 inline HeapWord*
64 G1CollectedHeap::attempt_allocation(size_t word_size, 62 G1CollectedHeap::attempt_allocation(size_t word_size,