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

sd-event: treat NULL callback for timer events like sig events 

In both cases exit the event loop.
This commit is contained in:
Tom Gundersen 2015-02-01 18:06:40 +01:00
parent 5d8689d749
commit c4f1aff230
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -891,6 +891,12 @@ static int event_setup_timer_fd(
return 0;
}
static int time_exit_callback(sd_event_source *s, uint64_t usec, void *userdata) {
assert(s);
return sd_event_exit(sd_event_source_get_event(s), PTR_TO_INT(userdata));
}
_public_ int sd_event_add_time(
sd_event *e,
sd_event_source **ret,
@ -908,10 +914,12 @@ _public_ int sd_event_add_time(
assert_return(e, -EINVAL);
assert_return(usec != (uint64_t) -1, -EINVAL);
assert_return(accuracy != (uint64_t) -1, -EINVAL);
assert_return(callback, -EINVAL);
assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
assert_return(!event_pid_changed(e), -ECHILD);
if (!callback)
callback = time_exit_callback;
type = clock_to_event_source_type(clock);
assert_return(type >= 0, -ENOTSUP);