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

Delay shutdown up to 3s to let player output buffers drain

Browse source
This commit is contained in:
Markus Armbruster 2009-06-19 10:18:37 +02:00
parent f5885865da
commit 1e1dfc860a
1 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/server/main.c
View file

@ -410,6 +410,8 @@ void
shutdwn(int sig)
{
struct player *p;
time_t now;
int i, queues_drained;
logerror("Shutdown commencing (cleaning up threads.)");
@ -426,6 +428,26 @@ shutdwn(int sig)
empth_wakeup(p->proc);
}
empth_rwlock_wrlock(play_lock);
now = time(NULL);
empth_yield();
for (i = 1; i <= 3; i++) {
queues_drained = 1;
for (p = player_next(NULL); p; p = player_next(p)) {
if (io_outputwaiting(p->iop))
queues_drained = 0;
}
if (queues_drained)
break;
logerror("Waiting for player output to drain\n");
empth_sleep(now + i);
}
for (p = player_next(NULL); p; p = player_next(p)) {
if (io_outputwaiting(p->iop))
logerror("Output for player %d lost", p->cnum);
}
if (sig)
logerror("Server shutting down on signal %d", sig);
else