aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog7
-rw-r--r--libjava/THANKS1
-rw-r--r--libjava/include/posix-threads.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 39b542a..9d6080409 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-08 Tom Tromey <tromey@cygnus.com>
+
+ * include/posix-threads.h (_Jv_PthreadCheckMonitor): Changed test
+ in __m_count case.
+
1999-09-07 Tom Tromey <tromey@cygnus.com>
* posix-threads.cc (_Jv_CondWait): pthread_ calls return error
@@ -6,7 +11,7 @@
* posix-threads.cc (_Jv_CondWait): Check `errno' against EINTR,
not `r'. Changed `done_sleeping' to a `bool'.
-1999-09-07 Matt Welsh <mdw@cs.berkeley.edu
+1999-09-07 Matt Welsh <mdw@cs.berkeley.edu>
* libjava/posix-threads.cc: Added _Jv_ThreadDataKey.
Added FLAG_INTERRUPTED to indicate that a thread was interrupted
diff --git a/libjava/THANKS b/libjava/THANKS
index 1a75a6d..f60dc8f 100644
--- a/libjava/THANKS
+++ b/libjava/THANKS
@@ -11,6 +11,7 @@ Franz Sirl Franz.Sirl-kernel@lauterbach.com
Geoff Berry gcb@gnu.org
Gilles Zunino Gilles.Zunino@hei.fr
Kresten Krab Thorup krab@gnu.org
+Matt Welsh mdw@cs.berkeley.edu
Per Bothner per@bothner.com
Rainer Orth ro@TechFak.Uni-Bielefeld.DE
Stu Grossman grossman@juniper.net
diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h
index cc8493a..00a918f 100644
--- a/libjava/include/posix-threads.h
+++ b/libjava/include/posix-threads.h
@@ -114,7 +114,7 @@ _Jv_PthreadCheckMonitor (_Jv_Mutex_t *mu)
// On Linux we exploit knowledge of the implementation.
int r = pmu->m_count == 1;
#elif defined (PTHREAD_MUTEX_HAVE___M_COUNT)
- int r = pmu->__m_count == 1;
+ int r = (pthread_t) pmu->__m_owner == pthread_self ();
#else
int r = mu->count == 0;
#endif