archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6662086: 6u4+, 7b11+: CMS never clears referents when -XX:+ParallelRefProcEnabled

Browse source 
Construct the relevant CMSIsAliveClosure used by CMS during parallel reference processing with the correct span. It had incorrectly been constructed with an empty span, a regression introduced in 6417901.

Reviewed-by: jcoomes
This commit is contained in:
Y. Srinivas Ramakrishna 2008-05-06 15:37:36 -07:00
parent 035662396c
commit 9b2d755745
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
View file

@ -520,7 +520,10 @@ CMSCollector::CMSCollector(ConcurrentMarkSweepGeneration* cmsGen,
-1 /* lock-free */, "No_lock" /* dummy */),
_modUnionClosure(&_modUnionTable),
_modUnionClosurePar(&_modUnionTable),
_is_alive_closure(&_markBitMap),
// Adjust my span to cover old (cms) gen and perm gen
_span(cmsGen->reserved()._union(permGen->reserved())),
// Construct the is_alive_closure with _span & markBitMap
_is_alive_closure(_span, &_markBitMap),
_restart_addr(NULL),
_overflow_list(NULL),
_preserved_oop_stack(NULL),
@ -572,11 +575,6 @@ CMSCollector::CMSCollector(ConcurrentMarkSweepGeneration* cmsGen,
_cmsGen->cmsSpace()->set_collector(this);
_permGen->cmsSpace()->set_collector(this);
// Adjust my span to cover old (cms) gen and perm gen
_span = _cmsGen->reserved()._union(_permGen->reserved());
// Initialize the span of is_alive_closure
_is_alive_closure.set_span(_span);
// Allocate MUT and marking bit map
{
MutexLockerEx x(_markBitMap.lock(), Mutex::_no_safepoint_check_flag);
@ -5496,7 +5494,7 @@ class CMSRefProcTaskProxy: public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
CMSCollector* _collector;
CMSBitMap* _mark_bit_map;
MemRegion _span;
const MemRegion _span;
OopTaskQueueSet* _task_queues;
ParallelTaskTerminator _term;
ProcessTask& _task;
@ -5513,7 +5511,10 @@ public:
_collector(collector), _span(span), _mark_bit_map(mark_bit_map),
_task_queues(task_queues),
_term(total_workers, task_queues)
{ }
{
assert(_collector->_span.equals(_span) && !_span.is_empty(),
"Inconsistency in _span");
}
OopTaskQueueSet* task_queues() { return _task_queues; }
@ -5530,11 +5531,12 @@ public:
};
void CMSRefProcTaskProxy::work(int i) {
assert(_collector->_span.equals(_span), "Inconsistency in _span");
CMSParKeepAliveClosure par_keep_alive(_collector, _span,
_mark_bit_map, work_queue(i));
CMSParDrainMarkingStackClosure par_drain_stack(_collector, _span,
_mark_bit_map, work_queue(i));
CMSIsAliveClosure is_alive_closure(_mark_bit_map);
CMSIsAliveClosure is_alive_closure(_span, _mark_bit_map);
_task.work(i, is_alive_closure, par_keep_alive, par_drain_stack);
if (_task.marks_oops_alive()) {
do_work_steal(i, &par_drain_stack, &par_keep_alive,