--- old/src/share/vm/gc_implementation/shared/gcTraceTime.cpp	2015-05-12 11:57:11.681692871 +0200
+++ /dev/null	2015-03-18 17:10:38.111854831 +0100
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "runtime/globals.hpp"
-#include "runtime/os.hpp"
-#include "runtime/safepoint.hpp"
-#include "runtime/thread.inline.hpp"
-#include "runtime/timer.hpp"
-#include "utilities/ostream.hpp"
-#include "utilities/ticks.inline.hpp"
-
-
-GCTraceTime::GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer, GCId gc_id) :
-    _title(title), _doit(doit), _print_cr(print_cr), _timer(timer), _start_counter() {
-  if (_doit || _timer != NULL) {
-    _start_counter.stamp();
-  }
-
-  if (_timer != NULL) {
-    assert(SafepointSynchronize::is_at_safepoint(), "Tracing currently only supported at safepoints");
-    assert(Thread::current()->is_VM_thread(), "Tracing currently only supported from the VM thread");
-
-    _timer->register_gc_phase_start(title, _start_counter);
-  }
-
-  if (_doit) {
-    gclog_or_tty->date_stamp(PrintGCDateStamps);
-    gclog_or_tty->stamp(PrintGCTimeStamps);
-    if (PrintGCID) {
-      gclog_or_tty->print("#%u: ", gc_id.id());
-    }
-    gclog_or_tty->print("[%s", title);
-    gclog_or_tty->flush();
-  }
-}
-
-GCTraceTime::~GCTraceTime() {
-  Ticks stop_counter;
-
-  if (_doit || _timer != NULL) {
-    stop_counter.stamp();
-  }
-
-  if (_timer != NULL) {
-    _timer->register_gc_phase_end(stop_counter);
-  }
-
-  if (_doit) {
-    const Tickspan duration = stop_counter - _start_counter;
-    double duration_in_seconds = TicksToTimeHelper::seconds(duration);
-    if (_print_cr) {
-      gclog_or_tty->print_cr(", %3.7f secs]", duration_in_seconds);
-    } else {
-      gclog_or_tty->print(", %3.7f secs]", duration_in_seconds);
-    }
-    gclog_or_tty->flush();
-  }
-}
--- /dev/null	2015-03-18 17:10:38.111854831 +0100
+++ new/src/share/vm/gc/shared/gcTraceTime.cpp	2015-05-12 11:57:11.269675510 +0200
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2012, 2015, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/os.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/thread.inline.hpp"
+#include "runtime/timer.hpp"
+#include "utilities/ostream.hpp"
+#include "utilities/ticks.inline.hpp"
+
+
+GCTraceTime::GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer, GCId gc_id) :
+    _title(title), _doit(doit), _print_cr(print_cr), _timer(timer), _start_counter() {
+  if (_doit || _timer != NULL) {
+    _start_counter.stamp();
+  }
+
+  if (_timer != NULL) {
+    assert(SafepointSynchronize::is_at_safepoint(), "Tracing currently only supported at safepoints");
+    assert(Thread::current()->is_VM_thread(), "Tracing currently only supported from the VM thread");
+
+    _timer->register_gc_phase_start(title, _start_counter);
+  }
+
+  if (_doit) {
+    gclog_or_tty->date_stamp(PrintGCDateStamps);
+    gclog_or_tty->stamp(PrintGCTimeStamps);
+    if (PrintGCID) {
+      gclog_or_tty->print("#%u: ", gc_id.id());
+    }
+    gclog_or_tty->print("[%s", title);
+    gclog_or_tty->flush();
+  }
+}
+
+GCTraceTime::~GCTraceTime() {
+  Ticks stop_counter;
+
+  if (_doit || _timer != NULL) {
+    stop_counter.stamp();
+  }
+
+  if (_timer != NULL) {
+    _timer->register_gc_phase_end(stop_counter);
+  }
+
+  if (_doit) {
+    const Tickspan duration = stop_counter - _start_counter;
+    double duration_in_seconds = TicksToTimeHelper::seconds(duration);
+    if (_print_cr) {
+      gclog_or_tty->print_cr(", %3.7f secs]", duration_in_seconds);
+    } else {
+      gclog_or_tty->print(", %3.7f secs]", duration_in_seconds);
+    }
+    gclog_or_tty->flush();
+  }
+}