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

(empth_init_signals): Don't catch SIGINT and SIGTERM.

Browse source 
(empth_wait_for_shutdown): New.
(main): Use it to wait for shutdown signal, then shut down.  Closes
#770492.
(empth_exit): Remove the weird special case for main thread.

Implement empth_wait_for_shutdown() for EMPTH_LWP:
[EMPTH_LWP] (lwpInitSigWait, lwpSigWait, lwpSigWakeup): New.
Declaration of lwpSigWait was accidentally committed in the previous
revision of lwp.h.
[EMPTH_LWP] (lwpInitSystem): New parameter waitset, pass it on to
lwpInitSigWait().
[EMPTH_LWP] (lwpReschedule): Call lwpSigWakeup().
[EMPTH_LWP] (empth_init): Declare signals needed by
empth_wait_for_shutdown().
(empth_wait_for_shutdown): Implement on top of lwpSigWait().

Implement empth_wait_for_shutdown() for EMPTH_POSIX:
[EMPTH_POSIX] (empth_init): Block signals, so that
empth_wait_for_shutdown() can use sigwait() safely.
(empth_wait_for_shutdown): Implement on top of sigwait().

Implement empth_wait_for_shutdown() for EMPTH_W32:
(empth_wait_for_shutdown): Implement on top of loc_BlockMainThread().
This commit is contained in:
Markus Armbruster 2006-06-07 21:01:16 +00:00
parent f51769659c
commit 7183516d91
10 changed files with 251 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,12 +33,10 @@
#include <config.h>
#include <signal.h>
#include <time.h>
#include "empthread.h"
/* The thread `created' by lwpInitSystem() */
static empth_t *empth_main;
/* Flags that were passed to empth_init() */
static int empth_flags;
@ -46,9 +44,14 @@ static int empth_flags;
int
empth_init(void **ctx, int flags)
{
sigset_t set;
empth_flags = flags;
empth_init_signals();
empth_main = lwpInitSystem(PP_MAIN, (char **)ctx, flags);
sigemptyset(&set);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
lwpInitSystem(PP_MAIN, (char **)ctx, flags, &set);
return 0;
}
@ -71,16 +74,6 @@ empth_self(void)
void
empth_exit(void)
{
time_t now;
/* We want to leave the main thread around forever, until it's time
for it to die for real (in a shutdown) */
if (LwpCurrent == empth_main) {
while (1) {
time(&now);
lwpSleepUntil(now + 60);
}
}
lwpExit();
}
@ -114,6 +107,26 @@ empth_sleep(time_t until)
lwpSleepUntil(until);
}
int
empth_wait_for_shutdown(void)
{
sigset_t set;
int sig, err;
time_t now;
sigemptyset(&set);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
for (;;) {
err = lwpSigWait(&set, &sig);
if (CANT_HAPPEN(err)) {
time(&now);
lwpSleepUntil(now + 60);
continue;
}
return sig;
}
}
empth_sem_t *
empth_sem_create(char *name, int cnt)