From 09c2ca58092d8b7678e1395c4f8861ea622e5d0e Mon Sep 17 00:00:00 2001 From: Stefan Johansson Date: Thu, 9 Nov 2017 10:11:19 +0100 Subject: [PATCH] 8190711: Assert in G1MMUTracker due to concurrent modification Reviewed-by: tschatzl, rehn, sangheki --- src/hotspot/share/gc/g1/g1MMUTracker.cpp | 11 ----------- src/hotspot/share/gc/g1/g1MMUTracker.hpp | 2 -- 2 files changed, 13 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1MMUTracker.cpp b/src/hotspot/share/gc/g1/g1MMUTracker.cpp index 837eb1576e7..10b30f09366 100644 --- a/src/hotspot/share/gc/g1/g1MMUTracker.cpp +++ b/src/hotspot/share/gc/g1/g1MMUTracker.cpp @@ -112,18 +112,7 @@ void G1MMUTrackerQueue::add_pause(double start, double end) { } } -// basically the _internal call does not remove expired entries -// this is for trying things out in the future and a couple -// of other places (debugging) - double G1MMUTrackerQueue::when_sec(double current_time, double pause_time) { - remove_expired_entries(current_time); - - return when_internal(current_time, pause_time); -} - -double G1MMUTrackerQueue::when_internal(double current_time, - double pause_time) { // if the pause is over the maximum, just assume that it's the maximum double adjusted_pause_time = (pause_time > max_gc_time()) ? max_gc_time() : pause_time; diff --git a/src/hotspot/share/gc/g1/g1MMUTracker.hpp b/src/hotspot/share/gc/g1/g1MMUTracker.hpp index c8a09af2adc..22e2f3a730c 100644 --- a/src/hotspot/share/gc/g1/g1MMUTracker.hpp +++ b/src/hotspot/share/gc/g1/g1MMUTracker.hpp @@ -134,8 +134,6 @@ private: void remove_expired_entries(double current_time); double calculate_gc_time(double current_time); - double when_internal(double current_time, double pause_time); - public: G1MMUTrackerQueue(double time_slice, double max_gc_time);