/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2021, 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,
* 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 <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* dispatch.c: Actually execute the command given
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
* Steve McClure, 1998
- * Markus Armbruster, 2007
+ * Markus Armbruster, 2007-2014
*/
#include <config.h>
+#include "chance.h"
#include "com.h"
#include "empio.h"
-#include "file.h"
+#include "journal.h"
#include "match.h"
#include "misc.h"
#include "nat.h"
#include "optlist.h"
#include "player.h"
-#include "proto.h"
#include "prototypes.h"
#include "server.h"
+/*
+ * Last command's PRNG seed.
+ * Only used when running_test_suite.
+ */
+int test_suite_prng_seed;
+
/*
* Execute command named by player->argp[0].
- * BUF is the raw UTF-8 command line. It should have been passed to
+ * @buf is the raw UTF-8 command line. It should have been passed to
* parse() to set up player->argp.
- * If REDIR is not null, it's the command's redirection, in UTF-8.
+ * If @redir is not null, it's the command's redirection, in UTF-8.
* Return -1 if the command is not unique or doesn't exist, else 0.
*/
int
return -1;
}
command = &player_coms[cmd];
+
np = getnatp(player->cnum);
if (np->nat_btu < command->c_cost && command->c_cost > 0) {
if (player->god || opt_BLITZ)
np->nat_btu = max_btus;
else {
- pr("You don't have the BTU's, bozo\n");
+ pr("You don't have the BTUs, bozo\n");
return 0;
}
}
- if (command->c_addr == 0) {
+ if (!command->c_addr) {
pr("Command not implemented\n");
return 0;
}
+ player->may_sleep = command->c_flags & C_MOD
+ ? PLAYER_SLEEP_ON_INPUT : PLAYER_SLEEP_FREELY;
+ player->command = command;
+ empth_rwlock_rdlock(update_lock);
+
/*
- * Rwlocks can hand out read locks while a write lock is wanted.
- * Unfair to writers, but possible. This lets commands run with
- * !player->aborted, which can then block on input and thus delay
- * the update indefinitely. We could avoid that by setting
- * player->aborted here, but spinning until the update is done is
- * nicer to players.
+ * When running the test suite, reseed PRNG for each command with
+ * a counter, to keep results stable even when the number of PRNs
+ * consumed changes.
+ * Tests can adjust the counter with "__cmd added ...", to
+ * keep the results stable when commands are inserted or deleted.
*/
- while (play_wrlock_wanted)
- empth_yield();
- player->command = command;
- empth_rwlock_rdlock(play_lock);
+ test_suite_prng_seed += !(command->c_permit & TESTING);
+ if (running_test_suite)
+ seed_prng(test_suite_prng_seed);
+
if (redir) {
prredir(redir);
uprnf(buf);
pr("\n");
}
+ journal_command(command->c_form);
switch (command->c_addr()) {
case RET_OK:
player->btused += command->c_cost;
case RET_SYN:
pr("Usage: %s\n", command->c_form);
break;
- case RET_SYS:
- logerror("System error, command failed: %s", command->c_form);
- break;
default:
CANT_REACH();
break;
}
- empth_rwlock_unlock(play_lock);
+
+ empth_rwlock_unlock(update_lock);
player->command = NULL;
+ if (player->may_sleep != PLAYER_SLEEP_NEVER || !io_eof(player->iop))
+ player->may_sleep = PLAYER_SLEEP_FREELY;
+ /* else we're being kicked out */
return 0;
}