diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-10-24 13:44:45 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-24 13:45:24 +0200 |
| commit | 4dffec1459f50ac9f8f67ccfcb79836b4ed5a50e (patch) | |
| tree | bcf88a9132ec2d464b9311a44c797540bb68f738 /src/core/manager.c | |
| parent | 820c095831a352e669be23e5471f11e15b6db344 (diff) | |
manager: Linux on hppa has fewer rtsigs, hence avoid using the higher ones there
https://bugs.freedesktop.org/show_bug.cgi?id=84931
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 1a5d252d36..b790d18bbe 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -307,11 +307,14 @@ static int manager_setup_signals(Manager *m) { if (m->test_run) return 0; - /* We are not interested in SIGSTOP and friends. */ assert_se(sigaction(SIGCHLD, &sa, NULL) == 0); - assert_se(sigemptyset(&mask) == 0); + /* We make liberal use of realtime signals here. On + * Linux/glibc we have 30 of them (with the exception of Linux + * on hppa, see below), between SIGRTMIN+0 ... SIGRTMIN+30 + * (aka SIGRTMAX). */ + assert_se(sigemptyset(&mask) == 0); sigset_add_many(&mask, SIGCHLD, /* Child died */ SIGTERM, /* Reexecute daemon */ @@ -321,6 +324,7 @@ static int manager_setup_signals(Manager *m) { SIGINT, /* Kernel sends us this on control-alt-del */ SIGWINCH, /* Kernel sends us this on kbrequest (alt-arrowup) */ SIGPWR, /* Some kernel drivers and upsd send us this on power failure */ + SIGRTMIN+0, /* systemd: start default.target */ SIGRTMIN+1, /* systemd: isolate rescue.target */ SIGRTMIN+2, /* systemd: isolate emergency.target */ @@ -328,19 +332,40 @@ static int manager_setup_signals(Manager *m) { SIGRTMIN+4, /* systemd: start poweroff.target */ SIGRTMIN+5, /* systemd: start reboot.target */ SIGRTMIN+6, /* systemd: start kexec.target */ + + /* ... space for more special targets ... */ + SIGRTMIN+13, /* systemd: Immediate halt */ SIGRTMIN+14, /* systemd: Immediate poweroff */ SIGRTMIN+15, /* systemd: Immediate reboot */ SIGRTMIN+16, /* systemd: Immediate kexec */ + + /* ... space for more immediate system state changes ... */ + SIGRTMIN+20, /* systemd: enable status messages */ SIGRTMIN+21, /* systemd: disable status messages */ SIGRTMIN+22, /* systemd: set log level to LOG_DEBUG */ SIGRTMIN+23, /* systemd: set log level to LOG_INFO */ SIGRTMIN+24, /* systemd: Immediate exit (--user only) */ + + /* .. one free signal here ... */ + +#if !defined(__hppa64__) && !defined(__hppa__) + /* Apparently Linux on hppa has fewer RT + * signals (SIGRTMAX is SIGRTMIN+25 there), + * hence let's not try to make use of them + * here. Since these commands are accessible + * by different means and only really a safety + * net, the missing functionality on hppa + * shouldn't matter. */ + SIGRTMIN+26, /* systemd: set log target to journal-or-kmsg */ SIGRTMIN+27, /* systemd: set log target to console */ SIGRTMIN+28, /* systemd: set log target to kmsg */ SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete)*/ + + /* ... one free signal here SIGRTMIN+30 ... */ +#endif -1); assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); |