misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make exec sockets nonblocking. Fix FD leakage when more than one exec is running.

Browse Source
This commit is contained in:
Ian Gulliver
2016-03-10 21:36:40 -08:00
parent 3bcbc0cbb0
commit c5f117dce5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
adsbus/exec.c
View File

@@ -1,4 +1,5 @@
#include <assert.h> #include <assert.h>
#include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -166,9 +167,11 @@ static void __attribute__ ((noreturn)) exec_child(const struct exec *exec, int d
static void exec_spawn(struct exec *exec) { static void exec_spawn(struct exec *exec) {
LOG(exec->id, "Executing: %s", exec->command); LOG(exec->id, "Executing: %s", exec->command);
int data_fds[2], log_fds[2]; int data_fds[2], log_fds[2];
// Leave these sockets blocking; we move in lock step with subprograms assert(!socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, data_fds));
assert(!socketpair(AF_UNIX, SOCK_STREAM, 0, data_fds)); assert(!socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, log_fds));
assert(!socketpair(AF_UNIX, SOCK_STREAM, 0, log_fds));
assert(!fcntl(data_fds[0], F_SETFD, FD_CLOEXEC));
assert(!fcntl(log_fds[0], F_SETFD, FD_CLOEXEC));
int res = fork(); int res = fork();
assert(res >= 0); assert(res >= 0);
@@ -178,8 +181,6 @@ static void exec_spawn(struct exec *exec) {
assert(!shutdown(log_fds[0], SHUT_WR)); assert(!shutdown(log_fds[0], SHUT_WR));
exec_parent(exec, res, data_fds[0], log_fds[0]); exec_parent(exec, res, data_fds[0], log_fds[0]);
} else { } else {
assert(!close(data_fds[0]));
assert(!close(log_fds[0]));
exec_child(exec, data_fds[1], log_fds[1]); exec_child(exec, data_fds[1], log_fds[1]);
} }
} }