From 30e36979caa7a75a191575bbefdfa11fe7c9ef93 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Thu, 7 Aug 2014 21:04:10 +1000 Subject: [PATCH] Revert inappropriate commenting out of code --- src/ckpool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ckpool.c b/src/ckpool.c index 6f9aef2d..fa96d6f1 100644 --- a/src/ckpool.c +++ b/src/ckpool.c @@ -835,7 +835,7 @@ static void __shutdown_children(ckpool_t *ckp, int sig) int i; pthread_cancel(ckp->pth_watchdog); - //join_pthread(ckp->pth_watchdog); + join_pthread(ckp->pth_watchdog); for (i = 0; i < ckp->proc_instances; i++) { pid_t pid = ckp->children[i]->pid; @@ -847,7 +847,7 @@ static void __shutdown_children(ckpool_t *ckp, int sig) static void shutdown_children(ckpool_t *ckp, int sig) { pthread_cancel(ckp->pth_watchdog); - //join_pthread(ckp->pth_watchdog); + join_pthread(ckp->pth_watchdog); __shutdown_children(ckp, sig); } @@ -859,7 +859,7 @@ static void sighandler(int sig) LOGWARNING("Parent process %s received signal %d, shutting down", ckp->name, sig); pthread_cancel(ckp->pth_watchdog); - //join_pthread(ckp->pth_watchdog); + join_pthread(ckp->pth_watchdog); __shutdown_children(ckp, SIGTERM); /* Wait a second, then send SIGKILL */