[Tarantool-patches] [PATCH 4/4] fiber: allocate on_stop triggers using mempool

olegrok at tarantool.org olegrok at tarantool.org
Wed Aug 11 23:33:31 MSK 2021


From: Oleg Babin <babinoleg at mail.ru>

Previously we use malloc for such purpose however we created
on_stop triggers only if fiber storage was touched. Currently we
create on_stop trigger for each lua fiber. So it seems reasonable
to use mempool for such frequent allocations/deallocations.
---
 src/lua/fiber.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/lua/fiber.c b/src/lua/fiber.c
index 268ddf9cc..f7c0ca63f 100644
--- a/src/lua/fiber.c
+++ b/src/lua/fiber.c
@@ -36,10 +36,19 @@
 #include "backtrace.h"
 #include "tt_static.h"
 
+#include <small/mempool.h>
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
 
+static struct mempool on_stop_triggers_pool;
+
+static void
+on_stop_trigger_free(struct trigger *t)
+{
+	mempool_free(&on_stop_triggers_pool, t);
+}
+
 void
 luaL_testcancel(struct lua_State *L)
 {
@@ -110,7 +119,7 @@ lbox_fiber_on_stop(struct trigger *trigger, void *event)
 	luaL_unref(tarantool_L, LUA_REGISTRYINDEX, ref);
 	f->storage.lua.ref = LUA_NOREF;
 	trigger_clear(trigger);
-	free(trigger);
+	on_stop_trigger_free(trigger);
 	return 0;
 }
 
@@ -122,12 +131,13 @@ lbox_pushfiber(struct lua_State *L, struct fiber *f)
 {
 	int ref = f->storage.lua.ref;
 	if (ref <= 0) {
-		struct trigger *t = (struct trigger *)malloc(sizeof(*t));
+		struct trigger *t = mempool_alloc(&on_stop_triggers_pool);;
 		if (t == NULL) {
 			diag_set(OutOfMemory, sizeof(*t), "malloc", "t");
 			luaT_error(L);
 		}
-		trigger_create(t, lbox_fiber_on_stop, NULL, (trigger_f0) free);
+		trigger_create(t, lbox_fiber_on_stop, NULL,
+				 on_stop_trigger_free);
 		trigger_add(&f->on_stop, t);
 
 		uint64_t fid = f->fid;
@@ -921,6 +931,9 @@ static const struct luaL_Reg fiberlib[] = {
 void
 tarantool_lua_fiber_init(struct lua_State *L)
 {
+	mempool_create(&on_stop_triggers_pool, &cord()->slabc,
+				   sizeof(struct trigger));
+
 	luaL_register_module(L, fiberlib_name, fiberlib);
 	lua_pop(L, 1);
 	luaL_register_type(L, fiberlib_name, lbox_fiber_meta);
-- 
2.32.0



More information about the Tarantool-patches mailing list