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 06B246EC55; Wed, 8 Sep 2021 21:21:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 06B246EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1631125267; bh=+9HeDnvtaTtMvkNaa93TiK0Q4uMp+Y5o4rbGeZ9O6XY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=GANKetJj25wOTBqPXEQ+GyFpVw99bs+qMBGLysFzlgU5Xq1/8eQk0oXLEczDz2QQt 8wR2rxz/c2/lDzIiLtlMMZ7XcPJY8jZvux42gCJMDGvUCgcHZwDlxVESn24DnJo/rq yvAqsU8ixTNwO4RRirhiIVppgk5XpGYMaOu7x4zM= Received: from smtp37.i.mail.ru (smtp37.i.mail.ru [94.100.177.97]) (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 61D616F3F2 for ; Wed, 8 Sep 2021 21:20:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 61D616F3F2 Received: by smtp37.i.mail.ru with esmtpa (envelope-from ) id 1mO2B2-0003tR-HR; Wed, 08 Sep 2021 21:20:04 +0300 To: v.shpilevoy@tarantool.org, imun@tarantool.org Date: Wed, 8 Sep 2021 21:20:00 +0300 Message-Id: <80d3adb29643f6147acd4c28e0c244ca80df784f.1631124536.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD91AE02D33A9C88A2F7631404A3C5D35349DE4D58F47F062C400894C459B0CD1B99BF13199369F18FED314A1925A5FC38694E6721A1D1978B77454BA882483358B X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE763424119D34F5CBFEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370BACBAB4C30C4AEB8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D87E9BDDBA409F05115DCA01C948F1B94B117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC63AF70AF8205D7DCA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209647ADFADE5905B1E5D25F19253116ADD2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEC24E1E72F37C03A0A5FD2DD08EB4836CD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3735DFC8FA7AC1207BA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7F45C1E71A9DFFA2A731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79D2AE6C3BEB5DE9A26378307618878A98D X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBF3286B3348795C6309EF7DC5E1DB0332223970F5B9345729C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCCE3E035A672CDEE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3419891600CCEF46072752466A8D16E763421F534866011587A1F768E4CE8C205F2F87FF7161549BB11D7E09C32AA3244CDC72AE124043B55C19CD2EDD22C12C38A95CA90A1D8AC565927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojV8xpaxME9p9RJyfU5UcIsQ== X-Mailru-Sender: 583F1D7ACE8F49BD1042885CEC987B6BD65B487B20582DBD20E25CF5E1291CB8F1FEA02A07AA46D67019711D9D5B048E1458020726E2BC9FD5ECBA0B92C0A936CDC7563AA7CEBD287402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 2/4] fiber: pass struct fiber into lbox_pushfiber instead of id 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 Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Oleg Babin For future changes we will need the fiber object, not only its id. --- src/lua/fiber.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lua/fiber.c b/src/lua/fiber.c index 83dcbe2fa..5575f2079 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -114,7 +114,7 @@ lbox_create_weak_table(struct lua_State *L, const char *name) * Push a userdata for the given fiber onto Lua stack. */ static void -lbox_pushfiber(struct lua_State *L, uint64_t fid) +lbox_pushfiber(struct lua_State *L, struct fiber *f) { /* * Use 'memoize' pattern and keep a single userdata for @@ -132,6 +132,7 @@ lbox_pushfiber(struct lua_State *L, uint64_t fid) 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)) { @@ -501,7 +502,7 @@ fiber_create(struct lua_State *L) /* Move the arguments to the new coro */ lua_xmove(L, child_L, lua_gettop(L)); /* XXX: 'fiber' is leaked if this throws a Lua error. */ - lbox_pushfiber(L, f->fid); + lbox_pushfiber(L, f); /* Pass coro_ref via lua stack so that we don't have to pass it * as an argument of fiber_run function. * No function will work with child_L until the function is called. @@ -755,7 +756,7 @@ lbox_fiber_yield(struct lua_State *L) static int lbox_fiber_self(struct lua_State *L) { - lbox_pushfiber(L, fiber()->fid); + lbox_pushfiber(L, fiber()); return 1; } @@ -767,7 +768,7 @@ lbox_fiber_find(struct lua_State *L) uint64_t fid = luaL_touint64(L, -1); struct fiber *f = fiber_find(fid); if (f) - lbox_pushfiber(L, f->fid); + lbox_pushfiber(L, f); else lua_pushnil(L); return 1; -- 2.32.0