diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-06-15 02:03:02 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-06-15 02:34:16 +0900 |
commit | 5c08c7ab23dbf02aaf4e4bbae8e08a195da230a4 (patch) | |
tree | e2641fd07e6e9a39e25954832f076cc7c40680e3 | |
parent | a595fb5ca9c69c589e758e9ebe3b70ac90450ba3 (diff) | |
download | systemd-5c08c7ab23dbf02aaf4e4bbae8e08a195da230a4.tar.gz |
sd-event: make event_source_time_prioq_reshuffle() accept all event source type
But it does nothing for an event source which is neither a timer nor
ratelimited.
-rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index b2c2074e81..bf27fff84c 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -771,14 +771,15 @@ static void event_source_time_prioq_reshuffle(sd_event_source *s) { assert(s); /* Called whenever the event source's timer ordering properties changed, i.e. time, accuracy, - * pending, enable state. Makes sure the two prioq's are ordered properly again. */ + * pending, enable state, and ratelimiting state. Makes sure the two prioq's are ordered + * properly again. */ if (s->ratelimited) d = &s->event->monotonic; - else { - assert(EVENT_SOURCE_IS_TIME(s->type)); + else if (EVENT_SOURCE_IS_TIME(s->type)) assert_se(d = event_get_clock_data(s->event, s->type)); - } + else + return; /* no-op for an event source which is neither a timer nor ratelimited. */ prioq_reshuffle(d->earliest, s, &s->earliest_index); prioq_reshuffle(d->latest, s, &s->latest_index); |