comparison src/share/vm/gc_implementation/g1/heapRegionSeq.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 f95d63e2154a
children 720b6a76dd9d
comparison
equal deleted inserted replaced
3765:ae5b2f1dcf12 3766:c3f1170908be
1 /* 1 /*
2 * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
23 */ 23 */
24 24
25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP 25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP
26 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP 26 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP
27 27
28 #include "gc_implementation/g1/heapRegion.hpp"
28 #include "gc_implementation/g1/heapRegionSeq.hpp" 29 #include "gc_implementation/g1/heapRegionSeq.hpp"
29 30
30 inline HeapRegion* HeapRegionSeq::addr_to_region(const void* addr) { 31 inline size_t HeapRegionSeq::addr_to_index_biased(HeapWord* addr) const {
31 assert(_seq_bottom != NULL, "bad _seq_bottom in addr_to_region"); 32 assert(_heap_bottom <= addr && addr < _heap_end,
32 if ((char*) addr >= _seq_bottom) { 33 err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT" end: "PTR_FORMAT,
33 size_t diff = (size_t) pointer_delta((HeapWord*) addr, 34 addr, _heap_bottom, _heap_end));
34 (HeapWord*) _seq_bottom); 35 size_t index = (size_t) addr >> _region_shift;
35 int index = (int) (diff >> HeapRegion::LogOfHRGrainWords); 36 return index;
36 assert(index >= 0, "invariant / paranoia"); 37 }
37 if (index < _regions.length()) { 38
38 HeapRegion* hr = _regions.at(index); 39 inline HeapRegion* HeapRegionSeq::addr_to_region_unsafe(HeapWord* addr) const {
39 assert(hr->is_in_reserved(addr), 40 assert(_heap_bottom <= addr && addr < _heap_end,
40 "addr_to_region is wrong..."); 41 err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT" end: "PTR_FORMAT,
41 return hr; 42 addr, _heap_bottom, _heap_end));
42 } 43 size_t index_biased = addr_to_index_biased(addr);
44 HeapRegion* hr = _regions_biased[index_biased];
45 assert(hr != NULL, "invariant");
46 return hr;
47 }
48
49 inline HeapRegion* HeapRegionSeq::addr_to_region(HeapWord* addr) const {
50 if (addr != NULL && addr < _heap_end) {
51 assert(addr >= _heap_bottom,
52 err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, addr, _heap_bottom));
53 return addr_to_region_unsafe(addr);
43 } 54 }
44 return NULL; 55 return NULL;
45 } 56 }
46 57
58 inline HeapRegion* HeapRegionSeq::at(size_t index) const {
59 assert(index < length(), "pre-condition");
60 HeapRegion* hr = _regions[index];
61 assert(hr != NULL, "sanity");
62 assert(hr->hrs_index() == index, "sanity");
63 return hr;
64 }
65
47 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP 66 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP