diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-11-28 05:29:25 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-11-28 05:29:25 +0000 |
| commit | 3ea68048cd4dc285a72963510e6a54bdab89406e (patch) | |
| tree | bd7bf979445e6bcb7864c6fd16bf8e4d841c827a /java/jdk13/files/patch-os_linux.hpp | |
| parent | Remove ports/print/acroread. (diff) | |
. 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.
Notes
Notes:
svn path=/head/; revision=122645
Diffstat (limited to 'java/jdk13/files/patch-os_linux.hpp')
| -rw-r--r-- | java/jdk13/files/patch-os_linux.hpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/java/jdk13/files/patch-os_linux.hpp b/java/jdk13/files/patch-os_linux.hpp new file mode 100644 index 000000000000..f21e6129b5a2 --- /dev/null +++ b/java/jdk13/files/patch-os_linux.hpp @@ -0,0 +1,22 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 5 Jun 2002 05:27:47 -0000 1.4 ++++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 22 Nov 2004 17:19:42 -0000 +@@ -186,7 +186,7 @@ + bool trylock() { + verify(); + int status = os::Solaris::mutex_trylock(_mutex); +- if (status == EBUSY) ++ if (status == EBUSY || status == EDEADLK) + return false; + assert(status == 0, "mutex_lock"); + return true; +@@ -348,7 +348,7 @@ + bool trylock() { + verify(); + int status = os::Solaris::mutex_trylock(_mutex); +- if (status == EBUSY) ++ if (status == EBUSY || status == EDEADLK) + return false; + assert(status == 0, "mutex_trylock"); + return true; |