Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

protect refcount operations with mutex

Browse source
This commit is contained in:
Eric House 2014-03-11 22:01:11 -07:00
parent 4231ed1108
commit d1a9b716bb
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/common/dictnry.c
View file

@ -47,9 +47,11 @@ p_dict_ref( DictionaryCtxt* dict
)
{
if ( !!dict ) {
pthread_mutex_lock( &dict->mutex );
++dict->refCount;
XP_LOGF( "%s(dict=%p): refCount now %d (from line %d of %s() in %s)",
__func__, dict, dict->refCount, line, func, file );
pthread_mutex_unlock( &dict->mutex );
}
return dict;
}
@ -62,12 +64,15 @@ p_dict_unref( DictionaryCtxt* dict
)
{
if ( !!dict ) {
pthread_mutex_lock( &dict->mutex );
--dict->refCount;
XP_ASSERT( 0 <= dict->refCount );
XP_LOGF( "%s(dict=%p): refCount now %d (from line %d of %s() in %s)",
__func__, dict, dict->refCount, line, func, file );
pthread_mutex_unlock( &dict->mutex );
if ( 0 == dict->refCount ) {
(*dict->destructor)( dict );
pthread_mutex_destroy( &dict->mutex );
}
}
}
@ -776,6 +781,8 @@ dict_super_init( DictionaryCtxt* dict )
dict->func_dict_follow = dict_super_follow;
dict->func_dict_edge_with_tile = dict_super_edge_with_tile;
dict->func_dict_getShortName = dict_getName;
pthread_mutex_init( &dict->mutex, NULL );
} /* dict_super_init */
const XP_UCHAR*

2
xwords4/common/dictnry.h
View file

@ -72,6 +72,8 @@ struct DictionaryCtxt {
array_edge* from, Tile tile );
const XP_UCHAR* (*func_dict_getShortName)( const DictionaryCtxt* dict );
pthread_mutex_t mutex;
array_edge* topEdge;
array_edge* base; /* the physical beginning of the dictionary; not
necessarily the entry point for search!! */