r80 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Mon Mar 27 15:59:09 CEST 2006


Author: phk
Date: 2006-03-27 15:59:09 +0200 (Mon, 27 Mar 2006)
New Revision: 80

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
Log:
Just return if there is nothing to wait for.  We get SIGCHLD'ed on
the popen child process.



Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-03-27 13:57:34 UTC (rev 79)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-03-27 13:59:09 UTC (rev 80)
@@ -188,7 +188,7 @@
 	time(&t);
 	mgt_child_request(child_pingpong_ccb, NULL, NULL, "ping %ld", t);
 	if (1) {
-		tv.tv_sec = 3;
+		tv.tv_sec = 30;
 		tv.tv_usec = 0;
 		evtimer_del(&ev_child_pingpong);
 		evtimer_add(&ev_child_pingpong, &tv);
@@ -284,6 +284,8 @@
 	printf("sig_chld(%d, %d, %p)\n", a, b, c);
 
 	p = wait4(-1, &status, WNOHANG, NULL);
+	if (p == 0)
+		return;
 	printf("pid = %d status = 0x%x\n", p, status);
 	assert(p == child_pid);
 




More information about the varnish-commit mailing list