Update copyright notice

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

diff --git a/src/lib/lwp/sig.c b/src/lib/lwp/sig.c
index 104478e6633f220011dd04482fb7c0ab64437c90..60e3b375958bee7f71121535d558b5c5d7ea09c8 100644 (file)
--- a/src/lib/lwp/sig.c
+++ b/src/lib/lwp/sig.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1994-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1994-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,33 +26,33 @@
  *  ---
  *
  *  sig.c: Wait for signals
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2007
  */
 
 #include <config.h>
 
 #include <errno.h>
+#include <stddef.h>
 #include <signal.h>
 #include "lwp.h"
 #include "lwpint.h"
 
-/* Signals awaited by lwpSigWait() */
-static sigset_t *LwpSigAwaited;
-
 /*
- * Signals from LwpSigAwaited catched so far
+ * Signals catched so far.
  * Access only with signals blocked!
  */
 static sigset_t LwpSigCatched;
 
+/*
+ * LwpSigCatched changed since last
+ */
+static sig_atomic_t LwpSigCheck;
+
 /* The thread waiting for signals in lwpSigWait() */
 static struct lwpProc *LwpSigWaiter;
 
-/* Where to return the signal number to the thread in lwpSigWait() */
-static int *LwpSigPtr;
-
 static void lwpCatchAwaitedSig(int);
 
 /*
@@ -80,6 +80,7 @@ static void
 lwpCatchAwaitedSig(int sig)
 {
     sigaddset(&LwpSigCatched, sig);
+    LwpSigCheck = 1;
 }
 
 /*
@@ -119,14 +120,14 @@ lwpSigWait(sigset_t *set, int *sig)
 
     if (CANT_HAPPEN(LwpSigWaiter))
        return EBUSY;
-    res = lwpGetSig(set);
-    if (res <= 0) {
+    for (;;) {
+       LwpSigCheck = 0;
+       res = lwpGetSig(set);
+       if (res > 0)
+           break;
        lwpStatus(LwpCurrent, "Waiting for signals");
-       LwpSigAwaited = set;
-       LwpSigPtr = sig;
        LwpSigWaiter = LwpCurrent;
        lwpReschedule();
-       return 0;
     }
     *sig = res;
     return 0;
@@ -139,13 +140,7 @@ lwpSigWait(sigset_t *set, int *sig)
 void
 lwpSigWakeup(void)
 {
-    int res;
-
-    if (!LwpSigWaiter)
-       return;
-    res = lwpGetSig(LwpSigAwaited);
-    if (res > 0) {
-       *LwpSigPtr = res;
+    if (LwpSigWaiter && LwpSigCheck) {
        lwpReady(LwpSigWaiter);
        LwpSigWaiter = NULL;
     }