diff options
| author | Timo Wischer <twischer@de.adit-jv.com> | 2018-02-28 11:38:56 +0100 |
|---|---|---|
| committer | Filipe Coelho <falktx@falktx.com> | 2018-08-08 21:03:49 +0200 |
| commit | 9fe6486c6e289c24d4d7d264ef49ff3fa64eeb7d (patch) | |
| tree | 3a327e64a3afb69bcf4e385c58cbdc3c047e87eb | |
| parent | 67e4b4368e73616a6e0aa020925ead75cd57221e (diff) | |
| download | jack2-9fe6486c6e289c24d4d7d264ef49ff3fa64eeb7d.tar.gz | |
jackdmp: Signal to systemd when ready
With this patch it is possibly to start the JACK daemon with a systemd
service file of type notify. The following provides an example service
file:
[Service]
Type=notify
ExecStart=/usr/bin/jackd -d alsa
[Install]
WantedBy=multi-user.target
Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
| -rw-r--r-- | common/Jackdmp.cpp | 12 | ||||
| -rw-r--r-- | wscript | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp index 3d634346..e7198f4d 100644 --- a/common/Jackdmp.cpp +++ b/common/Jackdmp.cpp @@ -43,6 +43,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "audio_reserve.h" #endif +#if HAVE_SYSTEMD +#include <systemd/sd-daemon.h> +#endif + /* This is a simple port of the old jackdmp.cpp file to use the new jack2 control API. Available options for the server are "hard-coded" in the source. A much better approach would be to use the control API to: @@ -624,6 +628,10 @@ int main(int argc, char** argv) notify_sent = true; return_value = 0; +#if HAVE_SYSTEMD + sd_notify(0, "READY=1"); +#endif + // Waits for signal #ifdef __ANDROID__ //reserve SIGUSR2 signal for switching master driver @@ -639,6 +647,10 @@ int main(int argc, char** argv) jackctl_wait_signals(sigmask); #endif +#if HAVE_SYSTEMD + sd_notify(0, "STOPPING=1"); +#endif + stop_server: if (!jackctl_server_stop(server_ctl)) { fprintf(stderr, "Cannot stop server...\n"); @@ -439,6 +439,9 @@ def options(opt): readline = add_auto_option(opt, 'readline', help='Build with readline') readline.add_library('readline') readline.set_check_hook(check_for_readline, check_for_readline_error) + sd = add_auto_option(opt, 'systemd', help='Use systemd notify') + sd.add_header('systemd/sd-daemon.h') + sd.add_library('systemd') # dbus options opt.recurse('dbus') @@ -728,7 +731,7 @@ def build_jackd(bld): includes = ['.', 'common', 'common/jack'], target = 'jackd', source = ['common/Jackdmp.cpp'], - use = ['serverlib'] + use = ['serverlib', 'SYSTEMD'] ) if bld.env['BUILD_JACKDBUS']: |