FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re GNATS libgcj/117 (_Jv_PthreadCheckMonitor test is not portable.)

Browse source 
* include/posix-threads.h (_Jv_PthreadCheckMonitor): Handle case
	where no recursive mutexes exist.  Fixes PR libgcj/117.

From-SVN: r30847
This commit is contained in:
Tom Tromey 1999-12-09 16:57:27 +00:00 • committed by Tom Tromey
parent 47841d1be3
commit c97e511d31
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
1999-12-08 Tom Tromey <tromey@cygnus.com>
* include/posix-threads.h (_Jv_PthreadCheckMonitor): Handle case
where no recursive mutexes exist. Fixes PR libgcj/117.
1999-12-05 Anthony Green <green@cygnus.com> 1999-12-05 Anthony Green <green@cygnus.com>
* include/jvm.h: Declare many functions with * include/jvm.h: Declare many functions with

19
libjava/include/posix-threads.h
View file

@ -99,14 +99,18 @@ _Jv_PthreadGetMutex (_Jv_Mutex_t *mu)
// This is a convenience function used only by the pthreads thread // This is a convenience function used only by the pthreads thread
// implementation. This is slow, but that's too bad -- we need to do // implementation. This is slow, but that's too bad -- we need to do
// the checks for correctness. It might be nice to be able to compile // the checks for correctness. It might be nice to be able to compile
// this out. // this out. Returns 0 if the lock is held by the current thread, and
// 1 otherwise.
inline int inline int
_Jv_PthreadCheckMonitor (_Jv_Mutex_t *mu) _Jv_PthreadCheckMonitor (_Jv_Mutex_t *mu)
{ {
pthread_mutex_t *pmu = _Jv_PthreadGetMutex (mu); pthread_mutex_t *pmu;
#ifdef HAVE_RECURSIVE_MUTEX
pmu = _Jv_PthreadGetMutex (mu);
// See if the mutex is locked by this thread. // See if the mutex is locked by this thread.
if (pthread_mutex_trylock (pmu)) if (pthread_mutex_trylock (pmu))
return 1; return 1;
#if defined (PTHREAD_MUTEX_HAVE_M_COUNT) #if defined (PTHREAD_MUTEX_HAVE_M_COUNT)
// On Linux we exploit knowledge of the implementation. // On Linux we exploit knowledge of the implementation.
int r = pmu->m_count == 1; int r = pmu->m_count == 1;
@ -117,6 +121,17 @@ _Jv_PthreadCheckMonitor (_Jv_Mutex_t *mu)
#else #else
int r = mu->count == 0; int r = mu->count == 0;
#endif #endif
#else /* HAVE_RECURSIVE_MUTEX */
// In this case we must lock our structure and then see if this
// thread owns the mutex.
pmu = &mu->mutex;
if (pthread_mutex_lock (pmu))
return 1;
int r = mu->thread != pthread_self () || mu->count == 0;
#endif /* HAVE_RECURSIVE_MUTEX */
pthread_mutex_unlock (pmu); pthread_mutex_unlock (pmu);
return r; return r;
} }