X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-event%2Fsd-event.c;h=618d1b915ce7343955b15fcf05f6a6d390d763b1;hb=15411c0cb1192799b37ec8f25d6f30e8d7292fc6;hp=c92e065c76e9748f6b523e24c01da1c239d11e02;hpb=752bbf75b9b52c0faae29bb4b77a99c4bb0d298f;p=elogind.git diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index c92e065c7..618d1b915 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "sd-id128.h" #include "sd-daemon.h" @@ -37,7 +36,6 @@ #include "sd-event.h" -#define EPOLL_QUEUE_MAX 512U #define DEFAULT_ACCURACY_USEC (250 * USEC_PER_MSEC) typedef enum EventSourceType { @@ -66,7 +64,7 @@ struct sd_event_source { void *userdata; sd_event_handler_t prepare; - char *name; + char *description; EventSourceType type:5; int enabled:3; @@ -463,7 +461,7 @@ _public_ sd_event* sd_event_unref(sd_event *e) { static bool event_pid_changed(sd_event *e) { assert(e); - /* We don't support people creating am event loop and keeping + /* We don't support people creating an event loop and keeping * it around over a fork(). Let's complain. */ return e->original_pid != getpid(); @@ -590,6 +588,44 @@ static struct clock_data* event_get_clock_data(sd_event *e, EventSourceType t) { } } +static bool need_signal(sd_event *e, int signal) { + return (e->signal_sources && e->signal_sources[signal] && + e->signal_sources[signal]->enabled != SD_EVENT_OFF) + || + (signal == SIGCHLD && + e->n_enabled_child_sources > 0); +} + +static int event_update_signal_fd(sd_event *e) { + struct epoll_event ev = {}; + bool add_to_epoll; + int r; + + assert(e); + + add_to_epoll = e->signal_fd < 0; + + r = signalfd(e->signal_fd, &e->sigset, SFD_NONBLOCK|SFD_CLOEXEC); + if (r < 0) + return -errno; + + e->signal_fd = r; + + if (!add_to_epoll) + return 0; + + ev.events = EPOLLIN; + ev.data.ptr = INT_TO_PTR(SOURCE_SIGNAL); + + r = epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, e->signal_fd, &ev); + if (r < 0) { + e->signal_fd = safe_close(e->signal_fd); + return -errno; + } + + return 0; +} + static void source_disconnect(sd_event_source *s) { sd_event *event; @@ -626,11 +662,17 @@ static void source_disconnect(sd_event_source *s) { case SOURCE_SIGNAL: if (s->signal.sig > 0) { - if (s->signal.sig != SIGCHLD || s->event->n_enabled_child_sources == 0) - assert_se(sigdelset(&s->event->sigset, s->signal.sig) == 0); - if (s->event->signal_sources) s->event->signal_sources[s->signal.sig] = NULL; + + /* If the signal was on and now it is off... */ + if (s->enabled != SD_EVENT_OFF && !need_signal(s->event, s->signal.sig)) { + assert_se(sigdelset(&s->event->sigset, s->signal.sig) == 0); + + (void) event_update_signal_fd(s->event); + /* If disabling failed, we might get a spurious event, + * but otherwise nothing bad should happen. */ + } } break; @@ -640,10 +682,16 @@ static void source_disconnect(sd_event_source *s) { if (s->enabled != SD_EVENT_OFF) { assert(s->event->n_enabled_child_sources > 0); s->event->n_enabled_child_sources--; - } - if (!s->event->signal_sources || !s->event->signal_sources[SIGCHLD]) - assert_se(sigdelset(&s->event->sigset, SIGCHLD) == 0); + /* We know the signal was on, if it is off now... */ + if (!need_signal(s->event, SIGCHLD)) { + assert_se(sigdelset(&s->event->sigset, SIGCHLD) == 0); + + (void) event_update_signal_fd(s->event); + /* If disabling failed, we might get a spurious event, + * but otherwise nothing bad should happen. */ + } + } hashmap_remove(s->event->child_sources, INT_TO_PTR(s->child.pid)); } @@ -687,7 +735,7 @@ static void source_free(sd_event_source *s) { assert(s); source_disconnect(s); - free(s->name); + free(s->description); free(s); } @@ -841,6 +889,12 @@ static int event_setup_timer_fd( return 0; } +static int time_exit_callback(sd_event_source *s, uint64_t usec, void *userdata) { + assert(s); + + return sd_event_exit(sd_event_source_get_event(s), PTR_TO_INT(userdata)); +} + _public_ int sd_event_add_time( sd_event *e, sd_event_source **ret, @@ -858,12 +912,14 @@ _public_ int sd_event_add_time( assert_return(e, -EINVAL); assert_return(usec != (uint64_t) -1, -EINVAL); assert_return(accuracy != (uint64_t) -1, -EINVAL); - assert_return(callback, -EINVAL); assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); assert_return(!event_pid_changed(e), -ECHILD); + if (!callback) + callback = time_exit_callback; + type = clock_to_event_source_type(clock); - assert_return(type >= 0, -ENOTSUP); + assert_return(type >= 0, -EOPNOTSUPP); d = event_get_clock_data(e, type); assert(d); @@ -917,36 +973,6 @@ fail: return r; } -static int event_update_signal_fd(sd_event *e) { - struct epoll_event ev = {}; - bool add_to_epoll; - int r; - - assert(e); - - add_to_epoll = e->signal_fd < 0; - - r = signalfd(e->signal_fd, &e->sigset, SFD_NONBLOCK|SFD_CLOEXEC); - if (r < 0) - return -errno; - - e->signal_fd = r; - - if (!add_to_epoll) - return 0; - - ev.events = EPOLLIN; - ev.data.ptr = INT_TO_PTR(SOURCE_SIGNAL); - - r = epoll_ctl(e->epoll_fd, EPOLL_CTL_ADD, e->signal_fd, &ev); - if (r < 0) { - e->signal_fd = safe_close(e->signal_fd); - return -errno; - } - - return 0; -} - static int signal_exit_callback(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) { assert(s); @@ -963,6 +989,7 @@ _public_ int sd_event_add_signal( sd_event_source *s; sigset_t ss; int r; + bool previous; assert_return(e, -EINVAL); assert_return(sig > 0, -EINVAL); @@ -987,6 +1014,8 @@ _public_ int sd_event_add_signal( } else if (e->signal_sources[sig]) return -EBUSY; + previous = need_signal(e, sig); + s = source_new(e, !ret, SOURCE_SIGNAL); if (!s) return -ENOMEM; @@ -997,9 +1026,10 @@ _public_ int sd_event_add_signal( s->enabled = SD_EVENT_ON; e->signal_sources[sig] = s; - assert_se(sigaddset(&e->sigset, sig) == 0); - if (sig != SIGCHLD || e->n_enabled_child_sources == 0) { + if (!previous) { + assert_se(sigaddset(&e->sigset, sig) == 0); + r = event_update_signal_fd(e); if (r < 0) { source_free(s); @@ -1007,6 +1037,9 @@ _public_ int sd_event_add_signal( } } + /* Use the signal name as description for the event source by default */ + (void) sd_event_source_set_description(s, signal_to_string(sig)); + if (ret) *ret = s; @@ -1023,6 +1056,7 @@ _public_ int sd_event_add_child( sd_event_source *s; int r; + bool previous; assert_return(e, -EINVAL); assert_return(pid > 1, -EINVAL); @@ -1032,13 +1066,15 @@ _public_ int sd_event_add_child( assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); assert_return(!event_pid_changed(e), -ECHILD); - r = hashmap_ensure_allocated(&e->child_sources, trivial_hash_func, trivial_compare_func); + r = hashmap_ensure_allocated(&e->child_sources, NULL); if (r < 0) return r; if (hashmap_contains(e->child_sources, INT_TO_PTR(pid))) return -EBUSY; + previous = need_signal(e, SIGCHLD); + s = source_new(e, !ret, SOURCE_CHILD); if (!s) return -ENOMEM; @@ -1057,9 +1093,9 @@ _public_ int sd_event_add_child( e->n_enabled_child_sources ++; - assert_se(sigaddset(&e->sigset, SIGCHLD) == 0); + if (!previous) { + assert_se(sigaddset(&e->sigset, SIGCHLD) == 0); - if (!e->signal_sources || !e->signal_sources[SIGCHLD]) { r = event_update_signal_fd(e); if (r < 0) { source_free(s); @@ -1123,7 +1159,7 @@ _public_ int sd_event_add_post( assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); assert_return(!event_pid_changed(e), -ECHILD); - r = set_ensure_allocated(&e->post_sources, trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&e->post_sources, NULL); if (r < 0) return r; @@ -1226,29 +1262,20 @@ _public_ sd_event_source* sd_event_source_unref(sd_event_source *s) { return NULL; } -_public_ int sd_event_source_set_name(sd_event_source *s, const char *name) { - char *new_name = NULL; - +_public_ int sd_event_source_set_description(sd_event_source *s, const char *description) { assert_return(s, -EINVAL); + assert_return(!event_pid_changed(s->event), -ECHILD); - if (name) { - new_name = strdup(name); - if (!new_name) - return -ENOMEM; - } - - free(s->name); - s->name = new_name; - - return 0; + return free_and_strdup(&s->description, description); } -_public_ int sd_event_source_get_name(sd_event_source *s, const char **name) { +_public_ int sd_event_source_get_description(sd_event_source *s, const char **description) { assert_return(s, -EINVAL); - assert_return(name, -EINVAL); - - *name = s->name; + assert_return(description, -EINVAL); + assert_return(s->description, -ENXIO); + assert_return(!event_pid_changed(s->event), -ECHILD); + *description = s->description; return 0; } @@ -1448,23 +1475,32 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { } case SOURCE_SIGNAL: + assert(need_signal(s->event, s->signal.sig)); + s->enabled = m; - if (s->signal.sig != SIGCHLD || s->event->n_enabled_child_sources == 0) { + + if (!need_signal(s->event, s->signal.sig)) { assert_se(sigdelset(&s->event->sigset, s->signal.sig) == 0); - event_update_signal_fd(s->event); + + (void) event_update_signal_fd(s->event); + /* If disabling failed, we might get a spurious event, + * but otherwise nothing bad should happen. */ } break; case SOURCE_CHILD: + assert(need_signal(s->event, SIGCHLD)); + s->enabled = m; assert(s->event->n_enabled_child_sources > 0); s->event->n_enabled_child_sources--; - if (!s->event->signal_sources || !s->event->signal_sources[SIGCHLD]) { + if (!need_signal(s->event, SIGCHLD)) { assert_se(sigdelset(&s->event->sigset, SIGCHLD) == 0); - event_update_signal_fd(s->event); + + (void) event_update_signal_fd(s->event); } break; @@ -1512,22 +1548,34 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { } case SOURCE_SIGNAL: - s->enabled = m; - - if (s->signal.sig != SIGCHLD || s->event->n_enabled_child_sources == 0) { + /* Check status before enabling. */ + if (!need_signal(s->event, s->signal.sig)) { assert_se(sigaddset(&s->event->sigset, s->signal.sig) == 0); - event_update_signal_fd(s->event); + + r = event_update_signal_fd(s->event); + if (r < 0) { + s->enabled = SD_EVENT_OFF; + return r; + } } + + s->enabled = m; break; case SOURCE_CHILD: + /* Check status before enabling. */ if (s->enabled == SD_EVENT_OFF) { - s->event->n_enabled_child_sources++; - - if (!s->event->signal_sources || !s->event->signal_sources[SIGCHLD]) { - assert_se(sigaddset(&s->event->sigset, SIGCHLD) == 0); - event_update_signal_fd(s->event); + if (!need_signal(s->event, SIGCHLD)) { + assert_se(sigaddset(&s->event->sigset, s->signal.sig) == 0); + + r = event_update_signal_fd(s->event); + if (r < 0) { + s->enabled = SD_EVENT_OFF; + return r; + } } + + s->event->n_enabled_child_sources++; } s->enabled = m; @@ -1984,20 +2032,22 @@ static int process_signal(sd_event *e, uint32_t events) { for (;;) { struct signalfd_siginfo si; - ssize_t ss; + ssize_t n; sd_event_source *s = NULL; - ss = read(e->signal_fd, &si, sizeof(si)); - if (ss < 0) { + n = read(e->signal_fd, &si, sizeof(si)); + if (n < 0) { if (errno == EAGAIN || errno == EINTR) return read_one; return -errno; } - if (_unlikely_(ss != sizeof(si))) + if (_unlikely_(n != sizeof(si))) return -EIO; + assert(si.ssi_signo < _NSIG); + read_one = true; if (si.ssi_signo == SIGCHLD) { @@ -2113,10 +2163,10 @@ static int source_dispatch(sd_event_source *s) { s->dispatching = false; if (r < 0) { - if (s->name) - log_debug("Event source '%s' returned error, disabling: %s", s->name, strerror(-r)); + if (s->description) + log_debug_errno(r, "Event source '%s' returned error, disabling: %m", s->description); else - log_debug("Event source %p returned error, disabling: %s", s, strerror(-r)); + log_debug_errno(r, "Event source %p returned error, disabling: %m", s); } if (s->n_ref == 0) @@ -2151,10 +2201,10 @@ static int event_prepare(sd_event *e) { s->dispatching = false; if (r < 0) { - if (s->name) - log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->name, strerror(-r)); + if (s->description) + log_debug_errno(r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description); else - log_debug("Prepare callback of event source %p returned error, disabling: %s", s, strerror(-r)); + log_debug_errno(r, "Prepare callback of event source %p returned error, disabling: %m", s); } if (s->n_ref == 0) @@ -2315,7 +2365,7 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) { return 1; } - ev_queue_max = CLAMP(e->n_sources, 1U, EPOLL_QUEUE_MAX); + ev_queue_max = MAX(e->n_sources, 1u); ev_queue = newa(struct epoll_event, ev_queue_max); m = epoll_wait(e->epoll_fd, ev_queue, ev_queue_max,