Mercurial > hg > truffle
comparison src/share/vm/runtime/mutex.cpp @ 7212:291ffc492eb6
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 | 5e3b6f79d280 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
24 */ | 24 */ |
25 | 25 |
26 #include "precompiled.hpp" | 26 #include "precompiled.hpp" |
27 #include "runtime/mutex.hpp" | 27 #include "runtime/mutex.hpp" |
28 #include "runtime/osThread.hpp" | 28 #include "runtime/osThread.hpp" |
29 #include "runtime/thread.inline.hpp" | |
29 #include "utilities/events.hpp" | 30 #include "utilities/events.hpp" |
30 #ifdef TARGET_OS_FAMILY_linux | 31 #ifdef TARGET_OS_FAMILY_linux |
31 # include "mutex_linux.inline.hpp" | 32 # include "mutex_linux.inline.hpp" |
32 # include "thread_linux.inline.hpp" | |
33 #endif | 33 #endif |
34 #ifdef TARGET_OS_FAMILY_solaris | 34 #ifdef TARGET_OS_FAMILY_solaris |
35 # include "mutex_solaris.inline.hpp" | 35 # include "mutex_solaris.inline.hpp" |
36 # include "thread_solaris.inline.hpp" | |
37 #endif | 36 #endif |
38 #ifdef TARGET_OS_FAMILY_windows | 37 #ifdef TARGET_OS_FAMILY_windows |
39 # include "mutex_windows.inline.hpp" | 38 # include "mutex_windows.inline.hpp" |
40 # include "thread_windows.inline.hpp" | |
41 #endif | 39 #endif |
42 #ifdef TARGET_OS_FAMILY_bsd | 40 #ifdef TARGET_OS_FAMILY_bsd |
43 # include "mutex_bsd.inline.hpp" | 41 # include "mutex_bsd.inline.hpp" |
44 # include "thread_bsd.inline.hpp" | |
45 #endif | 42 #endif |
46 | 43 |
47 // o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o | 44 // o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o |
48 // | 45 // |
49 // Native Monitor-Mutex locking - theory of operations | 46 // Native Monitor-Mutex locking - theory of operations |