Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.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 | a034dc5e910b |
children | 52b4284cb496 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2002, 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. |
32 #include "memory/collectorPolicy.hpp" | 32 #include "memory/collectorPolicy.hpp" |
33 #include "runtime/timer.hpp" | 33 #include "runtime/timer.hpp" |
34 #include "utilities/top.hpp" | 34 #include "utilities/top.hpp" |
35 | 35 |
36 #include <math.h> | 36 #include <math.h> |
37 | |
38 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
37 | 39 |
38 PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size, | 40 PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size, |
39 size_t init_promo_size, | 41 size_t init_promo_size, |
40 size_t init_survivor_size, | 42 size_t init_survivor_size, |
41 size_t space_alignment, | 43 size_t space_alignment, |
1031 if (PrintAdaptiveSizePolicy && Verbose) { | 1033 if (PrintAdaptiveSizePolicy && Verbose) { |
1032 gclog_or_tty->print_cr( | 1034 gclog_or_tty->print_cr( |
1033 "AdaptiveSizePolicy::adjust_promo_for_footprint " | 1035 "AdaptiveSizePolicy::adjust_promo_for_footprint " |
1034 "adjusting tenured gen for footprint. " | 1036 "adjusting tenured gen for footprint. " |
1035 "starting promo size " SIZE_FORMAT | 1037 "starting promo size " SIZE_FORMAT |
1036 " reduced promo size " SIZE_FORMAT, | 1038 " reduced promo size " SIZE_FORMAT |
1037 " promo delta " SIZE_FORMAT, | 1039 " promo delta " SIZE_FORMAT, |
1038 desired_promo_size, reduced_size, change ); | 1040 desired_promo_size, reduced_size, change ); |
1039 } | 1041 } |
1040 | 1042 |
1041 assert(reduced_size <= desired_promo_size, "Inconsistent result"); | 1043 assert(reduced_size <= desired_promo_size, "Inconsistent result"); |