infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-12 00:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Y. Srinivas Ramakrishna 2008-06-12 14:02:35 -07:00
commit 07ef2f8f38
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
View File

@ -3751,8 +3751,10 @@ void CMTask::do_marking_step(double time_target_ms) {
if (!has_aborted()) {
// We cannot check whether the global stack is empty, since other
// tasks might be pushing objects to it concurrently.
tmp_guarantee_CM( _cm->out_of_regions() && _cm->region_stack_empty(),
// tasks might be pushing objects to it concurrently. We also cannot
// check if the region stack is empty because if a thread is aborting
// it can push a partially done region back.
tmp_guarantee_CM( _cm->out_of_regions(),
"at this point we should be out of regions" );
if (_cm->verbose_low())
@ -3774,9 +3776,10 @@ void CMTask::do_marking_step(double time_target_ms) {
// we could. Let's try to do some stealing...
// We cannot check whether the global stack is empty, since other
// tasks might be pushing objects to it concurrently.
// tasks might be pushing objects to it concurrently. We also cannot
// check if the region stack is empty because if a thread is aborting
// it can push a partially done region back.
guarantee( _cm->out_of_regions() &&
_cm->region_stack_empty() &&
_task_queue->size() == 0, "only way to reach here" );
if (_cm->verbose_low())
@ -3811,9 +3814,10 @@ void CMTask::do_marking_step(double time_target_ms) {
// termination protocol.
if (!has_aborted()) {
// We cannot check whether the global stack is empty, since other
// tasks might be concurrently pushing objects on it.
// tasks might be concurrently pushing objects on it. We also cannot
// check if the region stack is empty because if a thread is aborting
// it can push a partially done region back.
guarantee( _cm->out_of_regions() &&
_cm->region_stack_empty() &&
_task_queue->size() == 0, "only way to reach here" );
if (_cm->verbose_low())