From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id BE4836EC40; Wed, 11 Aug 2021 23:35:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BE4836EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628714106; bh=NMVi1u0vXStTHuLbMzoEHsftD5uaPgxVNgZ+c6lqdfA=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=DhYTEwjxQRCag42SWMWHWf+OMckcmYEf39UJWEPqIaPoJX8IHrn8903T7Ui92HdOc I2g3QwJgVuV+5q34WHaNtRMrh7uPzi7qpbvH+pcEh6O3BygW6frwhImLLAGbkrajGX R/8E/jt8ZNLQQLkfOyGYgz+rIlhcRU8tkK+stQ9A= Received: from smtp30.i.mail.ru (smtp30.i.mail.ru [94.100.177.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id CAE6F6EC42 for ; Wed, 11 Aug 2021 23:33:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CAE6F6EC42 Received: by smtp30.i.mail.ru with esmtpa (envelope-from ) id 1mDuur-0007H4-UL; Wed, 11 Aug 2021 23:33:34 +0300 To: v.shpilevoy@tarantool.org, imun@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 11 Aug 2021 23:33:30 +0300 Message-Id: <3453bc40af586cf4242863f1307f72fe5c5a408a.1628713520.git.babinoleg@mail.ru> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD91BCCB18F2C129F87F36E61E9E4584E9D182A05F5380850407F8FCFDBECC0CA107D70622C6B32BDAEAA62749C6CCAFC1E3671D2F3E561CA1A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73F300A97FDD4E158EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063786D6A7D810B9582D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D831757AA11E061B265D2AB1E9191D6A1A117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEB28585415E75ADA92D242C3BD2E3F4C64AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C33F727DDE7C3DFB0DBA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE72958EBC9E2F10130731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79D94463893BF8742D0975B52514B22C041 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C6B668463F4F89F8635432138EA847BC9020A0764880515E39C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFA183FDCE24978B01699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D75CEA0D7A80616E2C57E3195A9490237E1C13BAAD2FC0B361E18B0796E300F5C2B4040C95FF5DD81D7E09C32AA3244C60C86B8B2E1867A295BF8CCD38323B9324AF4FAF06DA24FDFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojKW4rnL99YhJlXNIAVpSt5g== X-Mailru-Sender: 583F1D7ACE8F49BD1042885CEC987B6BF0F91C86574CB2347D70622C6B32BDAE825871508D9F39707019711D9D5B048E1458020726E2BC9FD5ECBA0B92C0A936CDC7563AA7CEBD287402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH 3/4] fiber: keep reference to userdata if fiber created once X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Oleg Babin via Tarantool-patches Reply-To: olegrok@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Oleg Babin This patch reworks approach to fiber management in Lua. Before this patch each action that should return fiber led to new userdata creation that was quite slow and made GC suffer. This patch introduces new field in struct fiber to store a reference to userdata that was created once for a fiber. It allows speedup operations as fiber.self() and fiber.id(). Simple benchmark shows that access to fiber storage is faster in two times, fiber.find() - 2-3 times and fiber.new/create functions don't have any changes. --- src/lib/core/fiber.h | 5 ++ src/lua/fiber.c | 110 +++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 73 deletions(-) diff --git a/src/lib/core/fiber.h b/src/lib/core/fiber.h index 593847df7..3e9663a1a 100644 --- a/src/lib/core/fiber.h +++ b/src/lib/core/fiber.h @@ -623,6 +623,11 @@ struct fiber { * Should not be used in other fibers. */ struct lua_State *stack; + /** + * Optional reference to userdata + * represented current fiber in Lua. + */ + int ref; /** * Optional fiber.storage Lua reference. */ diff --git a/src/lua/fiber.c b/src/lua/fiber.c index 5575f2079..268ddf9cc 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -87,27 +87,31 @@ luaL_testcancel(struct lua_State *L) static const char *fiberlib_name = "fiber"; /** - * @pre: stack top contains a table - * @post: sets table field specified by name of the table on top - * of the stack to a weak kv table and pops that weak table. + * Trigger invoked when the fiber has stopped execution of its + * current request. Only purpose - delete storage.lua.ref and + * storage.lua.storage_ref keeping a reference of Lua + * fiber and fiber.storage objects. Unlike Lua stack, + * Lua fiber storage may be created not only for fibers born from + * Lua land. For example, an IProto request may execute a Lua + * function, which can create the storage. Trigger guarantees, + * that even for non-Lua fibers the Lua storage is destroyed. */ -static void -lbox_create_weak_table(struct lua_State *L, const char *name) +static int +lbox_fiber_on_stop(struct trigger *trigger, void *event) { - lua_newtable(L); - /* and a metatable */ - lua_newtable(L); - /* weak keys and values */ - lua_pushstring(L, "kv"); - /* pops 'kv' */ - lua_setfield(L, -2, "__mode"); - /* pops the metatable */ - lua_setmetatable(L, -2); - /* assigns and pops table */ - lua_setfield(L, -2, name); - /* gets memoize back. */ - lua_getfield(L, -1, name); - assert(! lua_isnil(L, -1)); + struct fiber *f = (struct fiber *) event; + int storage_ref = f->storage.lua.storage_ref; + if (storage_ref > 0) { + luaL_unref(tarantool_L, LUA_REGISTRYINDEX, storage_ref); + f->storage.lua.storage_ref = LUA_NOREF; + } + int ref = f->storage.lua.ref; + assert(ref > 0); + luaL_unref(tarantool_L, LUA_REGISTRYINDEX, ref); + f->storage.lua.ref = LUA_NOREF; + trigger_clear(trigger); + free(trigger); + return 0; } /** @@ -116,42 +120,26 @@ lbox_create_weak_table(struct lua_State *L, const char *name) static void lbox_pushfiber(struct lua_State *L, struct fiber *f) { - /* - * Use 'memoize' pattern and keep a single userdata for - * the given fiber. This is important to not run __gc - * twice for a copy of an attached fiber -- __gc should - * not remove attached fiber's coro prematurely. - */ - luaL_getmetatable(L, fiberlib_name); - lua_getfield(L, -1, "memoize"); - if (lua_isnil(L, -1)) { - /* first access - instantiate memoize */ - /* pop the nil */ - lua_pop(L, 1); - /* create memoize table */ - lbox_create_weak_table(L, "memoize"); - } - /* Find out whether the fiber is already in the memoize table. */ - uint64_t fid = f->fid; - luaL_pushuint64(L, fid); - lua_gettable(L, -2); - if (lua_isnil(L, -1)) { - /* no userdata for fiber created so far */ - /* pop the nil */ - lua_pop(L, 1); - /* push the key back */ - luaL_pushuint64(L, fid); + int ref = f->storage.lua.ref; + if (ref <= 0) { + struct trigger *t = (struct trigger *)malloc(sizeof(*t)); + 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_add(&f->on_stop, t); + + uint64_t fid = f->fid; /* create a new userdata */ uint64_t *ptr = lua_newuserdata(L, sizeof(*ptr)); *ptr = fid; luaL_getmetatable(L, fiberlib_name); lua_setmetatable(L, -2); - /* memoize it */ - lua_settable(L, -3); - luaL_pushuint64(L, fid); - /* get it back */ - lua_gettable(L, -2); + ref = luaL_ref(L, LUA_REGISTRYINDEX); + f->storage.lua.ref = ref; } + lua_rawgeti(L, LUA_REGISTRYINDEX, ref); } static struct fiber * @@ -669,28 +657,6 @@ lbox_fiber_name(struct lua_State *L) } } -/** - * Trigger invoked when the fiber has stopped execution of its - * current request. Only purpose - delete storage.lua.storage_ref keeping - * a reference of Lua fiber.storage object. Unlike Lua stack, - * Lua fiber storage may be created not only for fibers born from - * Lua land. For example, an IProto request may execute a Lua - * function, which can create the storage. Trigger guarantees, - * that even for non-Lua fibers the Lua storage is destroyed. - */ -static int -lbox_fiber_on_stop(struct trigger *trigger, void *event) -{ - struct fiber *f = (struct fiber *) event; - int storage_ref = f->storage.lua.storage_ref; - assert(storage_ref > 0); - luaL_unref(tarantool_L, LUA_REGISTRYINDEX, storage_ref); - f->storage.lua.storage_ref = LUA_NOREF; - trigger_clear(trigger); - free(trigger); - return 0; -} - static int lbox_fiber_storage(struct lua_State *L) { @@ -703,8 +669,6 @@ lbox_fiber_storage(struct lua_State *L) diag_set(OutOfMemory, sizeof(*t), "malloc", "t"); return luaT_error(L); } - trigger_create(t, lbox_fiber_on_stop, NULL, (trigger_f0) free); - trigger_add(&f->on_stop, t); lua_newtable(L); /* create local storage on demand */ storage_ref = luaL_ref(L, LUA_REGISTRYINDEX); f->storage.lua.storage_ref = storage_ref; -- 2.32.0