You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
72 lines
2.3 KiB
72 lines
2.3 KiB
2 years ago
|
From 6cc0022115afbac9ac66c456b140601d90271687 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Mon, 23 Nov 2020 11:40:24 +0100
|
||
|
|
Subject: [PATCH] sd-event: split clock data allocation out of
|
||
|
|
sd_event_add_time()
|
||
|
|
|
||
|
|
Just some simple refactoring, that will make things easier for us later.
|
||
|
|
But it looks better this way even without the later function reuse.
|
||
|
|
|
||
|
|
(cherry picked from commit 41c63f36c3352af8bebf03b6181f5d866431d0af)
|
||
|
|
|
||
|
|
Related: #1819868
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-event/sd-event.c | 34 ++++++++++++++++++++----------
|
||
|
|
1 file changed, 23 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
|
||
|
|
index 0f507f18d8..dc78dc7291 100644
|
||
|
|
--- a/src/libsystemd/sd-event/sd-event.c
|
||
|
|
+++ b/src/libsystemd/sd-event/sd-event.c
|
||
|
|
@@ -1232,6 +1232,28 @@ static int time_exit_callback(sd_event_source *s, uint64_t usec, void *userdata)
|
||
|
|
return sd_event_exit(sd_event_source_get_event(s), PTR_TO_INT(userdata));
|
||
|
|
}
|
||
|
|
|
||
|
|
+static int setup_clock_data(sd_event *e, struct clock_data *d, clockid_t clock) {
|
||
|
|
+ int r;
|
||
|
|
+
|
||
|
|
+ assert(d);
|
||
|
|
+
|
||
|
|
+ if (d->fd < 0) {
|
||
|
|
+ r = event_setup_timer_fd(e, d, clock);
|
||
|
|
+ if (r < 0)
|
||
|
|
+ return r;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ r = prioq_ensure_allocated(&d->earliest, earliest_time_prioq_compare);
|
||
|
|
+ if (r < 0)
|
||
|
|
+ return r;
|
||
|
|
+
|
||
|
|
+ r = prioq_ensure_allocated(&d->latest, latest_time_prioq_compare);
|
||
|
|
+ if (r < 0)
|
||
|
|
+ return r;
|
||
|
|
+
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
_public_ int sd_event_add_time(
|
||
|
|
sd_event *e,
|
||
|
|
sd_event_source **ret,
|
||
|
|
@@ -1265,20 +1287,10 @@ _public_ int sd_event_add_time(
|
||
|
|
d = event_get_clock_data(e, type);
|
||
|
|
assert(d);
|
||
|
|
|
||
|
|
- r = prioq_ensure_allocated(&d->earliest, earliest_time_prioq_compare);
|
||
|
|
- if (r < 0)
|
||
|
|
- return r;
|
||
|
|
-
|
||
|
|
- r = prioq_ensure_allocated(&d->latest, latest_time_prioq_compare);
|
||
|
|
+ r = setup_clock_data(e, d, clock);
|
||
|
|
if (r < 0)
|
||
|
|
return r;
|
||
|
|
|
||
|
|
- if (d->fd < 0) {
|
||
|
|
- r = event_setup_timer_fd(e, d, clock);
|
||
|
|
- if (r < 0)
|
||
|
|
- return r;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
s = source_new(e, !ret, type);
|
||
|
|
if (!s)
|
||
|
|
return -ENOMEM;
|