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/pthread.c
View file

@ -144,12 +144,17 @@ int
empth_init(void **ctx_ptr, int flags)
{
empth_t *ctx;
sigset_t set;
struct sigaction act;
empth_flags = flags;
udata = ctx_ptr;
empth_init_signals();
sigemptyset(&set);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
pthread_sigmask(SIG_BLOCK, &set, NULL);
act.sa_flags = 0;
sigemptyset(&act.sa_mask);
act.sa_handler = empth_alarm;
@ -256,20 +261,9 @@ empth_self(void)
void
empth_exit(void)
{
empth_t *ctx_ptr;
pthread_mutex_unlock(&mtx_ctxsw);
empth_status("empth_exit");
ctx_ptr = pthread_getspecific(ctx_key);
/* We want to leave the main thread around forever, until it's time
for it to die for real (in a shutdown) */
if (!strcmp(ctx_ptr->name, "Main")) {
while (1) {
sleep(60);
}
}
free(ctx_ptr);
pthread_mutex_unlock(&mtx_ctxsw);
free(pthread_getspecific(ctx_key));
pthread_exit(0);
}
@ -351,7 +345,6 @@ empth_select(int fd, int flags)
}
static void
empth_alarm(int sig)
{
@ -386,6 +379,26 @@ empth_sleep(time_t until)
empth_restorectx();
}
int
empth_wait_for_shutdown(void)
{
sigset_t set;
int sig, err;
sigemptyset(&set);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGTERM);
for (;;) {
empth_status("waiting for signals");
err = sigwait(&set, &sig);
if (CANT_HAPPEN(err)) {
sleep(60);
continue;
}
empth_status("got awaited signal %d", sig);
return sig;
}
}
empth_sem_t *
empth_sem_create(char *name, int cnt)