summaryrefslogtreecommitdiffstats
path: root/src/fastd.c
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-05-23 02:59:46 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-05-23 02:59:46 +0200
commitd899fca42570d53c714d7656f628551939a2ac0c (patch)
tree2b9d6ba4dba2ede61488623c762ec4a541dd858e /src/fastd.c
parent47a34ece26a093102675e0a2dfc42c8182b98257 (diff)
downloadfastd-d899fca42570d53c714d7656f628551939a2ac0c.tar
fastd-d899fca42570d53c714d7656f628551939a2ac0c.zip
Implement a different fix for the waitpid race condition not needing a reaper thread for each child
Diffstat (limited to 'src/fastd.c')
-rw-r--r--src/fastd.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/fastd.c b/src/fastd.c
index 789b3a6..8dbfc74 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -75,7 +75,24 @@ static void on_sigusr1(int signo UNUSED) {
}
static void on_sigchld(int signo UNUSED) {
- while (waitpid(-1, NULL, WNOHANG) > 0) {}
+ size_t i;
+ for (i = 0; i < VECTOR_LEN(ctx.async_pids);) {
+ pid_t pid = VECTOR_INDEX(ctx.async_pids, i);
+ if (waitpid(pid, NULL, WNOHANG) > 0) {
+ pr_debug("child process %u finished", (unsigned)pid);
+ }
+ else {
+ if (errno == ECHILD) {
+ i++;
+ continue;
+ }
+ else {
+ pr_error_errno("waitpid");
+ }
+ }
+
+ VECTOR_DELETE(ctx.async_pids, i);
+ }
}
static void init_signals(void) {
@@ -579,6 +596,7 @@ int main(int argc, char *argv[]) {
VECTOR_ALLOC(ctx.eth_addrs, 0);
VECTOR_ALLOC(ctx.peers, 0);
+ VECTOR_ALLOC(ctx.async_pids, 0);
fastd_peer_hashtable_init();
@@ -625,6 +643,7 @@ int main(int argc, char *argv[]) {
fastd_peer_hashtable_free();
+ VECTOR_FREE(ctx.async_pids);
VECTOR_FREE(ctx.peers);
VECTOR_FREE(ctx.eth_addrs);