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

guard server_do against reentrance

Browse source
This commit is contained in:
ehouse 2004-02-18 04:28:32 +00:00
parent da73f5ea9b
commit b0d8d0baec
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/server.c
View file

@ -112,7 +112,7 @@ struct ServerCtxt {
#endif #endif
ServerPlayer players[MAX_NUM_PLAYERS]; ServerPlayer players[MAX_NUM_PLAYERS];
XP_Bool serverDoing;
MPSLOT MPSLOT
}; };
@ -716,6 +716,11 @@ server_do( ServerCtxt* server )
XP_Bool result = XP_TRUE; XP_Bool result = XP_TRUE;
XP_Bool moreToDo = XP_FALSE; XP_Bool moreToDo = XP_FALSE;
if ( server->serverDoing ) {
return XP_FALSE;
}
server->serverDoing = XP_TRUE;
switch( server->nv.gameState ) { switch( server->nv.gameState ) {
case XWSTATE_BEGIN: case XWSTATE_BEGIN:
if ( server->nv.pendingRegistrations == 0 ) { /* all players on device */ if ( server->nv.pendingRegistrations == 0 ) { /* all players on device */
@ -776,6 +781,8 @@ server_do( ServerCtxt* server )
if ( moreToDo ) { if ( moreToDo ) {
util_requestTime( server->vol.util ); util_requestTime( server->vol.util );
} }
server->serverDoing = XP_FALSE;
return result; return result;
} /* server_do */ } /* server_do */