/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, 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,
* 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/>.
*
* ---
*
* Dave Pare, 1994
* Steve McClure, 1996
* Ron Koenderink, 2005
- * Markus Armbruster, 2007
+ * Markus Armbruster, 2007-2012
*/
#include <config.h>
#include <sys/wait.h>
#endif
#include <time.h>
+#include "chance.h"
#include "empthread.h"
+#include "file.h"
#include "game.h"
#include "misc.h"
#include "optlist.h"
if (update_get_schedule() < 0)
exit(1);
- play_lock = empth_rwlock_create("Update");
- if (!play_lock)
- exit_nomem();
-
dp = player_new(-1);
if (!dp)
exit_nomem();
stacksize = 100000 +
/* finish_sects */ WORLD_X * WORLD_Y * (2 * sizeof(double) +
sizeof(char *));
- update_thread = empth_create(update_sched, stacksize, 0,
- "Update", dp);
+ update_thread = empth_create(update_sched, stacksize, 0, "Update", dp);
if (!update_thread)
exit_nomem();
}
update_get_schedule(void)
{
time_t now = time(NULL);
+ int n = sizeof(update_time) / sizeof(*update_time);
+ int i;
- if (read_schedule(schedulefil, update_time,
- sizeof(update_time) / sizeof(*update_time),
+ ef_truncate(EF_UPDATES, 0);
+ ef_extend(EF_UPDATES, n - 1);
+ if (read_schedule(schedulefil, update_time, n,
now + 30, update_schedule_anchor) < 0) {
logerror("No update schedule!");
- update_time[0] = 0;
+ ef_truncate(EF_UPDATES, 0);
return -1;
}
logerror("Update schedule read");
+ for (i = 0; update_time[i]; i++) ;
+ ef_truncate(EF_UPDATES, i);
return 0;
}
next_update = update_time[0];
if (next_update) {
if (update_window > 0)
- next_update += random() % update_window;
+ next_update += roll0(update_window);
logerror("Next update at %s", ctime(&next_update));
/* sleep until update is scheduled to go off */
empth_sleep(next_update);
{
struct player *p;
- play_wrlock_wanted = 1;
- for (p = player_next(NULL); p != 0; p = player_next(p)) {
+ for (p = player_next(NULL); p; p = player_next(p)) {
if (p->state != PS_PLAYING)
continue;
if (p->command) {
pr_flash(p, "Update aborting command\n");
+ p->may_sleep = PLAYER_SLEEP_NEVER;
p->aborted = 1;
empth_wakeup(p->proc);
}
}
- empth_rwlock_wrlock(play_lock);
+ empth_rwlock_wrlock(update_lock);
if (*pre_update_hook) {
if (run_hook(pre_update_hook, "pre-update")) {
- play_wrlock_wanted = 0;
- empth_rwlock_unlock(play_lock);
+ empth_rwlock_unlock(update_lock);
return;
}
}
update_running = 1;
update_main();
- play_wrlock_wanted = update_running = 0;
- empth_rwlock_unlock(play_lock);
+ update_running = 0;
+ empth_rwlock_unlock(update_lock);
}
int