From 5c7e97c522a85cbc321a55f229acd5497ae3cd2a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 7 Jun 2006 21:45:46 +0000 Subject: [PATCH] (shutdwn): No longer a signal handler, no need to avoid sleeping. This lets player threads send C_EXIT properly even when the server shuts down on a signal. --- src/server/main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/server/main.c b/src/server/main.c index 1b571341..56bd3517 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -374,14 +374,8 @@ shutdwn(int sig) empth_wakeup(p->proc); } - if (!sig) { - /* Sleep and let some cleanup happen - note this doesn't work - when called from a signal handler, since we may or may not - be in the right thread. So we just pass by and kill 'em - all. */ - time(&now); - empth_sleep(now + 1); - } + time(&now); + empth_sleep(now + 1); for (p = player_next(0); p != 0; p = player_next(p)) { p->state = PS_KILL;