Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/shared/adaptiveSizePolicy.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 | 14d3f71f831d |
children | 52b4284cb496 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2004, 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. |
169 if (TraceDynamicGCThreads) { | 169 if (TraceDynamicGCThreads) { |
170 gclog_or_tty->print_cr("GCTaskManager::calc_default_active_workers() : " | 170 gclog_or_tty->print_cr("GCTaskManager::calc_default_active_workers() : " |
171 "active_workers(): %d new_acitve_workers: %d " | 171 "active_workers(): %d new_acitve_workers: %d " |
172 "prev_active_workers: %d\n" | 172 "prev_active_workers: %d\n" |
173 " active_workers_by_JT: %d active_workers_by_heap_size: %d", | 173 " active_workers_by_JT: %d active_workers_by_heap_size: %d", |
174 active_workers, new_active_workers, prev_active_workers, | 174 (int) active_workers, (int) new_active_workers, (int) prev_active_workers, |
175 active_workers_by_JT, active_workers_by_heap_size); | 175 (int) active_workers_by_JT, (int) active_workers_by_heap_size); |
176 } | 176 } |
177 assert(new_active_workers > 0, "Always need at least 1"); | 177 assert(new_active_workers > 0, "Always need at least 1"); |
178 return new_active_workers; | 178 return new_active_workers; |
179 } | 179 } |
180 | 180 |
543 } | 543 } |
544 | 544 |
545 if (UseGCOverheadLimit && PrintGCDetails && Verbose) { | 545 if (UseGCOverheadLimit && PrintGCDetails && Verbose) { |
546 if (gc_overhead_limit_exceeded()) { | 546 if (gc_overhead_limit_exceeded()) { |
547 gclog_or_tty->print_cr(" GC is exceeding overhead limit " | 547 gclog_or_tty->print_cr(" GC is exceeding overhead limit " |
548 "of %d%%", GCTimeLimit); | 548 "of %d%%", (int) GCTimeLimit); |
549 reset_gc_overhead_limit_count(); | 549 reset_gc_overhead_limit_count(); |
550 } else if (print_gc_overhead_limit_would_be_exceeded) { | 550 } else if (print_gc_overhead_limit_would_be_exceeded) { |
551 assert(gc_overhead_limit_count() > 0, "Should not be printing"); | 551 assert(gc_overhead_limit_count() > 0, "Should not be printing"); |
552 gclog_or_tty->print_cr(" GC would exceed overhead limit " | 552 gclog_or_tty->print_cr(" GC would exceed overhead limit " |
553 "of %d%% %d consecutive time(s)", | 553 "of %d%% %d consecutive time(s)", |
554 GCTimeLimit, gc_overhead_limit_count()); | 554 (int) GCTimeLimit, gc_overhead_limit_count()); |
555 } | 555 } |
556 } | 556 } |
557 } | 557 } |
558 // Printing | 558 // Printing |
559 | 559 |