Mercurial > hg > graal-compiler
comparison src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp @ 2152:0fa27f37d4d4
6977804: G1: remove the zero-filling thread
Summary: This changeset removes the zero-filling thread from G1 and collapses the two free region lists we had before (the "free" and "unclean" lists) into one. The new free list uses the new heap region sets / lists abstractions that we'll ultimately use it to keep track of all regions in the heap. A heap region set was also introduced for the humongous regions. Finally, this change increases the concurrency between the thread that completes freeing regions (after a cleanup pause) and the rest of the system (before we'd have to wait for said thread to complete before allocating a new region). The changest also includes a lot of refactoring and code simplification.
Reviewed-by: jcoomes, johnc
author | tonyp |
---|---|
date | Wed, 19 Jan 2011 19:30:42 -0500 |
parents | |
children | 1216415d8e35 |
comparison
equal
deleted
inserted
replaced
2151:cb913d743d09 | 2152:0fa27f37d4d4 |
---|---|
1 /* | |
2 * copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. | |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | |
4 * | |
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 | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | |
20 * or visit www.oracle.com if you need additional information or have any | |
21 * questions. | |
22 * | |
23 */ | |
24 | |
25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP | |
26 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP | |
27 | |
28 #include "gc_implementation/g1/heapRegionSet.hpp" | |
29 | |
30 //////////////////// HeapRegionSetBase //////////////////// | |
31 | |
32 inline void HeapRegionSetBase::update_for_addition(HeapRegion* hr) { | |
33 // Assumes the caller has already verified the region. | |
34 | |
35 _length += 1; | |
36 if (!hr->isHumongous()) { | |
37 _region_num += 1; | |
38 } else { | |
39 _region_num += calculate_region_num(hr); | |
40 } | |
41 _total_used_bytes += hr->used(); | |
42 } | |
43 | |
44 inline void HeapRegionSetBase::add_internal(HeapRegion* hr) { | |
45 hrl_assert_region_ok(this, hr, NULL); | |
46 assert(hr->next() == NULL, hrl_ext_msg(this, "should not already be linked")); | |
47 | |
48 update_for_addition(hr); | |
49 hr->set_containing_set(this); | |
50 } | |
51 | |
52 inline void HeapRegionSetBase::update_for_removal(HeapRegion* hr) { | |
53 // Assumes the caller has already verified the region. | |
54 assert(_length > 0, hrl_ext_msg(this, "pre-condition")); | |
55 _length -= 1; | |
56 | |
57 size_t region_num_diff; | |
58 if (!hr->isHumongous()) { | |
59 region_num_diff = 1; | |
60 } else { | |
61 region_num_diff = calculate_region_num(hr); | |
62 } | |
63 assert(region_num_diff <= _region_num, | |
64 hrl_err_msg("[%s] region's region num: "SIZE_FORMAT" " | |
65 "should be <= region num: "SIZE_FORMAT, | |
66 name(), region_num_diff, _region_num)); | |
67 _region_num -= region_num_diff; | |
68 | |
69 size_t used_bytes = hr->used(); | |
70 assert(used_bytes <= _total_used_bytes, | |
71 hrl_err_msg("[%s] region's used bytes: "SIZE_FORMAT" " | |
72 "should be <= used bytes: "SIZE_FORMAT, | |
73 name(), used_bytes, _total_used_bytes)); | |
74 _total_used_bytes -= used_bytes; | |
75 } | |
76 | |
77 inline void HeapRegionSetBase::remove_internal(HeapRegion* hr) { | |
78 hrl_assert_region_ok(this, hr, this); | |
79 assert(hr->next() == NULL, hrl_ext_msg(this, "should already be unlinked")); | |
80 | |
81 hr->set_containing_set(NULL); | |
82 update_for_removal(hr); | |
83 } | |
84 | |
85 //////////////////// HeapRegionSet //////////////////// | |
86 | |
87 inline void HeapRegionSet::add(HeapRegion* hr) { | |
88 hrl_assert_mt_safety_ok(this); | |
89 // add_internal() will verify the region. | |
90 add_internal(hr); | |
91 } | |
92 | |
93 inline void HeapRegionSet::remove(HeapRegion* hr) { | |
94 hrl_assert_mt_safety_ok(this); | |
95 // remove_internal() will verify the region. | |
96 remove_internal(hr); | |
97 } | |
98 | |
99 inline void HeapRegionSet::remove_with_proxy(HeapRegion* hr, | |
100 HeapRegionSet* proxy_set) { | |
101 // No need to fo the MT safety check here given that this method | |
102 // does not update the contents of the set but instead accumulates | |
103 // the changes in proxy_set which is assumed to be thread-local. | |
104 hrl_assert_sets_match(this, proxy_set); | |
105 hrl_assert_region_ok(this, hr, this); | |
106 | |
107 hr->set_containing_set(NULL); | |
108 proxy_set->update_for_addition(hr); | |
109 } | |
110 | |
111 //////////////////// HeapRegionLinkedList //////////////////// | |
112 | |
113 inline void HeapRegionLinkedList::add_as_tail(HeapRegion* hr) { | |
114 hrl_assert_mt_safety_ok(this); | |
115 assert((length() == 0 && _head == NULL && _tail == NULL) || | |
116 (length() > 0 && _head != NULL && _tail != NULL), | |
117 hrl_ext_msg(this, "invariant")); | |
118 // add_internal() will verify the region. | |
119 add_internal(hr); | |
120 | |
121 // Now link the region. | |
122 if (_tail != NULL) { | |
123 _tail->set_next(hr); | |
124 } else { | |
125 _head = hr; | |
126 } | |
127 _tail = hr; | |
128 } | |
129 | |
130 inline HeapRegion* HeapRegionLinkedList::remove_head() { | |
131 hrl_assert_mt_safety_ok(this); | |
132 assert(!is_empty(), hrl_ext_msg(this, "the list should not be empty")); | |
133 assert(length() > 0 && _head != NULL && _tail != NULL, | |
134 hrl_ext_msg(this, "invariant")); | |
135 | |
136 // We need to unlink it first. | |
137 HeapRegion* hr = _head; | |
138 _head = hr->next(); | |
139 if (_head == NULL) { | |
140 _tail = NULL; | |
141 } | |
142 hr->set_next(NULL); | |
143 | |
144 // remove_internal() will verify the region. | |
145 remove_internal(hr); | |
146 return hr; | |
147 } | |
148 | |
149 inline HeapRegion* HeapRegionLinkedList::remove_head_or_null() { | |
150 hrl_assert_mt_safety_ok(this); | |
151 | |
152 if (!is_empty()) { | |
153 return remove_head(); | |
154 } else { | |
155 return NULL; | |
156 } | |
157 } | |
158 | |
159 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP |