/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1994-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1994-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* sig.c: Wait for signals
*
* Known contributors to this file:
- * Markus Armbruster, 2006-2007
+ * Markus Armbruster, 2006-2020
*/
#include <config.h>
#include "lwpint.h"
/*
- * Signals catched so far.
+ * Signals caught so far.
* Access only with signals blocked!
*/
-static sigset_t LwpSigCatched;
+static sigset_t LwpSigCaught;
/*
- * LwpSigCatched changed since last
+ * LwpSigCaught changed since last
*/
static sig_atomic_t LwpSigCheck;
static void lwpCatchAwaitedSig(int);
/*
- * Initialize waiting for signals in SET.
+ * Initialize waiting for signals in @set.
*/
void
lwpInitSigWait(sigset_t *set)
struct sigaction act;
int i;
- sigemptyset(&LwpSigCatched);
+ sigemptyset(&LwpSigCaught);
act.sa_flags = 0;
act.sa_mask = *set;
- sigemptyset(&act.sa_mask);
act.sa_handler = lwpCatchAwaitedSig;
for (i = 0; i < NSIG; i++) {
- if (sigismember(set, i))
+ if (sigismember(set, i) > 0)
sigaction(i, &act, NULL);
}
}
static void
lwpCatchAwaitedSig(int sig)
{
- sigaddset(&LwpSigCatched, sig);
+ sigaddset(&LwpSigCaught, sig);
LwpSigCheck = 1;
}
/*
- * Test whether a signal from SET has been catched.
- * If yes, delete that signal from the set of catched signals, and
+ * Test whether a signal from @set has been caught.
+ * If yes, delete that signal from the set of caught signals, and
* return its number.
* Else return 0.
*/
sigprocmask(SIG_BLOCK, set, &save);
for (i = NSIG - 1; i > 0; i--) {
- if (sigismember(set, i) && sigismember(&LwpSigCatched, i)) {
+ if (sigismember(set, i) > 0 && sigismember(&LwpSigCaught, i) > 0) {
lwpStatus(LwpCurrent, "Got awaited signal %d", i);
- sigdelset(&LwpSigCatched, i);
+ sigdelset(&LwpSigCaught, i);
break;
}
}
}
/*
- * Wait until a signal from SET arrives.
- * Assign its number to *SIG and return 0.
+ * Wait until a signal from @set arrives.
+ * Assign its number to *@sig and return 0.
* If another thread is already waiting for signals, return EBUSY
* without waiting.
*/
{
int res;
- if (CANT_HAPPEN(LwpSigWaiter))
+ if (LwpSigWaiter)
return EBUSY;
for (;;) {
LwpSigCheck = 0;