Flock: Even more fd cleanupc

diff --git a/flock/container.c b/flock/container.c
index 8634f36789c61b484101efb9c7e239b028e05de0..74457036b4f62656c3cf601bec48a47fd214b9eb 100644 (file)
--- a/flock/container.c
+++ b/flock/container.c
@@ -403,6 +403,10 @@ container_mainloop(int fd)
 
   container_init_logger();
 
+  /* Run worker threads */
+  struct thread_config tc = {};
+  bird_thread_commit(&tc);
+
   while (1)
   {
     struct pollfd pfd = {

diff --git a/flock/hypervisor.c b/flock/hypervisor.c
index 50fff418deb2e2b2fdf0322e7c4f174f3fabaaaa..8513b08028a6d349889eb7f3989ae3356d9bbec1 100644 (file)
--- a/flock/hypervisor.c
+++ b/flock/hypervisor.c
@@ -407,6 +407,7 @@ hexp_cleanup_after_fork(void)
 {
   birdloop_enter(he.loop);
   rp_free(he.p);
+  rem_node((node *) he.loop); /* FIXME: this is terrible but i'm lazy now */
   birdloop_leave(he.loop);
   birdloop_free(he.loop);
 }