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

lwp: Simplify lwpSigWait() interface

Browse source 
lwpSigWait() was designed to resemble sigwait().  It doesn't anymore.
Drop the awkward argument, and use the return value instead.

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

2
include/lwp.h
View file

@ -64,7 +64,7 @@ void lwpYield(void);
int lwpSleepFd(int fd, int flags, struct timeval *timeout);
int lwpSleepUntil(time_t until);
void lwpWakeup(struct lwpProc *);
int lwpSigWait(int *sig);
int lwpSigWait(void);
void *lwpGetUD(struct lwpProc *);
void lwpSetUD(struct lwpProc *, char *ud);
int lwpSetPriority(int prio);

6
src/lib/empthread/lwp.c
View file

@ -117,13 +117,13 @@ empth_sleep(time_t until)
int
empth_wait_for_signal(void)
{
int sig, err;
int sig;
time_t now;
ef_make_stale();
for (;;) {
err = lwpSigWait(&sig);
if (CANT_HAPPEN(err)) {
sig = lwpSigWait();
if (CANT_HAPPEN(sig < 0)) {
time(&now);
lwpSleepUntil(now + 60);
continue;

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

@ -138,17 +138,17 @@ lwpGetSig(void)
/*
* Wait until one of the signals passed to lwpInitSigWait() arrives.
* Assign its number to *@sig and return 0.
* If another thread is already waiting for signals, return EBUSY
* Return its signal number.
* If another thread is already waiting for signals, return -1
* without waiting.
*/
int
lwpSigWait(int *sig)
lwpSigWait(void)
{
int res;
if (LwpSigWaiter)
return EBUSY;
return -1;
for (;;) {
res = lwpGetSig();
if (res > 0)
@ -157,8 +157,7 @@ lwpSigWait(int *sig)
LwpSigWaiter = LwpCurrent;
lwpReschedule();
}
*sig = res;
return 0;
return res;
}
/*