Merge a500d11f0f into dcd64ae48b

cage.c

@@ -54,6 +54,7 @@
 #endif
 
 #include "idle_inhibit_v1.h"
+#include "notify.h"
 #include "output.h"
 #include "seat.h"
 #include "server.h"
@@ -235,6 +236,16 @@ handle_signal(int signal, void *data)
 	}
 }
 
+static int
+handle_alive_timer(void *data)
+{
+	struct cg_server *server = data;
+
+	notify_set_state(CAGE_ALIVE);
+	wl_event_source_timer_update(server->alive_source, CAGE_ALIVE_PERIOD_MS);
+	return 0;
+}
+
 static void
 usage(FILE *file, const char *cage)
 {
@@ -326,6 +337,7 @@ main(int argc, char *argv[])
 	struct wl_event_loop *event_loop = wl_display_get_event_loop(server.wl_display);
 	struct wl_event_source *sigint_source = wl_event_loop_add_signal(event_loop, SIGINT, handle_signal, &server);
 	struct wl_event_source *sigterm_source = wl_event_loop_add_signal(event_loop, SIGTERM, handle_signal, &server);
+	server.alive_source = wl_event_loop_add_timer(event_loop, handle_alive_timer, &server);
 
 	server.backend = wlr_backend_autocreate(event_loop, &server.session);
 	if (!server.backend) {
@@ -625,8 +637,14 @@ main(int argc, char *argv[])
 	}
 
 	seat_center_cursor(server.seat);
+
+	notify_set_state(CAGE_READY);
+	wl_event_source_timer_update(server.alive_source, CAGE_ALIVE_PERIOD_MS);
+
 	wl_display_run(server.wl_display);
 
+	notify_set_state(CAGE_STOPPING);
+
 #if CAGE_HAS_XWAYLAND
 	if (xwayland) {
 		wl_list_remove(&server.new_xwayland_surface.link);
@@ -660,6 +678,7 @@ end:
 
 	wl_event_source_remove(sigint_source);
 	wl_event_source_remove(sigterm_source);
+	wl_event_source_remove(server.alive_source);
 	if (sigchld_source) {
 		wl_event_source_remove(sigchld_source);
 	}

config.h.in

@@ -2,6 +2,7 @@
 #define CG_CONFIG_H
 
 #mesondefine CAGE_HAS_XWAYLAND
+#mesondefine CAGE_HAS_SYSTEMD
 
 #mesondefine CAGE_VERSION
 

meson.build

@@ -39,6 +39,7 @@ wlroots        = dependency('wlroots-0.19', fallback: ['wlroots', 'wlroots'])
 wayland_protos = dependency('wayland-protocols', version: '>=1.14')
 wayland_server = dependency('wayland-server')
 xkbcommon      = dependency('xkbcommon')
+systemd        = dependency('libsystemd', required: get_option('systemd'))
 math           = cc.find_library('m')
 
 wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
@@ -82,6 +83,7 @@ endif
 
 conf_data = configuration_data()
 conf_data.set10('CAGE_HAS_XWAYLAND', have_xwayland)
+conf_data.set10('CAGE_HAS_SYSTEMD', systemd.found())
 conf_data.set_quoted('CAGE_VERSION', version)
 
 scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
@@ -136,6 +138,10 @@ if conf_data.get('CAGE_HAS_XWAYLAND', 0) == 1
   cage_headers += 'xwayland.h'
 endif
 
+if conf_data.get('CAGE_HAS_SYSTEMD', 0) == 1
+  cage_sources += 'notify_systemd.c'
+endif
+
 executable(
   meson.project_name(),
   cage_sources + cage_headers,
@@ -144,6 +150,7 @@ executable(
     wayland_server,
     wlroots,
     xkbcommon,
+    systemd,
     math,
   ],
   install: true,

meson_options.txt

@@ -1 +1,2 @@
 option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
+option('systemd', type: 'feature', value: 'disabled', description: 'Notify status to systemd')

notify.h

@@ -0,0 +1,24 @@
+#ifndef CG_NOTIFY_H
+#define CG_NOTIFY_H
+
+#include "config.h"
+
+#define CAGE_ALIVE_PERIOD_MS (20000)
+
+enum cg_notify_state {
+	CAGE_READY,
+	CAGE_ALIVE,
+	CAGE_STOPPING,
+};
+
+#if !CAGE_HAS_SYSTEMD
+static inline void
+notify_set_state(enum cg_notify_state state)
+{
+	/* Nothing */
+}
+#else
+void notify_set_state(enum cg_notify_state state);
+#endif
+
+#endif

notify_systemd.c

@@ -0,0 +1,33 @@
+/*
+ * Cage: A Wayland kiosk.
+ *
+ * Copyright (C) 2018-2020 Jente Hidskes
+ *
+ * See the LICENSE file accompanying this file.
+ */
+
+#include "config.h"
+
+#include <systemd/sd-daemon.h>
+
+#include "notify.h"
+
+void
+notify_set_state(enum cg_notify_state state)
+{
+	const char *sd_state;
+
+	switch (state) {
+	case CAGE_READY:
+		sd_state = "READY=1";
+		break;
+	case CAGE_ALIVE:
+		sd_state = "WATCHDOG=1";
+		break;
+	case CAGE_STOPPING:
+		sd_state = "STOPPING=1";
+		break;
+	}
+
+	sd_notify(0, sd_state);
+}

server.h

@@ -75,6 +75,7 @@ struct cg_server {
 	bool return_app_code;
 	bool terminated;
 	enum wlr_log_importance log_level;
+	struct wl_event_source *alive_source;
 };
 
 void server_terminate(struct cg_server *server);