License upgrade to GPL version 3 or later

[empserver] / src / server / update.c

diff --git a/src/server/update.c b/src/server/update.c
index 0b20f03139b88a877982bc989f3e24ab832b5953..ae7b8807ed54d25de224ab84dc1dead8c3fb7a9f 100644 (file)
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -1,11 +1,11 @@
 /*
  *  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-2011, 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 <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,12 +25,12 @@
  *  ---
  *
  *  update.c: Update scheduler
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1996
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2009
  */
 
 #include <config.h>
@@ -63,7 +62,6 @@ static empth_t *update_thread;
 static int update_get_schedule(void);
 static void update_sched(void *);
 static void update_run(void);
-static int run_hook(char *cmd, char *name);
 
 void
 update_init(void)
@@ -86,8 +84,7 @@ update_init(void)
     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();
 }
@@ -137,7 +134,7 @@ update_sched(void *unused)
        } else {
            logerror("No update scheduled");
            /* want to sleep forever, but empthread doesn't provide that */
-           while (empth_sleep(60 * 60 * 24) >= 0) ;
+           while (empth_sleep(time(NULL) + (60 * 60 * 24)) >= 0) ;
        }
 
        now = time(NULL);
@@ -194,12 +191,12 @@ update_run(void)
 {
     struct player *p;
 
-    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;
        if (p->command) {
            pr_flash(p, "Update aborting command\n");
+           p->may_sleep = PLAYER_SLEEP_NEVER;
            p->aborted = 1;
            empth_wakeup(p->proc);
        }
@@ -207,24 +204,23 @@ update_run(void)
     empth_rwlock_wrlock(play_lock);
     if (*pre_update_hook) {
        if (run_hook(pre_update_hook, "pre-update")) {
-           play_wrlock_wanted = 0;
            empth_rwlock_unlock(play_lock);
            return;
        }
     }
     update_running = 1;
     update_main();
-    play_wrlock_wanted = update_running = 0;
+    update_running = 0;
     empth_rwlock_unlock(play_lock);
 }
 
-static int
+int
 run_hook(char *cmd, char *name)
 {
     int status;
-    
+
     fflush(NULL);
-    
+
     status = system(cmd);
     if (status == 0)
        ;                       /* successful exit */