Mercurial > hg > graal-jvmci-8
comparison src/share/vm/memory/universe.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | 59c790074993 f34d701e952e |
children | 5fafdef522c6 |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
60 #include "runtime/init.hpp" | 60 #include "runtime/init.hpp" |
61 #include "runtime/java.hpp" | 61 #include "runtime/java.hpp" |
62 #include "runtime/javaCalls.hpp" | 62 #include "runtime/javaCalls.hpp" |
63 #include "runtime/sharedRuntime.hpp" | 63 #include "runtime/sharedRuntime.hpp" |
64 #include "runtime/synchronizer.hpp" | 64 #include "runtime/synchronizer.hpp" |
65 #include "runtime/thread.inline.hpp" | |
65 #include "runtime/timer.hpp" | 66 #include "runtime/timer.hpp" |
66 #include "runtime/vm_operations.hpp" | 67 #include "runtime/vm_operations.hpp" |
67 #include "services/memoryService.hpp" | 68 #include "services/memoryService.hpp" |
68 #include "utilities/copy.hpp" | 69 #include "utilities/copy.hpp" |
69 #include "utilities/events.hpp" | 70 #include "utilities/events.hpp" |
70 #include "utilities/hashtable.inline.hpp" | 71 #include "utilities/hashtable.inline.hpp" |
71 #include "utilities/preserveException.hpp" | 72 #include "utilities/preserveException.hpp" |
72 #ifdef TARGET_OS_FAMILY_linux | |
73 # include "thread_linux.inline.hpp" | |
74 #endif | |
75 #ifdef TARGET_OS_FAMILY_solaris | |
76 # include "thread_solaris.inline.hpp" | |
77 #endif | |
78 #ifdef TARGET_OS_FAMILY_windows | |
79 # include "thread_windows.inline.hpp" | |
80 #endif | |
81 #ifdef TARGET_OS_FAMILY_bsd | |
82 # include "thread_bsd.inline.hpp" | |
83 #endif | |
84 #ifndef SERIALGC | 73 #ifndef SERIALGC |
85 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" | 74 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" |
86 #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp" | 75 #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp" |
87 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" | 76 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" |
88 #include "gc_implementation/g1/g1CollectorPolicy.hpp" | 77 #include "gc_implementation/g1/g1CollectorPolicy.hpp" |