--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp Wed Aug 22 09:33:18 2018 -0700
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp Tue Aug 28 12:57:40 2018 -0400
@@ -26,6 +26,7 @@
#define SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
#include "gc/shared/referenceProcessorPhaseTimes.hpp"
+#include "gc/shared/weakProcessorPhaseTimes.hpp"
#include "logging/logLevel.hpp"
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -127,9 +128,6 @@
double _cur_clear_ct_time_ms;
double _cur_expand_heap_time_ms;
double _cur_ref_proc_time_ms;
- double _cur_ref_enq_time_ms;
-
- double _cur_weak_ref_proc_time_ms;
double _cur_collection_start_sec;
double _root_region_scan_wait_time_ms;
@@ -163,6 +161,7 @@
double _cur_verify_after_time_ms;
ReferenceProcessorPhaseTimes _ref_phase_times;
+ WeakProcessorPhaseTimes _weak_phase_times;
double worker_time(GCParPhases phase, uint worker);
void note_gc_end();
@@ -257,10 +256,6 @@
_cur_ref_proc_time_ms = ms;
}
- void record_weak_ref_proc_time(double ms) {
- _cur_weak_ref_proc_time_ms = ms;
- }
-
void record_root_region_scan_wait_time(double time_ms) {
_root_region_scan_wait_time_ms = time_ms;
}
@@ -365,6 +360,8 @@
}
ReferenceProcessorPhaseTimes* ref_phase_times() { return &_ref_phase_times; }
+
+ WeakProcessorPhaseTimes* weak_phase_times() { return &_weak_phase_times; }
};
class G1EvacPhaseWithTrimTimeTracker : public StackObj {