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

Base idle timeout on player->curup again, not current time

Browse source 
Idle timeout used to expire max_idle minutes after the last
player->curup update.  When we got rid of the idle thread in commit
08b94556 (v4.3.20), this got changed to "wait no more than max_idle
minutes for input".  Time spent computing and time spent blocked on
output no longer counts.  In particular, a connection can block
indefinitely on output since then.  Let's fix that.

Start with basing the input timeout on player->curup again.  The
missing output timeout will be added shortly.

Aside: since status() updates player->curup, the idle timer gets reset
when the update aborts a command.  Left for another day.
This commit is contained in:
Markus Armbruster 2012-03-10 13:51:39 +01:00
parent a96b400da3
commit ed1cbc97e6
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/player/accept.c
View file

@ -100,8 +100,7 @@ player_delete(struct player *lp)
if (lp->iop) {
/* it's a real player */
timeout.tv_sec = minutes(max_idle);
timeout.tv_usec = 0;
io_timeout(&timeout, player->curup + minutes(max_idle));
io_close(lp->iop, &timeout);
lp->iop = NULL;
}