Mercurial > hg > truffle

comparison src/share/vm/runtime/fprofiler.hpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents f34d701e952e
children db9981fd3124
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
24 24
25 #ifndef SHARE_VM_RUNTIME_FPROFILER_HPP 25 #ifndef SHARE_VM_RUNTIME_FPROFILER_HPP
26 #define SHARE_VM_RUNTIME_FPROFILER_HPP 26 #define SHARE_VM_RUNTIME_FPROFILER_HPP
27 27
28 #include "runtime/timer.hpp" 28 #include "runtime/timer.hpp"
29 #ifdef TARGET_OS_FAMILY_linux
30 # include "thread_linux.inline.hpp"
31 #endif
32 #ifdef TARGET_OS_FAMILY_solaris
33 # include "thread_solaris.inline.hpp"
34 #endif
35 #ifdef TARGET_OS_FAMILY_windows
36 # include "thread_windows.inline.hpp"
37 #endif
38 #ifdef TARGET_OS_FAMILY_bsd
39 # include "thread_bsd.inline.hpp"
40 #endif
41 29
42 // a simple flat profiler for Java 30 // a simple flat profiler for Java
43 31
44 32
45 // Forward declaration of classes defined in this header file 33 // Forward declaration of classes defined in this header file