X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=52c4c8cc3fb2eb72494b8cf155e96979aaf9683c;hp=1f66f98810f9e4eb2906b432e5b9c91f3e45ff40;hb=9102ecce5;hpb=08b94556826ec883ab68c736ad8494118511446c
diff --git a/src/server/main.c b/src/server/main.c
index 1f66f9881..52c4c8cc3 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -1,11 +1,11 @@
/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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,
@@ -14,8 +14,7 @@
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see .
*
* ---
*
@@ -31,8 +30,8 @@
* Dave Pare, 1994
* Steve McClure, 1996, 1998
* Doug Hay, 1998
- * Ron Koenderink, 2004-2005
- * Markus Armbruster, 2005-2008
+ * Ron Koenderink, 2004-2009
+ * Markus Armbruster, 2005-2012
*/
#include
@@ -46,21 +45,18 @@
#include
#if defined(_WIN32)
-#include
-#undef NS_ALL
#include
#include "service.h"
+#include "sys/socket.h"
#endif
+#include "chance.h"
#include "empio.h"
#include "empthread.h"
#include "file.h"
#include "journal.h"
-#include "land.h"
#include "match.h"
#include "misc.h"
-#include "nat.h"
-#include "nuke.h"
#include "optlist.h"
#include "plane.h"
#include "player.h"
@@ -68,30 +64,28 @@
#include "prototypes.h"
#include "sect.h"
#include "server.h"
-#include "ship.h"
#include "version.h"
static void ignore(void);
static void crash_dump(void);
+static void init_server(unsigned, int);
static void create_pidfile(char *, pid_t);
#if defined(_WIN32)
static void loc_NTInit(void);
-static void loc_NTTerm(void);
#endif
/*
- * Lock to synchronize player threads with update and shutdown.
- * Update and shutdown takes it exclusive, commands take it shared.
+ * Lock to synchronize player threads with update.
+ * Update holds it exclusive, commands hold it shared.
*/
-empth_rwlock_t *play_lock;
-
+empth_rwlock_t *update_lock;
/*
- * Is a thread attempting to take an exclusive play_lock?
- * Threads holding a shared play_lock must not sleep while this is
- * true.
+ * Lock to synchronize player threads with shutdown.
+ * Shutdown holds it exclusive, player threads in state PS_PLAYING
+ * hold it shared.
*/
-int play_wrlock_wanted;
+empth_rwlock_t *shutdown_lock;
static char pidfname[] = "server.pid";
@@ -114,7 +108,6 @@ print_usage(char *program_name)
" -e CONFIG-FILE configuration file\n"
" (default %s)\n"
" -E ACTION what to do on oops: abort, crash-dump, nothing (default)\n"
- " -h display this help and exit\n"
#ifdef _WIN32
" -i install service `%s'\n"
" -I NAME install service NAME\n"
@@ -126,6 +119,7 @@ print_usage(char *program_name)
#endif
" -s enable stack checking\n"
" -R RANDOM-SEED random seed\n"
+ " -h display this help and exit\n"
" -v display version information and exit\n",
program_name, dflt_econfig
#ifdef _WIN32
@@ -147,8 +141,10 @@ main(int argc, char **argv)
int remove_service_set = 0;
#endif
char *config_file = NULL;
+ int force_bad_state = 0;
int op, idx, sig;
- unsigned seed = time(NULL);
+ unsigned seed = 0;
+ int seed_set = 0;
oops_handler = ignore;
@@ -157,7 +153,7 @@ main(int argc, char **argv)
#else
# define XOPTS
#endif
- while ((op = getopt(argc, argv, "de:E:hpsR:v" XOPTS)) != EOF) {
+ while ((op = getopt(argc, argv, "de:E:FhpsR:v" XOPTS)) != EOF) {
switch (op) {
case 'p':
flags |= EMPTH_PRINT;
@@ -177,6 +173,9 @@ main(int argc, char **argv)
}
oops_handler = oops_hndlr[idx];
break;
+ case 'F':
+ force_bad_state = 1;
+ break;
#if defined(_WIN32)
case 'I':
service_name = optarg;
@@ -196,6 +195,7 @@ main(int argc, char **argv)
break;
case 'R':
seed = strtoul(optarg, NULL, 10);
+ seed_set = 1;
break;
case 'v':
printf("%s\n\n%s", version, legal);
@@ -209,26 +209,27 @@ main(int argc, char **argv)
}
}
+ /* silently ignore operands for backward compatibility */
+
#if defined(_WIN32)
- if ((!daemonize || flags || config_file != NULL) &&
- remove_service_set) {
+ if ((!daemonize || flags || config_file != NULL)
+ && remove_service_set) {
fprintf(stderr, "Can't use -p, -s, -d or -e with either "
"-u or -U options\n");
exit(EXIT_FAILURE);
}
if ((!daemonize || flags) && install_service_set) {
- fprintf(stderr, "Can't use -d, -p or -s with either "
- "-i or -I options\n");
+ fprintf(stderr,
+ "Can't use -d, -p or -s with either -i or -I options\n");
exit(EXIT_FAILURE);
}
if (install_service_set && remove_service_set) {
- fprintf(stderr, "Can't use both -u or -U and -i or -I "
- "options\n");
+ fprintf(stderr, "Can't use both -u or -U and -i or -I options\n");
exit(EXIT_FAILURE);
}
if (remove_service_set)
- return remove_service(service_name);
+ return remove_service(service_name);
if (install_service_set) {
program_name = _fullpath(NULL, argv[0], 0);
if (config_file != NULL)
@@ -255,7 +256,9 @@ main(int argc, char **argv)
return install_service(program_name, service_name, config_file);
#endif /* _WIN32 */
- init_server(seed);
+ if (!seed_set)
+ seed = pick_seed();
+ init_server(seed, force_bad_state);
#if defined(_WIN32)
if (daemonize != 0) {
@@ -288,7 +291,6 @@ main(int argc, char **argv)
}
#endif /* !_WIN32 */
start_server(flags);
- journal_prng(seed);
for (;;) {
sig = empth_wait_for_signal();
@@ -324,13 +326,14 @@ crash_dump(void)
pid_t pid;
int status;
+ fflush(NULL);
pid = fork();
if (pid < 0) {
logerror("Can't fork for crash dump (%s)", strerror(errno));
return;
}
if (pid == 0)
- abort(); /* child */
+ raise(SIGABRT); /* child */
/* parent */
while (waitpid(pid, &status, 0) < 0) {
@@ -348,18 +351,21 @@ crash_dump(void)
/*
* Initialize for serving, acquire resources.
*/
-void
-init_server(unsigned seed)
+static void
+init_server(unsigned seed, int force_bad_state)
{
- srandom(seed);
+ seed_prng(seed);
#if defined(_WIN32)
loc_NTInit();
#endif
player_init();
- ef_init_srv();
+ ef_init_srv(force_bad_state);
io_init();
init_nreport();
+ if (journal_startup() < 0)
+ exit(1);
+ journal_prng(seed);
loginit("server");
}
@@ -378,13 +384,14 @@ start_server(int flags)
empth_init((void **)&player, flags);
- if (journal_startup() < 0)
- exit(1);
-
- empth_create(player_accept, 50 * 1024, flags, "AcceptPlayers", 0);
+ update_lock = empth_rwlock_create("Update");
+ shutdown_lock = empth_rwlock_create("Shutdown");
+ if (!update_lock || !shutdown_lock)
+ exit_nomem();
market_init();
update_init();
+ empth_create(player_accept, 50 * 1024, flags, "AcceptPlayers", NULL);
}
/*
@@ -394,9 +401,6 @@ void
finish_server(void)
{
ef_fin_srv();
-#if defined(_WIN32)
- loc_NTTerm();
-#endif
journal_shutdown();
remove(pidfname);
}
@@ -417,22 +421,35 @@ void
shutdwn(int sig)
{
struct player *p;
+ time_t now = time(NULL);
+ int i;
logerror("Shutdown commencing (cleaning up threads.)");
- play_wrlock_wanted = 1;
- for (p = player_next(0); p != 0; p = player_next(p)) {
+ for (p = player_next(NULL); p; p = player_next(p)) {
if (p->state != PS_PLAYING)
continue;
pr_flash(p, "Server shutting down...\n");
- p->state = PS_SHUTDOWN;
- p->aborted++;
+ io_set_eof(p->iop);
+ p->aborted = 1;
+ p->may_sleep = PLAYER_SLEEP_NEVER;
if (p->command) {
pr_flash(p, "Shutdown aborting command\n");
}
empth_wakeup(p->proc);
}
- empth_rwlock_wrlock(play_lock);
+
+ empth_rwlock_wrlock(shutdown_lock);
+ empth_yield();
+
+ for (i = 1; i <= 3 && player_next(NULL); i++) {
+ logerror("Waiting for player threads to terminate\n");
+ empth_sleep(now + i);
+ }
+
+ for (p = player_next(NULL); p; p = player_next(p))
+ logerror("Player %d lingers, output might be lost", p->cnum);
+
if (sig)
logerror("Server shutting down on signal %d", sig);
else
@@ -441,7 +458,7 @@ shutdwn(int sig)
#if defined(_WIN32)
if (daemonize)
- stop_service();
+ stop_service();
#endif
exit(0);
}
@@ -451,20 +468,11 @@ static void
loc_NTInit(void)
{
int rc;
- WORD wVersionRequested;
- WSADATA wsaData;
- wVersionRequested = MAKEWORD(2, 0);
- rc = WSAStartup(wVersionRequested, &wsaData);
+ rc = w32_socket_init();
if (rc != 0) {
- logerror("WSAStartup failed. %d", rc);
+ logerror("WSAStartup Failed, error code %d\n", rc);
exit(1);
}
}
-
-static void
-loc_NTTerm(void)
-{
- WSACleanup();
-}
#endif