picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Lennart Poettering 2020-11-23 11:40:24 +01:00
parent f80a5d6a86
commit 41c63f36c3
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/libsystemd/sd-event/sd-event.c
View File

@ -1088,6 +1088,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,
@ -1121,20 +1143,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);
r = setup_clock_data(e, d, clock);
if (r < 0)
return r;
r = prioq_ensure_allocated(&d->latest, latest_time_prioq_compare);
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;