infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-19 18:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8200255: Remove G1CMTask::_concurrent

Browse Source 
Reviewed-by: sangheki, sjohanss
This commit is contained in:
Thomas Schatzl 2018-04-04 11:21:14 +02:00
parent 5780affe90
commit ee1bd0136b
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
View File

@ -588,10 +588,6 @@ void G1ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurr
set_concurrency(active_tasks);
_concurrent = concurrent;
// We propagate this to all tasks, not just the active ones.
for (uint i = 0; i < _max_num_tasks; ++i) {
_tasks[i]->set_concurrent(concurrent);
}
if (concurrent) {
set_concurrent_marking_in_progress();
@ -2126,7 +2122,7 @@ void G1CMTask::regular_clock_call() {
// If we are not concurrent (i.e. we're doing remark) we don't need
// to check anything else. The other steps are only needed during
// the concurrent marking phase.
if (!_concurrent) {
if (!_cm->concurrent()) {
return;
}
@ -2324,7 +2320,7 @@ void G1CMTask::drain_satb_buffers() {
_draining_satb_buffers = false;
assert(has_aborted() ||
_concurrent ||
_cm->concurrent() ||
satb_mq_set.completed_buffers_num() == 0, "invariant");
// again, this was a potentially expensive operation, decrease the
@ -2479,7 +2475,6 @@ void G1CMTask::do_marking_step(double time_target_ms,
bool do_termination,
bool is_serial) {
assert(time_target_ms >= 1.0, "minimum granularity is 1ms");
assert(_concurrent == _cm->concurrent(), "they should be the same");
_start_time_ms = os::elapsedVTime() * 1000.0;
@ -2701,7 +2696,7 @@ void G1CMTask::do_marking_step(double time_target_ms,
if (_worker_id == 0) {
// Let's allow task 0 to do this
if (_concurrent) {
if (_cm->concurrent()) {
assert(_cm->concurrent_marking_in_progress(), "invariant");
// We need to set this to false before the next
// safepoint. This way we ensure that the marking phase
@ -2825,7 +2820,6 @@ G1CMTask::G1CMTask(uint worker_id,
_elapsed_time_ms(0.0),
_termination_time_ms(0.0),
_termination_start_time_ms(0.0),
_concurrent(false),
_marking_step_diffs_ms()
{
guarantee(task_queue != NULL, "invariant");

8
src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
View File

@ -706,12 +706,6 @@ private:
// When this task got into the termination protocol
double _termination_start_time_ms;
// True when the task is during a concurrent phase, false when it is
// in the remark phase (so, in the latter case, we do not have to
// check all the things that we have to check during the concurrent
// phase, i.e. SATB buffer availability...)
bool _concurrent;
TruncatedSeq _marking_step_diffs_ms;
// Updates the local fields after this task has claimed
@ -755,8 +749,6 @@ public:
// Clears all the fields that correspond to a claimed region.
void clear_region_fields();
void set_concurrent(bool concurrent) { _concurrent = concurrent; }
// The main method of this class which performs a marking step
// trying not to exceed the given duration. However, it might exit
// prematurely, according to some conditions (i.e. SATB buffers are