Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp @ 1111:44f61c24ddab
6862387: tune concurrent refinement further
Summary: Reworked the concurrent refinement: threads activation, feedback-based threshold adjustment, other miscellaneous fixes.
Reviewed-by: apetrusenko, tonyp
author | iveresov |
---|---|
date | Wed, 16 Dec 2009 15:12:51 -0800 |
parents | fa357420e7d2 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1104:27f9477e879b | 1111:44f61c24ddab |
---|---|
59 | 59 |
60 #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away | 60 #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away |
61 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list | 61 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list |
62 #endif // _MSC_VER | 62 #endif // _MSC_VER |
63 | 63 |
64 DirtyCardQueueSet::DirtyCardQueueSet() : | 64 DirtyCardQueueSet::DirtyCardQueueSet(bool notify_when_complete) : |
65 PtrQueueSet(true /*notify_when_complete*/), | 65 PtrQueueSet(notify_when_complete), |
66 _closure(NULL), | 66 _closure(NULL), |
67 _shared_dirty_card_queue(this, true /*perm*/), | 67 _shared_dirty_card_queue(this, true /*perm*/), |
68 _free_ids(NULL), | 68 _free_ids(NULL), |
69 _processed_buffers_mut(0), _processed_buffers_rs_thread(0) | 69 _processed_buffers_mut(0), _processed_buffers_rs_thread(0) |
70 { | 70 { |
75 size_t DirtyCardQueueSet::num_par_ids() { | 75 size_t DirtyCardQueueSet::num_par_ids() { |
76 return os::processor_count(); | 76 return os::processor_count(); |
77 } | 77 } |
78 | 78 |
79 void DirtyCardQueueSet::initialize(Monitor* cbl_mon, Mutex* fl_lock, | 79 void DirtyCardQueueSet::initialize(Monitor* cbl_mon, Mutex* fl_lock, |
80 int process_completed_threshold, | |
80 int max_completed_queue, | 81 int max_completed_queue, |
81 Mutex* lock, PtrQueueSet* fl_owner) { | 82 Mutex* lock, PtrQueueSet* fl_owner) { |
82 PtrQueueSet::initialize(cbl_mon, fl_lock, max_completed_queue, fl_owner); | 83 PtrQueueSet::initialize(cbl_mon, fl_lock, process_completed_threshold, |
84 max_completed_queue, fl_owner); | |
83 set_buffer_size(G1UpdateBufferSize); | 85 set_buffer_size(G1UpdateBufferSize); |
84 set_process_completed_threshold(G1UpdateBufferQueueProcessingThreshold); | |
85 | |
86 _shared_dirty_card_queue.set_lock(lock); | 86 _shared_dirty_card_queue.set_lock(lock); |
87 _free_ids = new FreeIdSet((int) num_par_ids(), _cbl_mon); | 87 _free_ids = new FreeIdSet((int) num_par_ids(), _cbl_mon); |
88 } | 88 } |
89 | 89 |
90 void DirtyCardQueueSet::handle_zero_index_for_thread(JavaThread* t) { | 90 void DirtyCardQueueSet::handle_zero_index_for_thread(JavaThread* t) { |
152 } | 152 } |
153 } | 153 } |
154 return b; | 154 return b; |
155 } | 155 } |
156 | 156 |
157 DirtyCardQueueSet::CompletedBufferNode* | 157 |
158 BufferNode* | |
158 DirtyCardQueueSet::get_completed_buffer(int stop_at) { | 159 DirtyCardQueueSet::get_completed_buffer(int stop_at) { |
159 CompletedBufferNode* nd = NULL; | 160 BufferNode* nd = NULL; |
160 MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag); | 161 MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag); |
161 | 162 |
162 if ((int)_n_completed_buffers <= stop_at) { | 163 if ((int)_n_completed_buffers <= stop_at) { |
163 _process_completed = false; | 164 _process_completed = false; |
164 return NULL; | 165 return NULL; |
165 } | 166 } |
166 | 167 |
167 if (_completed_buffers_head != NULL) { | 168 if (_completed_buffers_head != NULL) { |
168 nd = _completed_buffers_head; | 169 nd = _completed_buffers_head; |
169 _completed_buffers_head = nd->next; | 170 _completed_buffers_head = nd->next(); |
170 if (_completed_buffers_head == NULL) | 171 if (_completed_buffers_head == NULL) |
171 _completed_buffers_tail = NULL; | 172 _completed_buffers_tail = NULL; |
172 _n_completed_buffers--; | 173 _n_completed_buffers--; |
174 assert(_n_completed_buffers >= 0, "Invariant"); | |
173 } | 175 } |
174 debug_only(assert_completed_buffer_list_len_correct_locked()); | 176 debug_only(assert_completed_buffer_list_len_correct_locked()); |
175 return nd; | 177 return nd; |
176 } | 178 } |
177 | 179 |
178 bool DirtyCardQueueSet:: | 180 bool DirtyCardQueueSet:: |
179 apply_closure_to_completed_buffer_helper(int worker_i, | 181 apply_closure_to_completed_buffer_helper(int worker_i, |
180 CompletedBufferNode* nd) { | 182 BufferNode* nd) { |
181 if (nd != NULL) { | 183 if (nd != NULL) { |
184 void **buf = BufferNode::make_buffer_from_node(nd); | |
185 size_t index = nd->index(); | |
182 bool b = | 186 bool b = |
183 DirtyCardQueue::apply_closure_to_buffer(_closure, nd->buf, | 187 DirtyCardQueue::apply_closure_to_buffer(_closure, buf, |
184 nd->index, _sz, | 188 index, _sz, |
185 true, worker_i); | 189 true, worker_i); |
186 void** buf = nd->buf; | |
187 size_t index = nd->index; | |
188 delete nd; | |
189 if (b) { | 190 if (b) { |
190 deallocate_buffer(buf); | 191 deallocate_buffer(buf); |
191 return true; // In normal case, go on to next buffer. | 192 return true; // In normal case, go on to next buffer. |
192 } else { | 193 } else { |
193 enqueue_complete_buffer(buf, index, true); | 194 enqueue_complete_buffer(buf, index); |
194 return false; | 195 return false; |
195 } | 196 } |
196 } else { | 197 } else { |
197 return false; | 198 return false; |
198 } | 199 } |
201 bool DirtyCardQueueSet::apply_closure_to_completed_buffer(int worker_i, | 202 bool DirtyCardQueueSet::apply_closure_to_completed_buffer(int worker_i, |
202 int stop_at, | 203 int stop_at, |
203 bool during_pause) | 204 bool during_pause) |
204 { | 205 { |
205 assert(!during_pause || stop_at == 0, "Should not leave any completed buffers during a pause"); | 206 assert(!during_pause || stop_at == 0, "Should not leave any completed buffers during a pause"); |
206 CompletedBufferNode* nd = get_completed_buffer(stop_at); | 207 BufferNode* nd = get_completed_buffer(stop_at); |
207 bool res = apply_closure_to_completed_buffer_helper(worker_i, nd); | 208 bool res = apply_closure_to_completed_buffer_helper(worker_i, nd); |
208 if (res) Atomic::inc(&_processed_buffers_rs_thread); | 209 if (res) Atomic::inc(&_processed_buffers_rs_thread); |
209 return res; | 210 return res; |
210 } | 211 } |
211 | 212 |
212 void DirtyCardQueueSet::apply_closure_to_all_completed_buffers() { | 213 void DirtyCardQueueSet::apply_closure_to_all_completed_buffers() { |
213 CompletedBufferNode* nd = _completed_buffers_head; | 214 BufferNode* nd = _completed_buffers_head; |
214 while (nd != NULL) { | 215 while (nd != NULL) { |
215 bool b = | 216 bool b = |
216 DirtyCardQueue::apply_closure_to_buffer(_closure, nd->buf, 0, _sz, | 217 DirtyCardQueue::apply_closure_to_buffer(_closure, |
217 false); | 218 BufferNode::make_buffer_from_node(nd), |
219 0, _sz, false); | |
218 guarantee(b, "Should not stop early."); | 220 guarantee(b, "Should not stop early."); |
219 nd = nd->next; | 221 nd = nd->next(); |
220 } | 222 } |
221 } | 223 } |
222 | 224 |
223 void DirtyCardQueueSet::abandon_logs() { | 225 void DirtyCardQueueSet::abandon_logs() { |
224 assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint."); | 226 assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint."); |
225 CompletedBufferNode* buffers_to_delete = NULL; | 227 BufferNode* buffers_to_delete = NULL; |
226 { | 228 { |
227 MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag); | 229 MutexLockerEx x(_cbl_mon, Mutex::_no_safepoint_check_flag); |
228 while (_completed_buffers_head != NULL) { | 230 while (_completed_buffers_head != NULL) { |
229 CompletedBufferNode* nd = _completed_buffers_head; | 231 BufferNode* nd = _completed_buffers_head; |
230 _completed_buffers_head = nd->next; | 232 _completed_buffers_head = nd->next(); |
231 nd->next = buffers_to_delete; | 233 nd->set_next(buffers_to_delete); |
232 buffers_to_delete = nd; | 234 buffers_to_delete = nd; |
233 } | 235 } |
234 _n_completed_buffers = 0; | 236 _n_completed_buffers = 0; |
235 _completed_buffers_tail = NULL; | 237 _completed_buffers_tail = NULL; |
236 debug_only(assert_completed_buffer_list_len_correct_locked()); | 238 debug_only(assert_completed_buffer_list_len_correct_locked()); |
237 } | 239 } |
238 while (buffers_to_delete != NULL) { | 240 while (buffers_to_delete != NULL) { |
239 CompletedBufferNode* nd = buffers_to_delete; | 241 BufferNode* nd = buffers_to_delete; |
240 buffers_to_delete = nd->next; | 242 buffers_to_delete = nd->next(); |
241 deallocate_buffer(nd->buf); | 243 deallocate_buffer(BufferNode::make_buffer_from_node(nd)); |
242 delete nd; | |
243 } | 244 } |
244 // Since abandon is done only at safepoints, we can safely manipulate | 245 // Since abandon is done only at safepoints, we can safely manipulate |
245 // these queues. | 246 // these queues. |
246 for (JavaThread* t = Threads::first(); t; t = t->next()) { | 247 for (JavaThread* t = Threads::first(); t; t = t->next()) { |
247 t->dirty_card_queue().reset(); | 248 t->dirty_card_queue().reset(); |