1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Wed Jun 25 15:51:15 2014 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Thu Jun 19 13:31:14 2014 +0200
1.3 @@ -1,4 +1,4 @@
1.4 -/*
1.5 + /*
1.6 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 @@ -29,6 +29,7 @@
1.10 #include "gc_implementation/g1/g1Log.hpp"
1.11 #include "gc_implementation/g1/g1MMUTracker.hpp"
1.12 #include "gc_implementation/g1/vm_operations_g1.hpp"
1.13 +#include "gc_implementation/shared/gcTrace.hpp"
1.14 #include "memory/resourceArea.hpp"
1.15 #include "runtime/vmThread.hpp"
1.16
1.17 @@ -109,8 +110,7 @@
1.18 double scan_start = os::elapsedTime();
1.19 if (!cm()->has_aborted()) {
1.20 if (G1Log::fine()) {
1.21 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.22 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.23 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.24 gclog_or_tty->print_cr("[GC concurrent-root-region-scan-start]");
1.25 }
1.26
1.27 @@ -118,8 +118,7 @@
1.28
1.29 double scan_end = os::elapsedTime();
1.30 if (G1Log::fine()) {
1.31 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.32 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.33 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.34 gclog_or_tty->print_cr("[GC concurrent-root-region-scan-end, %1.7lf secs]",
1.35 scan_end - scan_start);
1.36 }
1.37 @@ -127,8 +126,7 @@
1.38
1.39 double mark_start_sec = os::elapsedTime();
1.40 if (G1Log::fine()) {
1.41 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.42 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.43 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.44 gclog_or_tty->print_cr("[GC concurrent-mark-start]");
1.45 }
1.46
1.47 @@ -151,8 +149,7 @@
1.48 }
1.49
1.50 if (G1Log::fine()) {
1.51 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.52 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.53 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.54 gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf secs]",
1.55 mark_end_sec - mark_start_sec);
1.56 }
1.57 @@ -167,8 +164,7 @@
1.58 "in remark (restart #%d).", iter);
1.59 }
1.60 if (G1Log::fine()) {
1.61 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.62 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.63 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.64 gclog_or_tty->print_cr("[GC concurrent-mark-restart-for-overflow]");
1.65 }
1.66 }
1.67 @@ -212,8 +208,7 @@
1.68
1.69 double cleanup_start_sec = os::elapsedTime();
1.70 if (G1Log::fine()) {
1.71 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.72 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.73 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.74 gclog_or_tty->print_cr("[GC concurrent-cleanup-start]");
1.75 }
1.76
1.77 @@ -233,8 +228,7 @@
1.78
1.79 double cleanup_end_sec = os::elapsedTime();
1.80 if (G1Log::fine()) {
1.81 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.82 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.83 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.84 gclog_or_tty->print_cr("[GC concurrent-cleanup-end, %1.7lf secs]",
1.85 cleanup_end_sec - cleanup_start_sec);
1.86 }
1.87 @@ -274,8 +268,7 @@
1.88
1.89 if (cm()->has_aborted()) {
1.90 if (G1Log::fine()) {
1.91 - gclog_or_tty->date_stamp(PrintGCDateStamps);
1.92 - gclog_or_tty->stamp(PrintGCTimeStamps);
1.93 + gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
1.94 gclog_or_tty->print_cr("[GC concurrent-mark-abort]");
1.95 }
1.96 }
