Mercurial > hg > truffle

comparison src/share/vm/runtime/java.cpp @ 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 e522a00b91aa f34d701e952e
children 3ac7d10a6572
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
55 #include "runtime/java.hpp" 55 #include "runtime/java.hpp"
56 #include "runtime/memprofiler.hpp" 56 #include "runtime/memprofiler.hpp"
57 #include "runtime/sharedRuntime.hpp" 57 #include "runtime/sharedRuntime.hpp"
58 #include "runtime/statSampler.hpp" 58 #include "runtime/statSampler.hpp"
59 #include "runtime/task.hpp" 59 #include "runtime/task.hpp"
60 #include "runtime/thread.inline.hpp"
60 #include "runtime/timer.hpp" 61 #include "runtime/timer.hpp"
61 #include "runtime/vm_operations.hpp" 62 #include "runtime/vm_operations.hpp"
62 #include "services/memReporter.hpp" 63 #include "services/memReporter.hpp"
63 #include "services/memTracker.hpp" 64 #include "services/memTracker.hpp"
64 #include "trace/tracing.hpp" 65 #include "trace/tracing.hpp"
79 #ifdef TARGET_ARCH_arm 80 #ifdef TARGET_ARCH_arm
80 # include "vm_version_arm.hpp" 81 # include "vm_version_arm.hpp"
81 #endif 82 #endif
82 #ifdef TARGET_ARCH_ppc 83 #ifdef TARGET_ARCH_ppc
83 # include "vm_version_ppc.hpp" 84 # include "vm_version_ppc.hpp"
84 #endif
85 #ifdef TARGET_OS_FAMILY_linux
86 # include "thread_linux.inline.hpp"
87 #endif
88 #ifdef TARGET_OS_FAMILY_solaris
89 # include "thread_solaris.inline.hpp"
90 #endif
91 #ifdef TARGET_OS_FAMILY_windows
92 # include "thread_windows.inline.hpp"
93 #endif
94 #ifdef TARGET_OS_FAMILY_bsd
95 # include "thread_bsd.inline.hpp"
96 #endif 85 #endif
97 #ifndef SERIALGC 86 #ifndef SERIALGC
98 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" 87 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
99 #include "gc_implementation/parallelScavenge/psScavenge.hpp" 88 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
100 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" 89 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"