Mercurial > hg > truffle
diff src/share/vm/utilities/globalDefinitions.hpp @ 6059:3a22b77e755a
7161545: G1: Minor cleanups to the G1 logging
Summary: Rename "to-space-overflow" to "to-space-exhausted", Introduce one decimal point in the size format, Add Sum to the aggregate and re-order the entries, Add number of GC workers to the log output
Reviewed-by: johnc, jwilhelm
| author | brutisso |
|---|---|
| date | Mon, 14 May 2012 17:32:17 +0200 |
| parents | 94ec88ca68e2 |
| children | cdfa5139bd58 |
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.hpp Fri May 11 14:54:35 2012 -0700 +++ b/src/share/vm/utilities/globalDefinitions.hpp Mon May 14 17:32:17 2012 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -188,17 +188,17 @@ } } -inline size_t byte_size_in_proper_unit(size_t s) { +template <class T> +inline T byte_size_in_proper_unit(T s) { if (s >= 10*M) { - return s/M; + return (T)(s/M); } else if (s >= 10*K) { - return s/K; + return (T)(s/K); } else { return s; } } - //---------------------------------------------------------------------------------------------------- // VM type definitions