comparison src/share/vm/runtime/mutex.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 78bbf4d43a14
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 1
2 /* 2 /*
3 * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 3 * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 * 5 *
6 * This code is free software; you can redistribute it and/or modify it 6 * This code is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License version 2 only, as 7 * under the terms of the GNU General Public License version 2 only, as
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
38 # include "mutex_windows.inline.hpp" 38 # include "mutex_windows.inline.hpp"
39 #endif 39 #endif
40 #ifdef TARGET_OS_FAMILY_bsd 40 #ifdef TARGET_OS_FAMILY_bsd
41 # include "mutex_bsd.inline.hpp" 41 # include "mutex_bsd.inline.hpp"
42 #endif 42 #endif
43
44 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
43 45
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 46 // 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
45 // 47 //
46 // Native Monitor-Mutex locking - theory of operations 48 // Native Monitor-Mutex locking - theory of operations
47 // 49 //