/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * 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.
*
* ---
*
* dispatch.c: Actually execute the command given
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
* Steve McClure, 1998
+ * Markus Armbruster, 2007
*/
#include <config.h>
-#include "prototypes.h"
-#include "misc.h"
-#include "player.h"
#include "com.h"
+#include "empio.h"
+#include "file.h"
#include "match.h"
+#include "misc.h"
#include "nat.h"
-#include "file.h"
-#include "proto.h"
-#include "empio.h"
#include "optlist.h"
-#include "subs.h"
-#include "common.h"
+#include "player.h"
+#include "proto.h"
+#include "prototypes.h"
#include "server.h"
/*
struct cmndstr *command;
int cmd;
- cmd = comtch(player->argp[0], player_coms, player->ncomstat);
+ cmd = comtch(player->argp[0], player_coms, player->nstat);
if (cmd < 0) {
if (cmd == M_NOTUNIQUE)
pr("Command \"%s\" is ambiguous -- ", player->argp[0]);
else if (cmd == M_IGNORE)
return 0;
- else {
- pr("\"%s\" is not a legal command ", player->argp[0]);
- if (player->nstat != player->ncomstat)
- pr("now ");
- pr("\n");
- }
+ else
+ pr("\"%s\" is not a legal command\n", player->argp[0]);
return -1;
}
command = &player_coms[cmd];
pr("Command not implemented\n");
return 0;
}
- if (update_pending) {
- pr("Update in progress...command failed\n");
- return 0;
- }
+ /*
+ * 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.
+ */
+ while (play_wrlock_wanted)
+ empth_yield();
+ player->command = command;
+ empth_rwlock_rdlock(play_lock);
if (redir) {
prredir(redir);
uprnf(buf);
pr("\n");
}
- player->command = command;
switch (command->c_addr()) {
case RET_OK:
player->btused += command->c_cost;
pr("Usage: %s\n", command->c_form);
break;
default:
- logerror("%s: returned bad value", command->c_form);
+ CANT_REACH();
break;
}
- player->command = 0;
+ empth_rwlock_unlock(play_lock);
+ player->command = NULL;
return 0;
}