Mercurial > hg > truffle
comparison src/share/vm/gc_interface/collectedHeap.inline.hpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | 59c790074993 f34d701e952e |
children | f2110083203d |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
29 #include "memory/threadLocalAllocBuffer.inline.hpp" | 29 #include "memory/threadLocalAllocBuffer.inline.hpp" |
30 #include "memory/universe.hpp" | 30 #include "memory/universe.hpp" |
31 #include "oops/arrayOop.hpp" | 31 #include "oops/arrayOop.hpp" |
32 #include "prims/jvmtiExport.hpp" | 32 #include "prims/jvmtiExport.hpp" |
33 #include "runtime/sharedRuntime.hpp" | 33 #include "runtime/sharedRuntime.hpp" |
34 #include "runtime/thread.hpp" | 34 #include "runtime/thread.inline.hpp" |
35 #include "services/lowMemoryDetector.hpp" | 35 #include "services/lowMemoryDetector.hpp" |
36 #include "utilities/copy.hpp" | 36 #include "utilities/copy.hpp" |
37 #ifdef TARGET_OS_FAMILY_linux | |
38 # include "thread_linux.inline.hpp" | |
39 #endif | |
40 #ifdef TARGET_OS_FAMILY_solaris | |
41 # include "thread_solaris.inline.hpp" | |
42 #endif | |
43 #ifdef TARGET_OS_FAMILY_windows | |
44 # include "thread_windows.inline.hpp" | |
45 #endif | |
46 #ifdef TARGET_OS_FAMILY_bsd | |
47 # include "thread_bsd.inline.hpp" | |
48 #endif | |
49 | 37 |
50 // Inline allocation implementations. | 38 // Inline allocation implementations. |
51 | 39 |
52 void CollectedHeap::post_allocation_setup_common(KlassHandle klass, | 40 void CollectedHeap::post_allocation_setup_common(KlassHandle klass, |
53 HeapWord* obj) { | 41 HeapWord* obj) { |