lwp: Rewrite signal wait code for portability and safety

[empserver] / src / lib / empthread / lwp.c

diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c
index 7f62c5d384bbfe172382ff96058ef9fa3175d089..d26eae7c889c03c2325e12a55841f2df46973730 100644 (file)
--- a/src/lib/empthread/lwp.c
+++ b/src/lib/empthread/lwp.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, 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,10 +25,10 @@
  *  ---
  *
  *  lwp.c: Interface from Empire threads to LWP threads
- * 
+ *
  *  Known contributors to this file:
  *     Sasha Mikheev
- *     Markus Armbruster, 2006-2007
+ *     Markus Armbruster, 2006-2020
  */
 
 #include <config.h>
@@ -37,35 +36,30 @@
 #include <signal.h>
 #include <time.h>
 #include "empthread.h"
+#include "file.h"
 #include "misc.h"
 
 /* Flags that were passed to empth_init() */
 static int empth_flags;
 
-
 int
 empth_init(void **ctx, int flags)
 {
-    sigset_t set;
-
+    static int sig[] = { SIGHUP, SIGINT, SIGTERM, 0 };
     empth_flags = flags;
     empth_init_signals();
-    sigemptyset(&set);
-    sigaddset(&set, SIGHUP);
-    sigaddset(&set, SIGINT);
-    sigaddset(&set, SIGTERM);
-    lwpInitSystem(1, ctx, flags, &set);
+    lwpInitSystem(1, ctx, flags, sig);
     return 0;
 }
 
-
 empth_t *
 empth_create(void (*entry)(void *), int size, int flags,
             char *name, void *ud)
 {
     if (!flags)
        flags = empth_flags;
-    return lwpCreate(1, entry, size, flags, name, 0, 0, ud);
+    ef_make_stale();
+    return lwpCreate(1, entry, size, flags, name, 0, NULL, ud);
 }
 
 empth_t *
@@ -74,28 +68,37 @@ empth_self(void)
     return LwpCurrent;
 }
 
-void
-empth_exit(void)
+char *
+empth_name(empth_t *thread)
 {
-    lwpExit();
+    return lwpName(thread);
 }
 
 void
-empth_yield(void)
+empth_set_name(empth_t *thread, char *name)
 {
-    lwpYield();
+    lwpSetName(thread, name);
 }
 
 void
-empth_terminate(empth_t *a)
+empth_exit(void)
 {
-    lwpTerminate(a);
+    ef_make_stale();
+    lwpExit();
 }
 
 void
-empth_select(int fd, int flags)
+empth_yield(void)
+{
+    ef_make_stale();
+    lwpYield();
+}
+
+int
+empth_select(int fd, int flags, struct timeval *timeout)
 {
-    lwpSleepFd(fd, flags);
+    ef_make_stale();
+    return lwpSleepFd(fd, flags, timeout);
 }
 
 void
@@ -107,22 +110,19 @@ empth_wakeup(empth_t *a)
 int
 empth_sleep(time_t until)
 {
+    ef_make_stale();
     return lwpSleepUntil(until);
 }
 
 int
 empth_wait_for_signal(void)
 {
-    sigset_t set;
     int sig, err;
     time_t now;
 
-    sigemptyset(&set);
-    sigaddset(&set, SIGHUP);
-    sigaddset(&set, SIGINT);
-    sigaddset(&set, SIGTERM);
+    ef_make_stale();
     for (;;) {
-       err = lwpSigWait(&set, &sig);
+       err = lwpSigWait(&sig);
        if (CANT_HAPPEN(err)) {
            time(&now);
            lwpSleepUntil(now + 60);
@@ -147,12 +147,14 @@ empth_rwlock_destroy(empth_rwlock_t *rwlock)
 void
 empth_rwlock_wrlock(empth_rwlock_t *rwlock)
 {
+    ef_make_stale();
     lwp_rwlock_wrlock(rwlock);
 }
 
 void
 empth_rwlock_rdlock(empth_rwlock_t *rwlock)
 {
+    ef_make_stale();
     lwp_rwlock_rdlock(rwlock);
 }