Mercurial > hg > graal-jvmci-8
comparison src/share/vm/services/lowMemoryDetector.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 | 203f64878aab |
children |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2003, 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. |
351 //-------------------------------------------------------------- | 351 //-------------------------------------------------------------- |
352 // Non-product code | 352 // Non-product code |
353 | 353 |
354 #ifndef PRODUCT | 354 #ifndef PRODUCT |
355 void SensorInfo::print() { | 355 void SensorInfo::print() { |
356 tty->print_cr("%s count = " SIZE_FORMAT " pending_triggers = %ld pending_clears = %ld", | 356 tty->print_cr("%s count = " SIZE_FORMAT " pending_triggers = %d pending_clears = %d", |
357 (_sensor_on ? "on" : "off"), | 357 (_sensor_on ? "on" : "off"), |
358 _sensor_count, _pending_trigger_count, _pending_clear_count); | 358 _sensor_count, _pending_trigger_count, _pending_clear_count); |
359 } | 359 } |
360 | 360 |
361 #endif // PRODUCT | 361 #endif // PRODUCT |