Encapsulate direct use of random(), srandom() in chance.c

[empserver] / src / server / update.c

diff --git a/src/server/update.c b/src/server/update.c
index 20e31a7ac045f6753a8b2820994b56ddf92545ac..51a571b99caf2a222f306cf60a92f3ef472bfd28 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-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2013, 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-2010
+ *     Markus Armbruster, 2007-2012
  */
 
 #include <config.h>
@@ -40,7 +40,9 @@
 #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"
@@ -73,10 +75,6 @@ update_init(void)
     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();
@@ -97,15 +95,20 @@ static int
 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;
 }
 
@@ -127,7 +130,7 @@ update_sched(void *unused)
        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);
@@ -201,17 +204,17 @@ update_run(void)
            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")) {
-           empth_rwlock_unlock(play_lock);
+           empth_rwlock_unlock(update_lock);
            return;
        }
     }
     update_running = 1;
     update_main();
     update_running = 0;
-    empth_rwlock_unlock(play_lock);
+    empth_rwlock_unlock(update_lock);
 }
 
 int