Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-14 20:47:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

turn on mutex deadlock checking

Browse source
This commit is contained in:
Eric House 2024-11-22 09:37:10 -08:00
parent 685aa244b6
commit edca516ecd
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/android/jni/xwjni.c
View file

@ -67,7 +67,7 @@ typedef struct _EnvThreadEntry {
} EnvThreadEntry;
struct _EnvThreadInfo {
pthread_mutex_t mtxThreads;
MutexState mtxThreads;
int nEntries;
EnvThreadEntry* entries;
MPSLOT
@ -160,7 +160,7 @@ map_thread_prv( EnvThreadInfo* ti, JNIEnv* env, const char* caller )
{
pthread_t self = pthread_self();
pthread_mutex_lock( &ti->mtxThreads );
WITH_MUTEX( &ti->mtxThreads );
XP_Bool found = false;
int nEntries = ti->nEntries;
@ -215,13 +215,13 @@ map_thread_prv( EnvThreadInfo* ti, JNIEnv* env, const char* caller )
#endif
}
pthread_mutex_unlock( &ti->mtxThreads );
END_WITH_MUTEX();
} /* map_thread_prv */
static void
map_init( MPFORMAL EnvThreadInfo* ti, JNIEnv* env )
{
pthread_mutex_init( &ti->mtxThreads, NULL );
MUTEX_INIT( &ti->mtxThreads, XP_TRUE );
MPASSIGN( ti->mpool, mpool );
MAP_THREAD( ti, env );
}
@ -232,7 +232,7 @@ map_remove_prv( EnvThreadInfo* ti, JNIEnv* env, const char* caller )
{
XP_Bool found = false;
pthread_mutex_lock( &ti->mtxThreads );
WITH_MUTEX( &ti->mtxThreads );
for ( int ii = 0; !found && ii < ti->nEntries; ++ii ) {
EnvThreadEntry* entry = &ti->entries[ii];
found = env == entry->env;
@ -258,7 +258,7 @@ map_remove_prv( EnvThreadInfo* ti, JNIEnv* env, const char* caller )
entry->owner = 0;
}
}
pthread_mutex_unlock( &ti->mtxThreads );
END_WITH_MUTEX();
if ( !found ) {
RAW_LOG( "ERROR: mapping for env %p not found when called from %s()",
@ -270,7 +270,7 @@ map_remove_prv( EnvThreadInfo* ti, JNIEnv* env, const char* caller )
static void
map_destroy( EnvThreadInfo* ti )
{
pthread_mutex_destroy( &ti->mtxThreads );
MUTEX_DESTROY( &ti->mtxThreads );
}
static JNIEnv*
@ -278,14 +278,14 @@ prvEnvForMe( EnvThreadInfo* ti )
{
JNIEnv* result = NULL;
pthread_t self = pthread_self();
pthread_mutex_lock( &ti->mtxThreads );
WITH_MUTEX( &ti->mtxThreads );
for ( int ii = 0; !result && ii < ti->nEntries; ++ii ) {
EnvThreadEntry* entry = &ti->entries[ii];
if ( self == entry->owner ) {
result = entry->env;
}
}
pthread_mutex_unlock( &ti->mtxThreads );
END_WITH_MUTEX();
if ( !result ) {
// JNI_VERSION_1_6 works, whether right or not

4
xwords4/common/xwmutex.c
View file

@ -57,7 +57,7 @@ checkListProcLocked( const DLHead* elem, void* closure )
if ( cld->currentTime > ctd->expiryTime ) {
XP_LOGFF( "FAIL: %s() on line %d in %s unable to lock mutex",
ctd->caller, ctd->lineNo, ctd->file );
XP_ASSERT(0);
// XP_ASSERT(0);
}
++cld->count;
return FEA_OK;
@ -160,7 +160,7 @@ mtx_init_prv( MutexState* mutex, XP_Bool recursive
}
# endif
mutex->waitSecs = waitSecs;
XP_LOGFF( "set waitSecs: %d (called by %s())", mutex->waitSecs, caller );
// XP_LOGFF( "set waitSecs: %d (called by %s())", mutex->waitSecs, caller );
#endif
pthread_mutex_init( &mutex->mutex, &attr );
#ifdef DEBUG

5
xwords4/common/xwmutex.h
View file

@ -56,7 +56,10 @@ void mtx_crashToTest();
# define MUTEX_INIT_CHECKED(STATE, RECURSIVE, WS) \
mtx_init_prv((STATE), (RECURSIVE), (WS), __func__)
# define MUTEX_INIT(STATE, RECURSIVE) MUTEX_INIT_CHECKED(STATE, RECURSIVE, 0)
# ifndef MUTEX_CHECK_SECS
# define MUTEX_CHECK_SECS 3
# endif
# define MUTEX_INIT(STATE, RECURSIVE) MUTEX_INIT_CHECKED(STATE, RECURSIVE, MUTEX_CHECK_SECS)
#else
# define mtx_crashToTest()
# define MUTEX_INIT(STATE, RECURSIVE) mtx_init_prv((STATE), (RECURSIVE))