--- old/src/share/vm/runtime/timer.cpp	2015-02-17 09:48:41.482516413 +0100
+++ new/src/share/vm/runtime/timer.cpp	2015-02-17 09:48:41.421514642 +0100
@@ -26,6 +26,9 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/timer.hpp"
 #include "utilities/ostream.hpp"
+#ifdef INCLUDE_ALL_GCS
+#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
+#endif
 
 double TimeHelper::counter_to_seconds(jlong counter) {
   double count = (double) counter;
@@ -140,6 +143,20 @@
   }
 }
 
+TrackPhaseTime::TrackPhaseTime(GCPhaseTimeTracker *data, uint phase) :
+  _data(data), _phase(phase) {
+  if (_data != NULL && _data->active()) {
+    _last = os::elapsed_counter();
+  }
+}
+
+TrackPhaseTime::~TrackPhaseTime() {
+  if (_data != NULL && _data->active()) {
+    double time = (double)(os::elapsed_counter() - _last) * 1000.0 / os::elapsed_frequency();
+    _data->set_value(_phase, time);
+  }
+}
+
 TraceCPUTime::TraceCPUTime(bool doit,
                bool print_cr,
                outputStream *logfile) :