hg: hsx/hotspot-gc/hotspot: 7114303: G1: assert(_g1->mark_in_progress()) failed: shouldn't be here otherwise

[john.cuthbertson at oracle.com]

Changeset: 00dd86e542eb
Author:    johnc
Date:      2011-11-28 09:49 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-gc/hotspot/rev/00dd86e542eb

7114303: G1: assert(_g1->mark_in_progress()) failed: shouldn't be here otherwise
Summary: Race between the VM thread reading G1CollectedHeap::_mark_in_progress and it being set by the concurrent mark thread when concurrent marking is aborted by a full GC. Have the concurrent mark thread join the SuspendibleThreadSet before changing the marking state.
Reviewed-by: tonyp, brutisso

! src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
! src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp