use explicit eventbase.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@408 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index f49067366e9429d534d41a948d06c138f390b149..aa84bb2a4760d92eac5df08a44b25800bfb5aee7 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -237,14 +237,19 @@ start_child(void)
        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);

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index ddbf6e882c1a282819fedba21a6369116f3b3ff9..cc2b776f6a17f4d0981d0a88ef022d547e65985d 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -309,6 +309,7 @@ testme(void)
        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);