Fix trailing whitespace

[empserver] / src / server / shutdown.c

diff --git a/src/server/shutdown.c b/src/server/shutdown.c
index 35e259bf3c1d41c4e50d6a17b5dc88d0f631d413..0bf329005b569c2f87fe8b629175708efbf62b93 100644 (file)
--- a/src/server/shutdown.c
+++ b/src/server/shutdown.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,10 +26,10 @@
  *  ---
  *
  *  shutdown.c: Shuts down server.  Runs at low priority.
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2008
  */
 
 #include <config.h>
@@ -42,9 +42,16 @@
 #include "server.h"
 
 int shutdown_pending;
+static empth_t *shutdown_thread;
 
 static void shutdown_sequence(void *unused);
 
+/*
+ * Initiate shutdown in MINS_FROM_NOW minutes.
+ * If MINS_FROM_NOW is negative, cancel any pending shutdown instead.
+ * Return -1 on error, zero when no shutdown was pending, positive
+ * number when a pending shutdown was modified.
+ */
 int
 shutdown_initiate(int mins_from_now)
 {
@@ -60,15 +67,18 @@ shutdown_initiate(int mins_from_now)
 
     shutdown_pending = mins_from_now + 1;
 
-    if (old_pending) {
-       pr_wall("The shutdown time has been changed to %d minutes!\n",
-               mins_from_now);
-       /* FIXME wake up shutdown_sequence() */
+    if (shutdown_thread) {
+       if (old_pending)
+           pr_wall("The shutdown time has been changed to %d minutes!\n",
+                   mins_from_now);
+       empth_wakeup(shutdown_thread);
     } else {
-       if (!empth_create(PP_SHUTDOWN, shutdown_sequence, 50 * 1024,
-                         0, "shutdownSeq", "Counts down server shutdown",
-                         NULL))
+       shutdown_thread = empth_create(shutdown_sequence, 50 * 1024, 0,
+                                      "shutdownSeq", NULL);
+       if (!shutdown_thread) {
+           shutdown_pending = 0;
            return -1;
+       }
     }
 
     return old_pending;
@@ -105,4 +115,6 @@ shutdown_sequence(void *unused)
        /* FIXME error due to late wakeup accumulates */
        empth_sleep(now + 60);
     }
+
+    shutdown_thread = NULL;
 }