empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up how recvclient() deals with command abortion

Browse source 
We must not block in io_input() after command abortion unblocked
io_output().  Instead of checking player->aborted, compute the
deadline according to player->may_sleep, like we do for io_output().
This commit is contained in:
Markus Armbruster 2012-03-11 12:32:17 +01:00
parent 1dd44b7eea
commit 7cca82578d
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/player/recvclient.c
View file

@ -87,13 +87,14 @@ recvclient(char *cmd, int size)
;
/*
* If io_output() blocked and got unblocked by command
* abortion, we must return without blocking in io_input().
* Try to receive some input. Need to check player->may_sleep
* again; command abortion during io_output() might have
* changed it.
*/
if (player->aborted)
break;
res = io_input(player->iop, player->curup + minutes(max_idle));
deadline = player->curup + minutes(max_idle);
if (player->may_sleep < PLAYER_SLEEP_ON_INPUT)
deadline = 0;
res = io_input(player->iop, deadline);
if (res > 0)
;
else if (res < 0)