New macro ARRAY_SIZE()

[empserver] / src / server / update.c

diff --git a/src/server/update.c b/src/server/update.c
index 51a571b99caf2a222f306cf60a92f3ef472bfd28..a9f3248cc86d31e87cc8a966e10a90e13e8c4bac 100644 (file)
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
  *     Dave Pare, 1994
  *     Steve McClure, 1996
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2007-2012
+ *     Markus Armbruster, 2007-2020
  */
 
 #include <config.h>
@@ -42,7 +42,6 @@
 #include <time.h>
 #include "chance.h"
 #include "empthread.h"
-#include "file.h"
 #include "game.h"
 #include "misc.h"
 #include "optlist.h"
@@ -50,12 +49,6 @@
 #include "prototypes.h"
 #include "server.h"
 
-/*
- * Update is running.
- * Can be used to suppress messages, or direct them to bulletins.
- */
-int update_running;
-
 static time_t update_schedule_anchor;
 static int update_wanted;
 
@@ -69,7 +62,6 @@ void
 update_init(void)
 {
     struct player *dp;
-    int stacksize;
 
     update_schedule_anchor = (time(NULL) + 59) / 60 * 60;
     if (update_get_schedule() < 0)
@@ -78,11 +70,7 @@ update_init(void)
     dp = player_new(-1);
     if (!dp)
        exit_nomem();
-    /* FIXME ancient black magic; figure out true stack need */
-    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, 512 * 1024, 0, "Update", dp);
     if (!update_thread)
        exit_nomem();
 }
@@ -95,7 +83,7 @@ static int
 update_get_schedule(void)
 {
     time_t now = time(NULL);
-    int n = sizeof(update_time) / sizeof(*update_time);
+    int n = ARRAY_SIZE(update_time);
     int i;
 
     ef_truncate(EF_UPDATES, 0);
@@ -162,7 +150,6 @@ update_sched(void *unused)
 
        update_get_schedule();
     }
-    /*NOTREACHED*/
 }
 
 /*
@@ -211,9 +198,7 @@ update_run(void)
            return;
        }
     }
-    update_running = 1;
     update_main();
-    update_running = 0;
     empth_rwlock_unlock(update_lock);
 }