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

replace assert with logging

Browse source
This commit is contained in:
Eric House 2019-03-17 18:26:43 -07:00
parent 577fd3e560
commit f7444785ab
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,18 +73,25 @@ typedef struct _JNIGlobalState {
XW_DUtilCtxt* dutil; XW_DUtilCtxt* dutil;
JNIUtilCtxt* jniutil; JNIUtilCtxt* jniutil;
XP_Bool mpoolInUse; XP_Bool mpoolInUse;
const char* mpoolUser;
MPSLOT MPSLOT
} JNIGlobalState; } JNIGlobalState;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
static MemPoolCtx* static MemPoolCtx*
getMPool( JNIGlobalState* globalState ) getMPoolImpl( JNIGlobalState* globalState, const char* user )
{ {
XP_ASSERT( !globalState->mpoolInUse ); if ( globalState->mpoolInUse ) {
XP_LOGF( "%s(): mpoolInUse ALREADY SET!!!! (by %s)",
__func__, globalState->mpoolUser );
}
globalState->mpoolInUse = XP_TRUE; globalState->mpoolInUse = XP_TRUE;
globalState->mpoolUser = user;
return globalState->mpool; return globalState->mpool;
} }
#define GETMPOOL(gs) getMPoolImpl( (gs), __func__ )
static void static void
releaseMPool( JNIGlobalState* globalState ) releaseMPool( JNIGlobalState* globalState )
{ {
@ -320,7 +327,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_cleanGlobals
if ( 0 != jniGlobalPtr ) { if ( 0 != jniGlobalPtr ) {
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr; JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = getMPool( globalState ); MemPoolCtx* mpool = GETMPOOL( globalState );
#endif #endif
XP_ASSERT( ENVFORME(&globalState->ti) == env ); XP_ASSERT( ENVFORME(&globalState->ti) == env );
smsproto_free( globalState->smsProto ); smsproto_free( globalState->smsProto );
@ -583,7 +590,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_gi_1to_1stream
jbyteArray result; jbyteArray result;
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr; JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = getMPool( globalState ); MemPoolCtx* mpool = GETMPOOL( globalState );
#endif #endif
CurGameInfo* gi = makeGI( MPPARM(mpool) env, jgi ); CurGameInfo* gi = makeGI( MPPARM(mpool) env, jgi );
XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globalState->vtMgr, XWStreamCtxt* stream = mem_stream_make( MPPARM(mpool) globalState->vtMgr,
@ -604,7 +611,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_gi_1from_1stream
{ {
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr; JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = getMPool( globalState ); MemPoolCtx* mpool = GETMPOOL( globalState );
#endif #endif
XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env, XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env,
globalState->vtMgr, jstream ); globalState->vtMgr, jstream );
@ -631,7 +638,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_nli_1to_1stream
LOG_FUNC(); LOG_FUNC();
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr; JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = getMPool( globalState ); MemPoolCtx* mpool = GETMPOOL( globalState );
#endif #endif
jbyteArray result; jbyteArray result;
@ -656,7 +663,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_nli_1from_1stream
LOG_FUNC(); LOG_FUNC();
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr; JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = getMPool( globalState ); MemPoolCtx* mpool = GETMPOOL( globalState );
#endif #endif
XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env, XWStreamCtxt* stream = streamFromJStream( MPPARM(mpool) env,
globalState->vtMgr, jstream ); globalState->vtMgr, jstream );
@ -734,7 +741,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_dict_1getInfo
MAP_THREAD( &globalState->ti, env ); MAP_THREAD( &globalState->ti, env );
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = getMPool( globalState ); MemPoolCtx* mpool = GETMPOOL( globalState );
#endif #endif
DictionaryCtxt* dict = makeDict( MPPARM(mpool) env, globalState->dictMgr, DictionaryCtxt* dict = makeDict( MPPARM(mpool) env, globalState->dictMgr,