sd-event: remove earliest_index/latest_index into common part of event source objects

So far we used these fields to organize the earliest/latest timer event
priority queue.  In a follow-up commit we want to introduce ratelimiting
to event sources, at which point we want any kind of event source to be
able to trigger time wakeups, and hence they all need to be included in
the earliest/latest prioqs.  Thus, in preparation let's make this
generic.

No change in behaviour, just some shifting around of struct members from
the type-specific to the generic part.

(cherry picked from commit f41315fceb5208c496145cda2d6c865a5458ce44)

Related: #1819868

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 739296abcfec76731875ee4df3d44dad228c4a3f..34b42c298f66e52a62693e8218b227ce1dec95a3 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -107,6 +107,9 @@ struct sd_event_source {
 
         LIST_FIELDS(sd_event_source, sources);
 
+        unsigned earliest_index;
+        unsigned latest_index;
+
         union {
                 struct {
                         sd_event_io_handler_t callback;
@@ -119,8 +122,6 @@ struct sd_event_source {
                 struct {
                         sd_event_time_handler_t callback;
                         usec_t next, accuracy;
-                        unsigned earliest_index;
-                        unsigned latest_index;
                 } time;
                 struct {
                         sd_event_signal_handler_t callback;
@@ -908,8 +909,8 @@ static void event_source_time_prioq_reshuffle(sd_event_source *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. */
         assert_se(d = event_get_clock_data(s->event, s->type));
-        prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
-        prioq_reshuffle(d->latest, s, &s->time.latest_index);
+        prioq_reshuffle(d->earliest, s, &s->earliest_index);
+        prioq_reshuffle(d->latest, s, &s->latest_index);
         d->needs_rearm = true;
 }
 
@@ -920,9 +921,9 @@ static void event_source_time_prioq_remove(
         assert(s);
         assert(d);
 
-        prioq_remove(d->earliest, s, &s->time.earliest_index);
-        prioq_remove(d->latest, s, &s->time.latest_index);
-        s->time.earliest_index = s->time.latest_index = PRIOQ_IDX_NULL;
+        prioq_remove(d->earliest, s, &s->earliest_index);
+        prioq_remove(d->latest, s, &s->latest_index);
+        s->earliest_index = s->latest_index = PRIOQ_IDX_NULL;
         d->needs_rearm = true;
 }
 
@@ -1271,14 +1272,14 @@ static int event_source_time_prioq_put(
         assert(s);
         assert(d);
 
-        r = prioq_put(d->earliest, s, &s->time.earliest_index);
+        r = prioq_put(d->earliest, s, &s->earliest_index);
         if (r < 0)
                 return r;
 
-        r = prioq_put(d->latest, s, &s->time.latest_index);
+        r = prioq_put(d->latest, s, &s->latest_index);
         if (r < 0) {
-                assert_se(prioq_remove(d->earliest, s, &s->time.earliest_index) > 0);
-                s->time.earliest_index = PRIOQ_IDX_NULL;
+                assert_se(prioq_remove(d->earliest, s, &s->earliest_index) > 0);
+                s->earliest_index = PRIOQ_IDX_NULL;
                 return r;
         }
 
@@ -1329,7 +1330,7 @@ _public_ int sd_event_add_time(
         s->time.next = usec;
         s->time.accuracy = accuracy == 0 ? DEFAULT_ACCURACY_USEC : accuracy;
         s->time.callback = callback;
-        s->time.earliest_index = s->time.latest_index = PRIOQ_IDX_NULL;
+        s->earliest_index = s->latest_index = PRIOQ_IDX_NULL;
         s->userdata = userdata;
         s->enabled = SD_EVENT_ONESHOT;