diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-09-01 21:03:18 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-09-01 21:03:18 +0000 |
| commit | 45329b398e53033647ba465cacc256f32ff7daf4 (patch) | |
| tree | 03902269d263d5fdbf51b709ce65fe57c0a73bb6 /libjava/posix-threads.cc | |
| parent | 4499762c6e6403127bd8f9a1932ac64940fca20f (diff) | |
| download | gcc-45329b398e53033647ba465cacc256f32ff7daf4.zip gcc-45329b398e53033647ba465cacc256f32ff7daf4.tar.gz gcc-45329b398e53033647ba465cacc256f32ff7daf4.tar.bz2 | |
posix-threads.cc (_Jv_CondWait): Use _Jv_PthreadGetMutex.
* posix-threads.cc (_Jv_CondWait): Use _Jv_PthreadGetMutex.
* include/posix-threads.h (_Jv_Mutex_t): Define as structure,
except on Linux.
(_Jv_PthreadGetMutex): New function.
(_Jv_PthreadCheckMonitor): Use it.
(_Jv_MutexInit): Likewise. ALso, initialize `count'.
(_Jv_MutexLock): Update `count'.
(_Jv_MutexUnlock): Likewise.
(_Jv_PthreadCheckMonitor): Use Linux-specific knowledge when
appropriate.
From-SVN: r29032
Diffstat (limited to 'libjava/posix-threads.cc')
| -rw-r--r-- | libjava/posix-threads.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc index 413f7c3..9701596 100644 --- a/libjava/posix-threads.cc +++ b/libjava/posix-threads.cc @@ -79,12 +79,7 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, return 1; int r; - pthread_mutex_t *pmu; -#ifdef HAVE_RECURSIVE_MUTEX - pmu = mu; -#else - pmu = &mu->mutex2; -#endif + pthread_mutex_t *pmu = _Jv_PthreadGetMutex (mu); if (millis == 0 && nanos == 0) r = pthread_cond_wait (cv, pmu); |