shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-17 21:45:23 +03:00
Code Activity

Merge pull request #72 from teg/event-fork-unref

Browse Source 
sd-event: don't touch fd's accross forks
This commit is contained in:
David Herrmann
2015-06-04 19:21:17 +02:00
parent 5c9e74f738 f68067348f
commit 72db4d960c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,6 +474,9 @@ static int source_io_unregister(sd_event_source *s) {
assert(s); assert(s);
assert(s->type == SOURCE_IO); assert(s->type == SOURCE_IO);
if (event_pid_changed(s->event))
return 0;
if (!s->io.registered) if (!s->io.registered)
return 0; return 0;
@@ -604,6 +607,9 @@ static int event_update_signal_fd(sd_event *e) {
assert(e); assert(e);
if (event_pid_changed(e))
return 0;
add_to_epoll = e->signal_fd < 0; add_to_epoll = e->signal_fd < 0;
r = signalfd(e->signal_fd, &e->sigset, SFD_NONBLOCK|SFD_CLOEXEC); r = signalfd(e->signal_fd, &e->sigset, SFD_NONBLOCK|SFD_CLOEXEC);