|
 |
698723 |
From bf370d05bbc8c4d91c8c2b455116e59a24e48911 Mon Sep 17 00:00:00 2001
|
|
|
446ea3 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
446ea3 |
Date: Tue, 15 Jun 2021 02:03:02 +0900
|
|
|
446ea3 |
Subject: [PATCH] sd-event: make event_source_time_prioq_reshuffle() accept all
|
|
|
446ea3 |
event source type
|
|
|
446ea3 |
|
|
|
446ea3 |
But it does nothing for an event source which is neither a timer nor
|
|
|
446ea3 |
ratelimited.
|
|
|
446ea3 |
|
|
|
446ea3 |
(cherry picked from commit 5c08c7ab23dbf02aaf4e4bbae8e08a195da230a4)
|
|
|
446ea3 |
|
|
|
698723 |
Related: #1968528
|
|
|
446ea3 |
---
|
|
|
446ea3 |
src/libsystemd/sd-event/sd-event.c | 9 +++++----
|
|
|
446ea3 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
446ea3 |
|
|
|
446ea3 |
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
|
|
|
446ea3 |
index f675c09d84..ae46392901 100644
|
|
|
446ea3 |
--- a/src/libsystemd/sd-event/sd-event.c
|
|
|
446ea3 |
+++ b/src/libsystemd/sd-event/sd-event.c
|
|
|
446ea3 |
@@ -954,14 +954,15 @@ static void event_source_time_prioq_reshuffle(sd_event_source *s) {
|
|
|
446ea3 |
assert(s);
|
|
|
446ea3 |
|
|
|
446ea3 |
/* Called whenever the event source's timer ordering properties changed, i.e. time, accuracy,
|
|
|
446ea3 |
- * pending, enable state. Makes sure the two prioq's are ordered properly again. */
|
|
|
446ea3 |
+ * pending, enable state, and ratelimiting state. Makes sure the two prioq's are ordered
|
|
|
446ea3 |
+ * properly again. */
|
|
|
446ea3 |
|
|
|
446ea3 |
if (s->ratelimited)
|
|
|
446ea3 |
d = &s->event->monotonic;
|
|
|
446ea3 |
- else {
|
|
|
446ea3 |
- assert(EVENT_SOURCE_IS_TIME(s->type));
|
|
|
446ea3 |
+ else if (EVENT_SOURCE_IS_TIME(s->type))
|
|
|
446ea3 |
assert_se(d = event_get_clock_data(s->event, s->type));
|
|
|
446ea3 |
- }
|
|
|
446ea3 |
+ else
|
|
|
446ea3 |
+ return; /* no-op for an event source which is neither a timer nor ratelimited. */
|
|
|
446ea3 |
|
|
|
446ea3 |
prioq_reshuffle(d->earliest, s, &s->earliest_index);
|
|
|
446ea3 |
prioq_reshuffle(d->latest, s, &s->latest_index);
|