comparison src/share/vm/gc_implementation/g1/vm_operations_g1.cpp @ 10405:f2110083203d

8005849: JEP 167: Event-Based JVM Tracing Reviewed-by: acorn, coleenp, sla Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author sla
date Mon, 10 Jun 2013 11:30:51 +0200
parents 37552638d24a
children f7d3b4387a16
comparison
equal deleted inserted replaced
10404:d0add7016434 10405:f2110083203d
1 /* 1 /*
2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
26 #include "gc_implementation/g1/concurrentMarkThread.inline.hpp" 26 #include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
27 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 27 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
28 #include "gc_implementation/g1/g1CollectorPolicy.hpp" 28 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
29 #include "gc_implementation/g1/g1Log.hpp" 29 #include "gc_implementation/g1/g1Log.hpp"
30 #include "gc_implementation/g1/vm_operations_g1.hpp" 30 #include "gc_implementation/g1/vm_operations_g1.hpp"
31 #include "gc_implementation/shared/gcTimer.hpp"
32 #include "gc_implementation/shared/gcTraceTime.hpp"
31 #include "gc_implementation/shared/isGCActiveMark.hpp" 33 #include "gc_implementation/shared/isGCActiveMark.hpp"
32 #include "gc_implementation/g1/vm_operations_g1.hpp" 34 #include "gc_implementation/g1/vm_operations_g1.hpp"
33 #include "runtime/interfaceSupport.hpp" 35 #include "runtime/interfaceSupport.hpp"
34 36
35 VM_G1CollectForAllocation::VM_G1CollectForAllocation( 37 VM_G1CollectForAllocation::VM_G1CollectForAllocation(
225 } 227 }
226 228
227 void VM_CGC_Operation::doit() { 229 void VM_CGC_Operation::doit() {
228 gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps); 230 gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps);
229 TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty); 231 TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty);
230 TraceTime t(_printGCMessage, G1Log::fine(), true, gclog_or_tty); 232 GCTraceTime t(_printGCMessage, G1Log::fine(), true, G1CollectedHeap::heap()->gc_timer_cm());
231 SharedHeap* sh = SharedHeap::heap(); 233 SharedHeap* sh = SharedHeap::heap();
232 // This could go away if CollectedHeap gave access to _gc_is_active... 234 // This could go away if CollectedHeap gave access to _gc_is_active...
233 if (sh != NULL) { 235 if (sh != NULL) {
234 IsGCActiveMark x; 236 IsGCActiveMark x;
235 _cl->do_void(); 237 _cl->do_void();