Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @ 17937:78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas
8043164: Format warning in traceStream.hpp
Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings
Reviewed-by: kvn, coleenp, iveresov, twisti
author | drchase |
---|---|
date | Thu, 22 May 2014 15:52:41 -0400 |
parents | 270d7cb38f40 |
children | 52b4284cb496 5d7a63aee595 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 2014, 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. |
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 * or visit www.oracle.com if you need additional information or have any | 20 * or visit www.oracle.com if you need additional information or have any |
21 * questions. | 21 * questions. |
22 * | 22 * |
23 */ | 23 */ |
24 | |
25 #ifndef __clang_major__ | |
26 #define ATTRIBUTE_PRINTF(x,y) // FIXME, formats are a mess. | |
27 #endif | |
24 | 28 |
25 #include "precompiled.hpp" | 29 #include "precompiled.hpp" |
26 #include "gc_implementation/g1/concurrentG1Refine.hpp" | 30 #include "gc_implementation/g1/concurrentG1Refine.hpp" |
27 #include "gc_implementation/g1/concurrentMark.hpp" | 31 #include "gc_implementation/g1/concurrentMark.hpp" |
28 #include "gc_implementation/g1/concurrentMarkThread.inline.hpp" | 32 #include "gc_implementation/g1/concurrentMarkThread.inline.hpp" |
963 bool last_pause_included_initial_mark = false; | 967 bool last_pause_included_initial_mark = false; |
964 bool update_stats = !_g1->evacuation_failed(); | 968 bool update_stats = !_g1->evacuation_failed(); |
965 | 969 |
966 #ifndef PRODUCT | 970 #ifndef PRODUCT |
967 if (G1YoungSurvRateVerbose) { | 971 if (G1YoungSurvRateVerbose) { |
968 gclog_or_tty->print_cr(""); | 972 gclog_or_tty->cr(); |
969 _short_lived_surv_rate_group->print(); | 973 _short_lived_surv_rate_group->print(); |
970 // do that for any other surv rate groups too | 974 // do that for any other surv rate groups too |
971 } | 975 } |
972 #endif // PRODUCT | 976 #endif // PRODUCT |
973 | 977 |
2220 return; | 2224 return; |
2221 } | 2225 } |
2222 | 2226 |
2223 gclog_or_tty->print_cr("ALL PAUSES"); | 2227 gclog_or_tty->print_cr("ALL PAUSES"); |
2224 print_summary_sd(" Total", &_total); | 2228 print_summary_sd(" Total", &_total); |
2225 gclog_or_tty->print_cr(""); | 2229 gclog_or_tty->cr(); |
2226 gclog_or_tty->print_cr(""); | 2230 gclog_or_tty->cr(); |
2227 gclog_or_tty->print_cr(" Young GC Pauses: %8d", _young_pause_num); | 2231 gclog_or_tty->print_cr(" Young GC Pauses: %8d", _young_pause_num); |
2228 gclog_or_tty->print_cr(" Mixed GC Pauses: %8d", _mixed_pause_num); | 2232 gclog_or_tty->print_cr(" Mixed GC Pauses: %8d", _mixed_pause_num); |
2229 gclog_or_tty->print_cr(""); | 2233 gclog_or_tty->cr(); |
2230 | 2234 |
2231 gclog_or_tty->print_cr("EVACUATION PAUSES"); | 2235 gclog_or_tty->print_cr("EVACUATION PAUSES"); |
2232 | 2236 |
2233 if (_young_pause_num == 0 && _mixed_pause_num == 0) { | 2237 if (_young_pause_num == 0 && _mixed_pause_num == 0) { |
2234 gclog_or_tty->print_cr("none"); | 2238 gclog_or_tty->print_cr("none"); |
2244 print_summary(" Termination", &_termination); | 2248 print_summary(" Termination", &_termination); |
2245 print_summary(" Parallel Other", &_parallel_other); | 2249 print_summary(" Parallel Other", &_parallel_other); |
2246 print_summary(" Clear CT", &_clear_ct); | 2250 print_summary(" Clear CT", &_clear_ct); |
2247 print_summary(" Other", &_other); | 2251 print_summary(" Other", &_other); |
2248 } | 2252 } |
2249 gclog_or_tty->print_cr(""); | 2253 gclog_or_tty->cr(); |
2250 | 2254 |
2251 gclog_or_tty->print_cr("MISC"); | 2255 gclog_or_tty->print_cr("MISC"); |
2252 print_summary_sd(" Stop World", &_all_stop_world_times_ms); | 2256 print_summary_sd(" Stop World", &_all_stop_world_times_ms); |
2253 print_summary_sd(" Yields", &_all_yield_times_ms); | 2257 print_summary_sd(" Yields", &_all_yield_times_ms); |
2254 } | 2258 } |