Thu, 22 May 2014 15:52:41 -0400
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
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | * |
aoqi@0 | 23 | */ |
aoqi@0 | 24 | |
aoqi@0 | 25 | #include "precompiled.hpp" |
aoqi@0 | 26 | #include "runtime/os.hpp" |
aoqi@0 | 27 | #include "utilities/ticks.inline.hpp" |
aoqi@0 | 28 | |
aoqi@0 | 29 | #ifdef ASSERT |
aoqi@0 | 30 | const jlong Ticks::invalid_time_stamp = -2; // 0xFFFF FFFF`FFFF FFFE |
aoqi@0 | 31 | #endif |
aoqi@0 | 32 | |
aoqi@0 | 33 | void Ticks::stamp() { |
aoqi@0 | 34 | _stamp_ticks = os::elapsed_counter(); |
aoqi@0 | 35 | } |
aoqi@0 | 36 | |
aoqi@0 | 37 | const Ticks Ticks::now() { |
aoqi@0 | 38 | Ticks t; |
aoqi@0 | 39 | t.stamp(); |
aoqi@0 | 40 | return t; |
aoqi@0 | 41 | } |
aoqi@0 | 42 | |
aoqi@0 | 43 | Tickspan::Tickspan(const Ticks& end, const Ticks& start) { |
aoqi@0 | 44 | assert(end.value() != Ticks::invalid_time_stamp, "end is unstamped!"); |
aoqi@0 | 45 | assert(start.value() != Ticks::invalid_time_stamp, "start is unstamped!"); |
aoqi@0 | 46 | |
aoqi@0 | 47 | assert(end >= start, "negative time!"); |
aoqi@0 | 48 | |
aoqi@0 | 49 | _span_ticks = end.value() - start.value(); |
aoqi@0 | 50 | } |
aoqi@0 | 51 | |
aoqi@0 | 52 | template <typename ReturnType> |
aoqi@0 | 53 | static ReturnType time_conversion(const Tickspan& span, TicksToTimeHelper::Unit unit) { |
aoqi@0 | 54 | assert(TicksToTimeHelper::SECONDS == unit || |
aoqi@0 | 55 | TicksToTimeHelper::MILLISECONDS == unit, "invalid unit!"); |
aoqi@0 | 56 | |
aoqi@0 | 57 | ReturnType frequency_per_unit = (ReturnType)os::elapsed_frequency() / (ReturnType)unit; |
aoqi@0 | 58 | |
aoqi@0 | 59 | return (ReturnType) ((ReturnType)span.value() / frequency_per_unit); |
aoqi@0 | 60 | } |
aoqi@0 | 61 | |
aoqi@0 | 62 | double TicksToTimeHelper::seconds(const Tickspan& span) { |
aoqi@0 | 63 | return time_conversion<double>(span, SECONDS); |
aoqi@0 | 64 | } |
aoqi@0 | 65 | |
aoqi@0 | 66 | jlong TicksToTimeHelper::milliseconds(const Tickspan& span) { |
aoqi@0 | 67 | return time_conversion<jlong>(span, MILLISECONDS); |
aoqi@0 | 68 | } |