Update copyright notice

[empserver] / src / server / shutdown.c

diff --git a/src/server/shutdown.c b/src/server/shutdown.c
index 8e0b68a7350cc1e709bde28b4511c2eb650031a9..7d5f4f46badac221e6ea2fd92aadcbfc6316182c 100644 (file)
--- a/src/server/shutdown.c
+++ b/src/server/shutdown.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-2020, 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,25 +25,30 @@
  *  ---
  *
  *  shutdown.c: Shuts down server.  Runs at low priority.
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2013
  */
 
 #include <config.h>
 
 #include <time.h>
 #include "empthread.h"
-#include "file.h"
-#include "nat.h"
 #include "prototypes.h"
 #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,14 +64,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", NULL))
+       shutdown_thread = empth_create(shutdown_sequence, 65536, 0,
+                                      "shutdownSeq", NULL);
+       if (!shutdown_thread) {
+           shutdown_pending = 0;
            return -1;
+       }
     }
 
     return old_pending;
@@ -104,4 +112,6 @@ shutdown_sequence(void *unused)
        /* FIXME error due to late wakeup accumulates */
        empth_sleep(now + 60);
     }
+
+    shutdown_thread = NULL;
 }