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

sd-event: increase n_enabled_child_sources just once

Browse source 
Neither source_child_pidfd_register() nor event_make_signal_data() look at
n_enabled_child_sources.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-11-10 12:57:34 +01:00
parent d2eafe61ca
commit ac9f2640cb
1 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/libsystemd/sd-event/sd-event.c
View file

@ -1340,31 +1340,25 @@ _public_ int sd_event_add_child(
if (r < 0)
return r;
e->n_enabled_child_sources++;
if (EVENT_SOURCE_WATCH_PIDFD(s)) {
/* We have a pidfd and we only want to watch for exit */
r = source_child_pidfd_register(s, s->enabled);
if (r < 0) {
e->n_enabled_child_sources--;
if (r < 0)
return r;
}
} else {
/* We have no pidfd or we shall wait for some other event than WEXITED */
r = event_make_signal_data(e, SIGCHLD, NULL);
if (r < 0) {
e->n_enabled_child_sources--;
if (r < 0)
return r;
}
e->need_process_child = true;
}
e->n_enabled_child_sources++;
if (ret)
*ret = s;
TAKE_PTR(s);
return 0;
}
@ -1429,31 +1423,24 @@ _public_ int sd_event_add_child_pidfd(
if (r < 0)
return r;
e->n_enabled_child_sources++;
if (EVENT_SOURCE_WATCH_PIDFD(s)) {
/* We only want to watch for WEXITED */
r = source_child_pidfd_register(s, s->enabled);
if (r < 0) {
e->n_enabled_child_sources--;
if (r < 0)
return r;
}
} else {
/* We shall wait for some other event than WEXITED */
r = event_make_signal_data(e, SIGCHLD, NULL);
if (r < 0) {
e->n_enabled_child_sources--;
if (r < 0)
return r;
}
e->need_process_child = true;
}
e->n_enabled_child_sources++;
if (ret)
*ret = s;
TAKE_PTR(s);
return 0;
}
@ -2342,27 +2329,24 @@ static int event_source_enable(sd_event_source *s, int enable) {
break;
case SOURCE_CHILD:
s->event->n_enabled_child_sources++;
if (EVENT_SOURCE_WATCH_PIDFD(s)) {
/* yes, we have pidfd */
r = source_child_pidfd_register(s, enable);
if (r < 0) {
s->event->n_enabled_child_sources--;
if (r < 0)
return r;
}
} else {
/* no pidfd, or something other to watch for than WEXITED */
r = event_make_signal_data(s->event, SIGCHLD, NULL);
if (r < 0) {
s->event->n_enabled_child_sources--;
event_gc_signal_data(s->event, &s->priority, SIGCHLD);
return r;
}
}
s->event->n_enabled_child_sources++;
break;
case SOURCE_TIME_REALTIME: