diff -r 29517169ad2d -r b9f6a4427da9 src/hotspot/share/gc/shared/weakProcessorPhaseTimes.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/weakProcessorPhaseTimes.hpp	Tue Aug 28 12:57:40 2018 -0400
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHARED_WEAKPROCESSORPHASETIMES_HPP
+#define SHARE_GC_SHARED_WEAKPROCESSORPHASETIMES_HPP
+
+#include "gc/shared/weakProcessorPhases.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.hpp"
+
+template<typename T> class WorkerDataArray;
+
+class WeakProcessorPhaseTimes : public CHeapObj<mtGC> {
+  uint _max_threads;
+  uint _active_workers;
+
+  // Total time for weak processor.
+  double _total_time_sec;
+
+  // Total time for each serially processed phase.  Entries for phases
+  // processed by multiple threads are unused, as are entries for
+  // unexecuted phases.
+  double _phase_times_sec[WeakProcessorPhases::phase_count];
+
+  // Per-worker times, if multiple threads used and the phase was executed.
+  WorkerDataArray<double>* _worker_phase_times_sec[WeakProcessorPhases::oop_storage_phase_count];
+
+  WorkerDataArray<double>* worker_data(WeakProcessorPhase phase) const;
+
+  void log_st_phase(WeakProcessorPhase phase, uint indent) const;
+  void log_mt_phase_summary(WeakProcessorPhase phase, uint indent) const;
+  void log_mt_phase_details(WeakProcessorPhase phase, uint indent) const;
+
+public:
+  WeakProcessorPhaseTimes(uint max_threads);
+  ~WeakProcessorPhaseTimes();
+
+  uint max_threads() const;
+  uint active_workers() const;
+  void set_active_workers(uint n);
+
+  double total_time_sec() const;
+  double phase_time_sec(WeakProcessorPhase phase) const;
+  double worker_time_sec(uint worker_id, WeakProcessorPhase phase) const;
+
+  void record_total_time_sec(double time_sec);
+  void record_phase_time_sec(WeakProcessorPhase phase, double time_sec);
+  void record_worker_time_sec(uint worker_id, WeakProcessorPhase phase, double time_sec);
+
+  void reset();
+
+  void log_print(uint indent = 0) const;
+  void log_print_phases(uint indent = 0) const;
+};
+
+// Record total weak processor time and worker count in times.
+// Does nothing if times is NULL.
+class WeakProcessorTimeTracker : StackObj {
+  WeakProcessorPhaseTimes* _times;
+  Ticks _start_time;
+
+public:
+  WeakProcessorTimeTracker(WeakProcessorPhaseTimes* times);
+  ~WeakProcessorTimeTracker();
+};
+
+// Record phase time contribution for the current thread in phase times.
+// Does nothing if phase times is NULL.
+class WeakProcessorPhaseTimeTracker : StackObj {
+private:
+  WeakProcessorPhaseTimes* _times;
+  WeakProcessorPhase _phase;
+  uint _worker_id;
+  Ticks _start_time;
+
+public:
+  // For tracking serial phase times.
+  // Precondition: WeakProcessorPhases::is_serial(phase)
+  WeakProcessorPhaseTimeTracker(WeakProcessorPhaseTimes* times,
+                                WeakProcessorPhase phase);
+
+  // For tracking possibly parallel phase times (even if processed by
+  // only one thread).
+  // Precondition: WeakProcessorPhases::is_oop_storage(phase)
+  // Precondition: worker_id < times->max_threads().
+  WeakProcessorPhaseTimeTracker(WeakProcessorPhaseTimes* times,
+                                WeakProcessorPhase phase,
+                                uint worker_id);
+
+  ~WeakProcessorPhaseTimeTracker();
+};
+
+#endif // SHARE_GC_SHARED_WEAKPROCESSORPHASETIMES_HPP