empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lwp: Rename two variables for clarity

Browse source 
Rename LwpSigCaught to LwpPendingSig, and lwpCatchAwaitedSig() to
lwpHandleAwaitedSig().

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-12-27 09:41:41 +01:00
parent 8a1d9fbb4b
commit d89bda9998
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/lwp/sig.c
View file

@ -48,17 +48,17 @@ static int *LwpAwaitedSig;
* Pending awaited signals. * Pending awaited signals.
* Access only with signals blocked! * Access only with signals blocked!
*/ */
static volatile int *LwpSigCaught; static volatile int *LwpPendingSig;
/* /*
* Is there anything in LwpSigCaught[]? * Is there anything in LwpPendingSig[]?
*/ */
static volatile sig_atomic_t LwpSigCheck; static volatile sig_atomic_t LwpSigCheck;
/* The thread waiting for signals in lwpSigWait() */ /* The thread waiting for signals in lwpSigWait() */
static struct lwpProc *LwpSigWaiter; static struct lwpProc *LwpSigWaiter;
static void lwpCatchAwaitedSig(int); static void lwpHandleAwaitedSig(int);
/* /*
* Initialize waiting for signals in @sig[]. * Initialize waiting for signals in @sig[].
@ -74,12 +74,12 @@ lwpInitSigWait(int sig[])
LwpAwaitedSig = sig; LwpAwaitedSig = sig;
act.sa_flags = 0; act.sa_flags = 0;
act.sa_handler = lwpCatchAwaitedSig; act.sa_handler = lwpHandleAwaitedSig;
sigemptyset(&act.sa_mask); sigemptyset(&act.sa_mask);
for (i = 0; sig[i]; i++) for (i = 0; sig[i]; i++)
sigaddset(&act.sa_mask, sig[i]); sigaddset(&act.sa_mask, sig[i]);
LwpSigCaught = calloc(i, sizeof(*LwpSigCaught)); LwpPendingSig = calloc(i, sizeof(*LwpPendingSig));
for (i = 0; sig[i]; i++) for (i = 0; sig[i]; i++)
sigaction(sig[i], &act, NULL); sigaction(sig[i], &act, NULL);
@ -87,17 +87,17 @@ lwpInitSigWait(int sig[])
/* /*
* Signal handler for awaited signals. * Signal handler for awaited signals.
* Set @LwpSigCaught[] for @sig, and set @LwpSigCheck. * Set @LwpPendingSig[] for @sig, and set @LwpSigCheck.
* Not reentrant; lwpInitSigWait() guards. * Not reentrant; lwpInitSigWait() guards.
*/ */
static void static void
lwpCatchAwaitedSig(int sig) lwpHandleAwaitedSig(int sig)
{ {
int i; int i;
for (i = 0; LwpAwaitedSig[i]; i++) { for (i = 0; LwpAwaitedSig[i]; i++) {
if (sig == LwpAwaitedSig[i]) if (sig == LwpAwaitedSig[i])
LwpSigCaught[i] = 1; LwpPendingSig[i] = 1;
} }
LwpSigCheck = 1; LwpSigCheck = 1;
} }
@ -121,15 +121,15 @@ lwpGetSig(void)
sigprocmask(SIG_BLOCK, &set, &save); sigprocmask(SIG_BLOCK, &set, &save);
for (i = 0; LwpAwaitedSig[i]; i++) { for (i = 0; LwpAwaitedSig[i]; i++) {
if (LwpSigCaught[i]) { if (LwpPendingSig[i]) {
lwpStatus(LwpCurrent, "Got awaited signal %d", LwpSigCaught[i]); lwpStatus(LwpCurrent, "Got awaited signal %d", LwpPendingSig[i]);
ret = LwpAwaitedSig[i]; ret = LwpAwaitedSig[i];
LwpSigCaught[i] = 0; LwpPendingSig[i] = 0;
} }
} }
for (; LwpAwaitedSig[i] && LwpSigCaught[i]; i++) ; for (; LwpAwaitedSig[i] && LwpPendingSig[i]; i++) ;
if (!LwpSigCaught[i]) if (!LwpPendingSig[i])
LwpSigCheck = 0; LwpSigCheck = 0;
sigprocmask(SIG_SETMASK, &save, NULL); sigprocmask(SIG_SETMASK, &save, NULL);