mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-02-15 08:47:56 +01:00
add XP_RAW_LOGFF (but don't use it)
This commit is contained in:
parent
0388b94f51
commit
ed8e007415
4 changed files with 8 additions and 2 deletions
|
@ -99,6 +99,7 @@ void android_gid_debugff(XP_U32 gid, const char* func, const char* file, int lin
|
||||||
#define XP_DEBUGF(...) android_debugf( __VA_ARGS__ )
|
#define XP_DEBUGF(...) android_debugf( __VA_ARGS__ )
|
||||||
#define XP_LOGF(...) android_debugf( __VA_ARGS__ )
|
#define XP_LOGF(...) android_debugf( __VA_ARGS__ )
|
||||||
#define XP_LOGFF(...) android_debugff( __func__, __FILE__, __LINE__, __VA_ARGS__ )
|
#define XP_LOGFF(...) android_debugff( __func__, __FILE__, __LINE__, __VA_ARGS__ )
|
||||||
|
#define XP_RAW_LOGFF(...) raw_log( __func__, __VA_ARGS__ )
|
||||||
#define XP_GID_LOGFF( GID, ... ) \
|
#define XP_GID_LOGFF( GID, ... ) \
|
||||||
android_gid_debugff( (GID), __func__, __FILE__, __LINE__, __VA_ARGS__ )
|
android_gid_debugff( (GID), __func__, __FILE__, __LINE__, __VA_ARGS__ )
|
||||||
|
|
||||||
|
@ -109,6 +110,7 @@ void android_gid_debugff(XP_U32 gid, const char* func, const char* file, int lin
|
||||||
#define XP_LOGFF(...)
|
#define XP_LOGFF(...)
|
||||||
#define XP_GID_LOGFF( GID, FMT, ... )
|
#define XP_GID_LOGFF( GID, FMT, ... )
|
||||||
#define XP_WARNF(...)
|
#define XP_WARNF(...)
|
||||||
|
#define XP_RAW_LOGFF(...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
XP_U32 and_ntohl(XP_U32 l);
|
XP_U32 and_ntohl(XP_U32 l);
|
||||||
|
|
|
@ -420,7 +420,7 @@ JNIEXPORT void JNICALL
|
||||||
Java_org_eehouse_android_xw4_jni_XwJNI_cleanGlobals
|
Java_org_eehouse_android_xw4_jni_XwJNI_cleanGlobals
|
||||||
( JNIEnv* env, jclass C, jlong jniGlobalPtr )
|
( JNIEnv* env, jclass C, jlong jniGlobalPtr )
|
||||||
{
|
{
|
||||||
// LOG_FUNC();
|
// XP_LOGFF( "(jniGlobalPtr: %p)", jniGlobalPtr );
|
||||||
if ( 0 != jniGlobalPtr ) {
|
if ( 0 != jniGlobalPtr ) {
|
||||||
setGlobalState( env, NULL );
|
setGlobalState( env, NULL );
|
||||||
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
|
JNIGlobalState* globalState = (JNIGlobalState*)jniGlobalPtr;
|
||||||
|
|
|
@ -105,6 +105,7 @@ void
|
||||||
mtx_lock_prv( MutexState* state, XP_U16 waitSecs,
|
mtx_lock_prv( MutexState* state, XP_U16 waitSecs,
|
||||||
const char* file, const char* caller, int lineNo )
|
const char* file, const char* caller, int lineNo )
|
||||||
{
|
{
|
||||||
|
// XP_RAW_LOGFF( "(waitSecs=%d)", waitSecs );
|
||||||
if ( 0 == waitSecs ) {
|
if ( 0 == waitSecs ) {
|
||||||
waitSecs = state->waitSecs;
|
waitSecs = state->waitSecs;
|
||||||
}
|
}
|
||||||
|
@ -123,6 +124,7 @@ mtx_lock_prv( MutexState* state, XP_U16 waitSecs,
|
||||||
if ( 0 < waitSecs ) {
|
if ( 0 < waitSecs ) {
|
||||||
removeCheckee( &ctd );
|
removeCheckee( &ctd );
|
||||||
}
|
}
|
||||||
|
// XP_RAW_LOGFF( "DONE" );
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -92,12 +92,14 @@ extern void linux_debugff(const char* func, const char* file, int line, const ch
|
||||||
linux_debugff( __func__, SHORTFILE, __LINE__, FMT, ##__VA_ARGS__ )
|
linux_debugff( __func__, SHORTFILE, __LINE__, FMT, ##__VA_ARGS__ )
|
||||||
#define XP_LOG(STR) \
|
#define XP_LOG(STR) \
|
||||||
linux_debugff( __func__, SHORTFILE, "%s", STR )
|
linux_debugff( __func__, SHORTFILE, "%s", STR )
|
||||||
|
#define XP_RAW_LOGFF XP_LOGFF
|
||||||
|
|
||||||
#else
|
#else
|
||||||
# define XP_DEBUGF(ch,...)
|
# define XP_DEBUGF(ch,...)
|
||||||
# define XP_LOGFF(fmt,...)
|
# define XP_LOGFF(fmt,...)
|
||||||
# define XP_LOG(fmt)
|
# define XP_LOG(fmt)
|
||||||
#endif
|
#define XP_RAW_LOGFF(...)
|
||||||
|
#endif /* #ifdef DEBUG */
|
||||||
|
|
||||||
#define XP_WARNF XP_DEBUGF
|
#define XP_WARNF XP_DEBUGF
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue