comparison src/share/vm/runtime/fprofiler.hpp @ 7182:c24f778e9401

Merge
author johnc
date Thu, 29 Nov 2012 11:23:15 -0800
parents f34d701e952e
children db9981fd3124
comparison
equal deleted inserted replaced
7176:59c790074993 7182:c24f778e9401
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