Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.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 270d7cb38f40
children 52b4284cb496 0982ec23da03
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.
52 #include "services/management.hpp" 52 #include "services/management.hpp"
53 #include "services/memoryService.hpp" 53 #include "services/memoryService.hpp"
54 #include "utilities/events.hpp" 54 #include "utilities/events.hpp"
55 #include "utilities/stack.inline.hpp" 55 #include "utilities/stack.inline.hpp"
56 56
57 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
58
57 elapsedTimer PSMarkSweep::_accumulated_time; 59 elapsedTimer PSMarkSweep::_accumulated_time;
58 jlong PSMarkSweep::_time_of_last_gc = 0; 60 jlong PSMarkSweep::_time_of_last_gc = 0;
59 CollectorCounters* PSMarkSweep::_counters = NULL; 61 CollectorCounters* PSMarkSweep::_counters = NULL;
60 62
61 void PSMarkSweep::initialize() { 63 void PSMarkSweep::initialize() {