Mercurial > hg > truffle

comparison src/share/vm/runtime/objectMonitor.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 f34d701e952e
children 22ba8c8ce6a6
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
32 #include "runtime/mutexLocker.hpp" 32 #include "runtime/mutexLocker.hpp"
33 #include "runtime/objectMonitor.hpp" 33 #include "runtime/objectMonitor.hpp"
34 #include "runtime/objectMonitor.inline.hpp" 34 #include "runtime/objectMonitor.inline.hpp"
35 #include "runtime/osThread.hpp" 35 #include "runtime/osThread.hpp"
36 #include "runtime/stubRoutines.hpp" 36 #include "runtime/stubRoutines.hpp"
37 #include "runtime/thread.hpp" 37 #include "runtime/thread.inline.hpp"
38 #include "services/threadService.hpp" 38 #include "services/threadService.hpp"
39 #include "utilities/dtrace.hpp" 39 #include "utilities/dtrace.hpp"
40 #include "utilities/preserveException.hpp" 40 #include "utilities/preserveException.hpp"
41 #ifdef TARGET_OS_FAMILY_linux 41 #ifdef TARGET_OS_FAMILY_linux
42 # include "os_linux.inline.hpp" 42 # include "os_linux.inline.hpp"
43 # include "thread_linux.inline.hpp"
44 #endif 43 #endif
45 #ifdef TARGET_OS_FAMILY_solaris 44 #ifdef TARGET_OS_FAMILY_solaris
46 # include "os_solaris.inline.hpp" 45 # include "os_solaris.inline.hpp"
47 # include "thread_solaris.inline.hpp"
48 #endif 46 #endif
49 #ifdef TARGET_OS_FAMILY_windows 47 #ifdef TARGET_OS_FAMILY_windows
50 # include "os_windows.inline.hpp" 48 # include "os_windows.inline.hpp"
51 # include "thread_windows.inline.hpp"
52 #endif 49 #endif
53 #ifdef TARGET_OS_FAMILY_bsd 50 #ifdef TARGET_OS_FAMILY_bsd
54 # include "os_bsd.inline.hpp" 51 # include "os_bsd.inline.hpp"
55 # include "thread_bsd.inline.hpp"
56 #endif 52 #endif
57 53
58 #if defined(__GNUC__) && !defined(IA64) 54 #if defined(__GNUC__) && !defined(IA64)
59 // Need to inhibit inlining for older versions of GCC to avoid build-time failures 55 // Need to inhibit inlining for older versions of GCC to avoid build-time failures
60 #define ATTR __attribute__((noinline)) 56 #define ATTR __attribute__((noinline))