--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp Wed Nov 20 14:16:29 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp Thu Nov 21 11:42:54 2019 +0100
@@ -78,6 +78,7 @@
RedirtyCards,
YoungFreeCSet,
NonYoungFreeCSet,
+ MergePSS,
GCParPhasesSentinel
};
@@ -108,9 +109,10 @@
MergeLBSkippedCards
};
- enum GCObjCopyWorkItems {
- ObjCopyLABWaste,
- ObjCopyLABUndoWaste
+ enum GCMergePSSWorkItems {
+ MergePSSCopiedBytes,
+ MergePSSLABWasteBytes,
+ MergePSSLABUndoWasteBytes
};
private:
@@ -143,11 +145,9 @@
WorkerDataArray<size_t>* _opt_scan_hr_scanned_opt_refs;
WorkerDataArray<size_t>* _opt_scan_hr_used_memory;
- WorkerDataArray<size_t>* _obj_copy_lab_waste;
- WorkerDataArray<size_t>* _obj_copy_lab_undo_waste;
-
- WorkerDataArray<size_t>* _opt_obj_copy_lab_waste;
- WorkerDataArray<size_t>* _opt_obj_copy_lab_undo_waste;
+ WorkerDataArray<size_t>* _merge_pss_copied_bytes;
+ WorkerDataArray<size_t>* _merge_pss_lab_waste_bytes;
+ WorkerDataArray<size_t>* _merge_pss_lab_undo_waste_bytes;
WorkerDataArray<size_t>* _termination_attempts;
@@ -224,7 +224,9 @@
template <class T>
void details(T* phase, const char* indent) const;
+ void log_work_items(WorkerDataArray<double>* phase, uint indent, outputStream* out) const;
void log_phase(WorkerDataArray<double>* phase, uint indent, outputStream* out, bool print_sum) const;
+ void debug_serial_phase(WorkerDataArray<double>* phase, uint extra_indent = 0) const;
void debug_phase(WorkerDataArray<double>* phase, uint extra_indent = 0) const;
void trace_phase(WorkerDataArray<double>* phase, bool print_sum = true) const;
@@ -269,8 +271,6 @@
size_t sum_thread_work_items(GCParPhases phase, uint index = 0);
- public:
-
void record_prepare_tlab_time_ms(double ms) {
_cur_prepare_tlab_time_ms = ms;
}
@@ -378,10 +378,6 @@
_recorded_preserve_cm_referents_time_ms = time_ms;
}
- void record_merge_pss_time_ms(double time_ms) {
- _recorded_merge_pss_time_ms = time_ms;
- }
-
void record_start_new_cset_time_ms(double time_ms) {
_recorded_start_new_cset_time_ms = time_ms;
}