Mercurial > hg > graal-jvmci-8

comparison src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp @ 17937:78bbf4d43a14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 190899198332
children
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.
33 #include "memory/memRegion.hpp" 33 #include "memory/memRegion.hpp"
34 #include "memory/padded.inline.hpp" 34 #include "memory/padded.inline.hpp"
35 #include "oops/oop.inline.hpp" 35 #include "oops/oop.inline.hpp"
36 #include "oops/oop.psgc.inline.hpp" 36 #include "oops/oop.psgc.inline.hpp"
37 37
38 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
39
38 PaddedEnd<PSPromotionManager>* PSPromotionManager::_manager_array = NULL; 40 PaddedEnd<PSPromotionManager>* PSPromotionManager::_manager_array = NULL;
39 OopStarTaskQueueSet* PSPromotionManager::_stack_array_depth = NULL; 41 OopStarTaskQueueSet* PSPromotionManager::_stack_array_depth = NULL;
40 PSOldGen* PSPromotionManager::_old_gen = NULL; 42 PSOldGen* PSPromotionManager::_old_gen = NULL;
41 MutableSpace* PSPromotionManager::_young_space = NULL; 43 MutableSpace* PSPromotionManager::_young_space = NULL;
42 44
134 for (uint i = 0; i < ParallelGCThreads + 1; ++i) { 136 for (uint i = 0; i < ParallelGCThreads + 1; ++i) {
135 manager_array(i)->print_taskqueue_stats(i); 137 manager_array(i)->print_taskqueue_stats(i);
136 } 138 }
137 139
138 const uint hlines = sizeof(pm_stats_hdr) / sizeof(pm_stats_hdr[0]); 140 const uint hlines = sizeof(pm_stats_hdr) / sizeof(pm_stats_hdr[0]);
139 for (uint i = 0; i < hlines; ++i) tty->print_cr(pm_stats_hdr[i]); 141 for (uint i = 0; i < hlines; ++i) tty->print_cr("%s", pm_stats_hdr[i]);
140 for (uint i = 0; i < ParallelGCThreads + 1; ++i) { 142 for (uint i = 0; i < ParallelGCThreads + 1; ++i) {
141 manager_array(i)->print_local_stats(i); 143 manager_array(i)->print_local_stats(i);
142 } 144 }
143 } 145 }
144 146