Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/timer.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 4ca6dc0799b6 78bbf4d43a14 |
children |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2013, 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. |
32 #ifdef TARGET_OS_FAMILY_solaris | 32 #ifdef TARGET_OS_FAMILY_solaris |
33 # include "os_solaris.inline.hpp" | 33 # include "os_solaris.inline.hpp" |
34 #endif | 34 #endif |
35 #ifdef TARGET_OS_FAMILY_windows | 35 #ifdef TARGET_OS_FAMILY_windows |
36 # include "os_windows.inline.hpp" | 36 # include "os_windows.inline.hpp" |
37 #endif | |
38 #ifdef TARGET_OS_FAMILY_aix | |
39 # include "os_aix.inline.hpp" | |
37 #endif | 40 #endif |
38 #ifdef TARGET_OS_FAMILY_bsd | 41 #ifdef TARGET_OS_FAMILY_bsd |
39 # include "os_bsd.inline.hpp" | 42 # include "os_bsd.inline.hpp" |
40 #endif | 43 #endif |
41 | 44 |
215 } | 218 } |
216 } else { | 219 } else { |
217 _logfile->print("[Error in TraceCPUTime]"); | 220 _logfile->print("[Error in TraceCPUTime]"); |
218 } | 221 } |
219 if (_print_cr) { | 222 if (_print_cr) { |
220 _logfile->print_cr(""); | 223 _logfile->cr(); |
221 } | 224 } |
222 _logfile->flush(); | 225 _logfile->flush(); |
223 } | 226 } |
224 } | 227 } |