Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

wrap hash-related logging in ifdefs so can be easily turned on

Browse source
This commit is contained in:
Eric House 2015-12-29 19:00:30 -08:00
parent e3d6cb74fc
commit c96861b329
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
xwords4/common/movestak.c
View file

@ -1,6 +1,6 @@
/* -*- compile-command: "cd ../linux && make -j3 MEMDEBUG=TRUE"; -*- */
/* -*- compile-command: "cd ../linux && make -j5 MEMDEBUG=TRUE"; -*- */
/*
* Copyright 2001, 2006-2012 by Eric House (xwords@eehouse.org). All rights
* Copyright 2001-2015 by Eric House (xwords@eehouse.org). All rights
* reserved.
*
* This program is free software; you can redistribute it and/or
@ -78,7 +78,9 @@ augmentHash( XP_U32 hash, const XP_U8* ptr, XP_U16 len )
hash += (hash << 10);
hash ^= (hash >> 6);
}
// XP_LOGF( "%s: hashed %d bytes -> %X", __func__, len, (unsigned int)hash );
#ifdef DEBUG_HASHING
XP_LOGF( "%s: hashed %d bytes -> %X", __func__, len, (unsigned int)hash );
#endif
return hash;
}
@ -129,11 +131,15 @@ stack_getHashOld( StackCtxt* stack )
XP_ASSERT( 0 );
}
hash = augmentFor( hash, &entry );
// XP_LOGF( "hash after %d: %.8X", nn, (unsigned int)hash );
#ifdef DEBUG_HASHING
XP_LOGF( "%s: hash after %d: %.8X", __func__, nn, (unsigned int)hash );
#endif
}
XP_ASSERT( 0 != hash );
hash = finishHash( hash );
#ifdef DEBUG_HASHING
LOG_RETURNF( "%.8X", (unsigned int)hash );
#endif
return hash;
} /* stack_getHashOld */
@ -146,9 +152,13 @@ stack_getHash( const StackCtxt* stack )
stream_copyBits( stack->data, 0, stack->top, NULL, &len );
XP_U8 buf[len];
stream_copyBits( stack->data, 0, stack->top, buf, &len );
// LOG_HEX( buf, len, __func__ );
#ifdef DEBUG_HASHING
LOG_HEX( buf, len, __func__ );
#endif
hash = finishHash( augmentHash( 0L, buf, len ) );
// LOG_RETURNF( "%.8X", (unsigned int)hash );
#ifdef DEBUG_HASHING
LOG_RETURNF( "%.8X", (unsigned int)hash );
#endif
return hash;
} /* stack_getHash */
#endif
@ -308,7 +318,9 @@ pushEntry( StackCtxt* stack, const StackEntry* entry )
++stack->nEntries;
stack->highWaterMark = stack->nEntries;
stack->top = stream_setPos( stream, POS_WRITE, oldLoc );
// XP_LOGSTREAM( stack->data );
#ifdef DEBUG_HASHING
XP_LOGSTREAM( stack->data );
#endif
SET_DIRTY( stack );
} /* pushEntry */
@ -482,7 +494,9 @@ stack_popEntry( StackCtxt* stack, StackEntry* entry )
setCacheReadyFor( stack, nn ); /* set cachedPos by side-effect */
stack->top = stack->cachedPos;
}
// XP_LOGSTREAM( stack->data );
#ifdef DEBUG_HASHING
XP_LOGSTREAM( stack->data );
#endif
return found;
} /* stack_popEntry */

4
xwords4/common/server.c
View file

@ -2033,7 +2033,9 @@ sendMoveTo( ServerCtxt* server, XP_U16 devIndex, XP_U16 turn,
if ( STREAM_VERS_BIGBOARD <= version ) {
XP_ASSERT( version == server->nv.streamVersion );
XP_U32 hash = model_getHash( server->vol.model, version );
// XP_LOGF( "%s: adding hash %x", __func__, (unsigned int)hash );
#ifdef DEBUG_HASHING
XP_LOGF( "%s: adding hash %x", __func__, (unsigned int)hash );
#endif
stream_putU32( stream, hash );
}
#endif