1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
freebsd-ports/java/jdk13/files/patch-os_bsd.hpp
Greg Lewis 3ea68048cd . Make sure that all calls to pthread_mutex_trylock handle EDEADLK as well
as EBUSY.

  These are taken from equivalent patches to jdk14 by green and myself.
2004-11-28 05:29:25 +00:00

23 lines
718 B
C++

$FreeBSD$
--- ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp 16 Jan 2002 18:46:39 -0000 1.2
+++ ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp 22 Nov 2004 17:19:42 -0000
@@ -186,7 +186,7 @@
bool trylock() {
verify();
int status = pthread_mutex_trylock(_mutex);
- if (status == EBUSY)
+ if (status == EBUSY || status = EDEADLK)
return false;
assert(status == 0, "pthread_mutex_lock");
#ifndef PRODUCT
@@ -349,7 +349,7 @@
bool trylock() {
verify();
int status = pthread_mutex_trylock(_mutex);
- if (status == EBUSY)
+ if (status == EBUSY || status = EDEADLK)
return false;
assert(status == 0, "pthread_mutex_trylock");
#ifndef PRODUCT