markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Revert inappropriate commenting out of code

master
Con Kolivas 10 years ago
parent
73e807a6b6
commit
30e36979ca
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/ckpool.c

6
src/ckpool.c
Unescape View File

@ -835,7 +835,7 @@ static void __shutdown_children(ckpool_t *ckp, int sig)
int i; int i;
pthread_cancel(ckp->pth_watchdog); pthread_cancel(ckp->pth_watchdog);
//join_pthread(ckp->pth_watchdog); join_pthread(ckp->pth_watchdog);
for (i = 0; i < ckp->proc_instances; i++) { for (i = 0; i < ckp->proc_instances; i++) {
pid_t pid = ckp->children[i]->pid; 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) static void shutdown_children(ckpool_t *ckp, int sig)
{ {
pthread_cancel(ckp->pth_watchdog); pthread_cancel(ckp->pth_watchdog);
//join_pthread(ckp->pth_watchdog); join_pthread(ckp->pth_watchdog);
__shutdown_children(ckp, sig); __shutdown_children(ckp, sig);
} }
@ -859,7 +859,7 @@ static void sighandler(int sig)
LOGWARNING("Parent process %s received signal %d, shutting down", LOGWARNING("Parent process %s received signal %d, shutting down",
ckp->name, sig); ckp->name, sig);
pthread_cancel(ckp->pth_watchdog); pthread_cancel(ckp->pth_watchdog);
//join_pthread(ckp->pth_watchdog); join_pthread(ckp->pth_watchdog);
__shutdown_children(ckp, SIGTERM); __shutdown_children(ckp, SIGTERM);
/* Wait a second, then send SIGKILL */ /* Wait a second, then send SIGKILL */

Write Preview
Loading…
Cancel
Save