--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Fri Oct 30 10:15:06 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Sat Oct 31 15:27:48 2015 +0100
@@ -3826,7 +3826,7 @@
workers()->set_active_workers(active_workers);
double pause_start_sec = os::elapsedTime();
- g1_policy()->phase_times()->note_gc_start(active_workers, collector_state()->mark_in_progress());
+ g1_policy()->note_gc_start(active_workers);
log_gc_header();
TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
--- a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp Fri Oct 30 10:15:06 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp Sat Oct 31 15:27:48 2015 +0100
@@ -437,6 +437,10 @@
start_incremental_cset_building();
}
+void G1CollectorPolicy::note_gc_start(uint num_active_workers) {
+ phase_times()->note_gc_start(num_active_workers);
+}
+
// Create the jstat counters for the policy.
void G1CollectorPolicy::initialize_gc_policy_counters() {
_gc_policy_counters = new GCPolicyCounters("GarbageFirst", 1, 3);
--- a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp Fri Oct 30 10:15:06 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp Sat Oct 31 15:27:48 2015 +0100
@@ -549,6 +549,8 @@
void init();
+ virtual void note_gc_start(uint num_active_workers);
+
// Create jstat counters for the policy.
virtual void initialize_gc_policy_counters();
--- a/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp Fri Oct 30 10:15:06 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp Sat Oct 31 15:27:48 2015 +0100
@@ -136,7 +136,7 @@
_gc_par_phases[RedirtyCards]->link_thread_work_items(_redirtied_cards);
}
-void G1GCPhaseTimes::note_gc_start(uint active_gc_threads, bool mark_in_progress) {
+void G1GCPhaseTimes::note_gc_start(uint active_gc_threads) {
assert(active_gc_threads > 0, "The number of threads must be > 0");
assert(active_gc_threads <= _max_gc_threads, "The number of active threads must be <= the max number of threads");
_active_gc_threads = active_gc_threads;
--- a/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp Fri Oct 30 10:15:06 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp Sat Oct 31 15:27:48 2015 +0100
@@ -125,7 +125,7 @@
public:
G1GCPhaseTimes(uint max_gc_threads);
- void note_gc_start(uint active_gc_threads, bool mark_in_progress);
+ void note_gc_start(uint active_gc_threads);
void print(double pause_time_sec);
// record the time a phase took in seconds