equal
deleted
inserted
replaced
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(); |