Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/memprofiler.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | f34d701e952e |
children |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
33 #include "runtime/jniHandles.hpp" | 33 #include "runtime/jniHandles.hpp" |
34 #include "runtime/memprofiler.hpp" | 34 #include "runtime/memprofiler.hpp" |
35 #include "runtime/mutexLocker.hpp" | 35 #include "runtime/mutexLocker.hpp" |
36 #include "runtime/os.hpp" | 36 #include "runtime/os.hpp" |
37 #include "runtime/task.hpp" | 37 #include "runtime/task.hpp" |
38 #include "runtime/thread.inline.hpp" | |
38 #include "runtime/vmThread.hpp" | 39 #include "runtime/vmThread.hpp" |
39 #ifdef TARGET_OS_FAMILY_linux | |
40 # include "thread_linux.inline.hpp" | |
41 #endif | |
42 #ifdef TARGET_OS_FAMILY_solaris | |
43 # include "thread_solaris.inline.hpp" | |
44 #endif | |
45 #ifdef TARGET_OS_FAMILY_windows | |
46 # include "thread_windows.inline.hpp" | |
47 #endif | |
48 #ifdef TARGET_OS_FAMILY_bsd | |
49 # include "thread_bsd.inline.hpp" | |
50 #endif | |
51 | 40 |
52 #ifndef PRODUCT | 41 #ifndef PRODUCT |
53 | 42 |
54 // -------------------------------------------------------- | 43 // -------------------------------------------------------- |
55 // MemProfilerTask | 44 // MemProfilerTask |