Markus Armbruster
49ae6a7b9d
shutdwn() sets the EOF indicator, aborts the running command, if any, forbids sleeping on I/O and wakes up the player thread, for all player threads in state PS_PLAYING. It takes play_lock to prevent new commands from running. It then waits up to 3s for player threads to terminate, by polling player_next(), to let output buffers drain. Issues: 1. Polling is lame. 2. New player threads can still enter state PS_PLAYING. They'll block as soon as they try to run a command. Somehwat unclean. 3. We can exit before all player threads left state PS_PLAYING, losing a treasury update, play time update, and log entries. Could happen when player threads blocked on output until commit 90b3abc5 fixed that; its commit message describes the bug's impact in more detail. Since then, the bug shouldn't bite in practice, because player threads should leave state PS_PLAYING quickly. Fix by introducing shutdown_lock: player threads in state PS_PLAYING hold it shared, shutdwn() takes it exclusive, instead of play_lock. Takes care of the issues as follows: 3. shutdwn() waits until all player threads left state PS_PLAYING, no matter how long it takes them. 2. New player threads block before entering state PS_PLAYING. 1. shutdwn() still polls up to 3s for player threads to terminate. Still lame. Left for another day.
54 lines
1.6 KiB
C
54 lines
1.6 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure, Markus Armbruster
|
|
*
|
|
* Empire is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* ---
|
|
*
|
|
* See files README, COPYING and CREDITS in the root of the source
|
|
* tree for related information and legal notices. It is expected
|
|
* that future projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* server.h: Server startup, control and shutdown
|
|
*
|
|
* Known contributors to this file:
|
|
* Markus Armbruster, 2004-2009
|
|
*/
|
|
|
|
#ifndef SERVER_H
|
|
#define SERVER_H
|
|
|
|
#include "empthread.h"
|
|
|
|
#define UPDATE_TIME_LEN 16
|
|
|
|
extern int shutdown_pending;
|
|
extern empth_rwlock_t *play_lock;
|
|
extern empth_rwlock_t *shutdown_lock;
|
|
extern int update_running;
|
|
extern time_t update_time[UPDATE_TIME_LEN];
|
|
|
|
void market_init(void);
|
|
void update_main(void);
|
|
void update_init(void);
|
|
int update_trigger(void);
|
|
int update_reschedule(void);
|
|
int run_hook(char *, char *);
|
|
int shutdown_initiate(int);
|
|
|
|
#endif
|