r408 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Mon Jul 10 15:59:13 CEST 2006


Author: phk
Date: 2006-07-10 15:59:13 +0200 (Mon, 10 Jul 2006)
New Revision: 408

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
use explicit eventbase.


Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-07-10 13:58:24 UTC (rev 407)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-07-10 13:59:13 UTC (rev 408)
@@ -237,14 +237,19 @@
 	child_std = bufferevent_new(child_fds[0],
 	    std_rdcb, std_wrcb, std_excb, NULL);
 	assert(child_std != NULL);
+	bufferevent_base_set(mgt_eb, child_std);
 	bufferevent_enable(child_std, EV_READ);
+
 	child_cli0 = bufferevent_new(heritage.fds[0],
 	    cli_rdcb, cli_wrcb, cli_excb, NULL);
 	assert(child_cli0 != NULL);
+	bufferevent_base_set(mgt_eb, child_cli0);
 	bufferevent_enable(child_cli0, EV_READ);
+
 	child_cli1 = bufferevent_new(heritage.fds[3],
 	    cli_rdcb, cli_wrcb, cli_excb, NULL);
 	assert(child_cli1 != NULL);
+	bufferevent_base_set(mgt_eb, child_cli1);
 
 	evtimer_set(&ev_child_pingpong, child_pingpong, NULL);
 	event_base_set(mgt_eb, &ev_child_pingpong);

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2006-07-10 13:58:24 UTC (rev 407)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2006-07-10 13:59:13 UTC (rev 408)
@@ -309,6 +309,7 @@
 	cli = cli_setup(mgt_eb, 0, 1, 1, cli_proto);
 
 	signal_set(&e_sigchld, SIGCHLD, mgt_sigchld, NULL);
+	event_base_set(mgt_eb, &e_sigchld);
 	signal_add(&e_sigchld, NULL);
 
 	i = event_base_loop(mgt_eb, 0);




More information about the varnish-commit mailing list