Mercurial > hg > truffle
comparison src/share/vm/utilities/events.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 | f34d701e952e |
children | f73af4455d7d |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 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. |
80 if (LogEvents) { | 80 if (LogEvents) { |
81 va_list ap; | 81 va_list ap; |
82 va_start(ap, format); | 82 va_start(ap, format); |
83 // Save a copy of begin message and log it. | 83 // Save a copy of begin message and log it. |
84 _buffer.printv(format, ap); | 84 _buffer.printv(format, ap); |
85 Events::log(NULL, _buffer); | 85 Events::log(NULL, "%s", _buffer.buffer()); |
86 va_end(ap); | 86 va_end(ap); |
87 } | 87 } |
88 } | 88 } |
89 | 89 |
90 EventMark::~EventMark() { | 90 EventMark::~EventMark() { |
91 if (LogEvents) { | 91 if (LogEvents) { |
92 // Append " done" to the begin message and log it | 92 // Append " done" to the begin message and log it |
93 _buffer.append(" done"); | 93 _buffer.append(" done"); |
94 Events::log(NULL, _buffer); | 94 Events::log(NULL, "%s", _buffer.buffer()); |
95 } | 95 } |
96 } | 96 } |