sd-event: make it easy to bind signal handling to event loop exits

By passing a NULL callback provide a simple way to make event loops exit
on SIGTERM and other signals.

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 0ad6454fd79c246eff43f1d656d0adef100f4c39..70770fc7ad51e1c9f640eb6e899a14b2b417beb0 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -886,6 +886,12 @@ static int event_update_signal_fd(sd_event *e) {
         return 0;
 }
 
         return 0;
 }
 

+static int signal_exit_callback(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
+        assert(s);
+
+        return sd_event_exit(sd_event_source_get_event(s), PTR_TO_INT(userdata));
+}
+

 _public_ int sd_event_add_signal(
                 sd_event *e,
                 sd_event_source **ret,
 _public_ int sd_event_add_signal(
                 sd_event *e,
                 sd_event_source **ret,


@@ -900,11 +906,13 @@ _public_ int sd_event_add_signal(
         assert_return(e, -EINVAL);
         assert_return(sig > 0, -EINVAL);
         assert_return(sig < _NSIG, -EINVAL);
         assert_return(e, -EINVAL);
         assert_return(sig > 0, -EINVAL);
         assert_return(sig < _NSIG, -EINVAL);

-        assert_return(callback, -EINVAL);

         assert_return(ret, -EINVAL);
         assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
         assert_return(!event_pid_changed(e), -ECHILD);
 
         assert_return(ret, -EINVAL);
         assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
         assert_return(!event_pid_changed(e), -ECHILD);
 

+        if (!callback)
+                callback = signal_exit_callback;
+

         r = pthread_sigmask(SIG_SETMASK, NULL, &ss);
         if (r < 0)
                 return -errno;
         r = pthread_sigmask(SIG_SETMASK, NULL, &ss);
         if (r < 0)
                 return -errno;