Mercurial > hg > openjdk > hsx20
changeset 2057:1ec37096cecf
7020042: G1: Partially remove fix for 6994628
Summary: Disable reference discovery and processing during concurrent marking by disabling fix for 6994628.
Reviewed-by: tonyp, ysr
author | johnc |
---|---|
date | Fri, 18 Feb 2011 10:07:34 -0800 |
parents | c6491db25cb2 |
children | ea3194c0e376 |
files | src/share/vm/gc_implementation/g1/concurrentMark.cpp src/share/vm/gc_implementation/g1/g1_globals.hpp |
diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Feb 17 21:11:47 2011 -0800 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Fri Feb 18 10:07:34 2011 -0800 @@ -2951,8 +2951,12 @@ CMTask* task) : _g1h(g1h), _cm(cm), _task(task) { - _ref_processor = g1h->ref_processor(); - assert(_ref_processor != NULL, "should not be NULL"); + assert(_ref_processor == NULL, "should be initialized to NULL"); + + if (G1UseConcMarkReferenceProcessing) { + _ref_processor = g1h->ref_processor(); + assert(_ref_processor != NULL, "should not be NULL"); + } } };
--- a/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Feb 17 21:11:47 2011 -0800 +++ b/src/share/vm/gc_implementation/g1/g1_globals.hpp Fri Feb 18 10:07:34 2011 -0800 @@ -81,6 +81,11 @@ product(intx, G1MarkRegionStackSize, 1024 * 1024, \ "Size of the region stack for concurrent marking.") \ \ + experimental(bool, G1UseConcMarkReferenceProcessing, false, \ + "If true, enable reference discovery during concurrent " \ + "marking and reference processing at the end of remark " \ + "(unsafe).") \ + \ develop(bool, G1SATBBarrierPrintNullPreVals, false, \ "If true, count frac of ptr writes with null pre-vals.") \ \