From 6a7ceac82d57bd6be36f4f1b27e74e1193529c98 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Mon, 3 Dec 2012 16:13:23 +0400
Subject: [PATCH] asio: init and free added to bootstrap.

---
 src/asio.m      | 1 -
 src/tarantool.m | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/asio.m b/src/asio.m
index c0c9d42854..c5ed06da57 100644
--- a/src/asio.m
+++ b/src/asio.m
@@ -116,7 +116,6 @@ asio_init(void)
 	ev_async_start(&asio_mgr.asio_watcher);
 
 	eio_init(asio_poller, NULL);
-	return 0;
 }
 
 static inline void
diff --git a/src/tarantool.m b/src/tarantool.m
index c0ee8387cc..c522215450 100644
--- a/src/tarantool.m
+++ b/src/tarantool.m
@@ -48,6 +48,7 @@
 #include <admin.h>
 #include <replication.h>
 #include <fiber.h>
+#include <asio.h>
 #include <iproto.h>
 #include <latch.h>
 #include <recovery.h>
@@ -592,6 +593,7 @@ tarantool_free(void)
 	destroy_tarantool_cfg(&cfg);
 
 	fiber_free();
+	asio_free();
 	palloc_free();
 	ev_default_destroy();
 #ifdef ENABLE_GCOV
@@ -608,6 +610,7 @@ initialize(double slab_alloc_arena, int slab_alloc_minimal, double slab_alloc_fa
 	if (!salloc_init(slab_alloc_arena * (1 << 30), slab_alloc_minimal, slab_alloc_factor))
 		panic_syserror("can't initialize slab allocator");
 	fiber_init();
+	asio_init();
 }
 
 static void
-- 
GitLab