Mercurial > hg > icedtea8-forest > hotspot
changeset 10920:a435c913c8ce jdk8u292-b05
8129626: G1: set_in_progress() and clear_started() needs a barrier on non-TSO platforms
Summary: Also reviewed by vitalyd@gmail.com
Reviewed-by: pliden, bpittore, bdelsart
author | brutisso |
---|---|
date | Thu, 25 Jun 2015 08:15:07 +0200 |
parents | c4390912be8a |
children | a5795acea814 |
files | src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp |
diffstat | 3 files changed, 19 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Thu Jun 25 12:24:50 2020 -0400 +++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Thu Jun 25 08:15:07 2015 +0200 @@ -43,8 +43,7 @@ ConcurrentMarkThread::ConcurrentMarkThread(ConcurrentMark* cm) : ConcurrentGCThread(), _cm(cm), - _started(false), - _in_progress(false), + _state(Idle), _vtime_accum(0.0), _vtime_mark_accum(0.0) { create_and_start(); @@ -341,7 +340,6 @@ if (started()) { set_in_progress(); - clear_started(); } }
--- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp Thu Jun 25 12:24:50 2020 -0400 +++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp Thu Jun 25 08:15:07 2015 +0200 @@ -46,8 +46,14 @@ private: ConcurrentMark* _cm; - volatile bool _started; - volatile bool _in_progress; + + enum State { + Idle, + Started, + InProgress + }; + + volatile State _state; void sleepBeforeNextCycle(); @@ -71,23 +77,22 @@ ConcurrentMark* cm() { return _cm; } - void set_started() { assert(!_in_progress, "cycle in progress"); _started = true; } - void clear_started() { assert(_in_progress, "must be starting a cycle"); _started = false; } - bool started() { return _started; } + void set_idle() { assert(_state != Started, "must not be starting a new cycle"); _state = Idle; } + bool idle() { return _state == Idle; } + void set_started() { assert(_state == Idle, "cycle in progress"); _state = Started; } + bool started() { return _state == Started; } + void set_in_progress() { assert(_state == Started, "must be starting a cycle"); _state = InProgress; } + bool in_progress() { return _state == InProgress; } - void set_in_progress() { assert(_started, "must be starting a cycle"); _in_progress = true; } - void clear_in_progress() { assert(!_started, "must not be starting a new cycle"); _in_progress = false; } - bool in_progress() { return _in_progress; } - - // This flag returns true from the moment a marking cycle is + // Returns true from the moment a marking cycle is // initiated (during the initial-mark pause when started() is set) // to the moment when the cycle completes (just after the next // marking bitmap has been cleared and in_progress() is - // cleared). While this flag is true we will not start another cycle + // cleared). While during_cycle() is true we will not start another cycle // so that cycles do not overlap. We cannot use just in_progress() // as the CM thread might take some time to wake up before noticing // that started() is set and set in_progress(). - bool during_cycle() { return started() || in_progress(); } + bool during_cycle() { return !idle(); } // shutdown void stop();
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jun 25 12:24:50 2020 -0400 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jun 25 08:15:07 2015 +0200 @@ -2409,7 +2409,7 @@ // is set) so that if a waiter requests another System.gc() it doesn't // incorrectly see that a marking cycle is still in progress. if (concurrent) { - _cmThread->clear_in_progress(); + _cmThread->set_idle(); } // This notify_all() will ensure that a thread that called