diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-05-25 17:06:39 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-06-06 10:23:12 +0200 |
| commit | ac989a783a31df95e6c0ce2a90a8d2e1abe73592 (patch) | |
| tree | 9907599c5c7ce005fa6037d85e16d2a11027b183 /src/libsystemd | |
| parent | de05913d067767cbf6ca7c4e3554a14fd4e2bb12 (diff) | |
| download | systemd-ac989a783a31df95e6c0ce2a90a8d2e1abe73592.tar.gz | |
sd-event: drop pending events when we turn off/on an event source
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 7d6096261b..3dc0cdb957 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -1638,6 +1638,13 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { if (m == SD_EVENT_OFF) { + /* Unset the pending flag when this event source is disabled */ + if (!IN_SET(s->type, SOURCE_DEFER, SOURCE_EXIT)) { + r = source_set_pending(s, false); + if (r < 0) + return r; + } + switch (s->type) { case SOURCE_IO: @@ -1692,6 +1699,14 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { } } else { + + /* Unset the pending flag when this event source is enabled */ + if (s->enabled == SD_EVENT_OFF && !IN_SET(s->type, SOURCE_DEFER, SOURCE_EXIT)) { + r = source_set_pending(s, false); + if (r < 0) + return r; + } + switch (s->type) { case SOURCE_IO: |