From: Oleg Babin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: v.shpilevoy@tarantool.org, imun@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v4 2/4] fiber: pass struct fiber into lbox_pushfiber instead of id
Date: Wed, 8 Sep 2021 21:20:00 +0300 [thread overview]
Message-ID: <80d3adb29643f6147acd4c28e0c244ca80df784f.1631124536.git.babinoleg@mail.ru> (raw)
In-Reply-To: <cover.1631124536.git.babinoleg@mail.ru>
From: Oleg Babin <babinoleg@mail.ru>
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
next prev parent reply other threads:[~2021-09-08 18:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 18:19 [Tarantool-patches] [PATCH v4 0/4] fiber: keep reference to userdata if fiber created once Oleg Babin via Tarantool-patches
2021-09-08 18:19 ` [Tarantool-patches] [PATCH v4 1/4] fiber: rename ref to storage_ref Oleg Babin via Tarantool-patches
2021-09-08 18:20 ` Oleg Babin via Tarantool-patches [this message]
2021-09-08 18:20 ` [Tarantool-patches] [PATCH v4 3/4] fiber: correctly initialize storage_ref value Oleg Babin via Tarantool-patches
2021-09-08 18:20 ` [Tarantool-patches] [PATCH v4 4/4] fiber: keep reference to userdata if fiber created once Oleg Babin via Tarantool-patches
2021-09-08 20:45 ` [Tarantool-patches] [PATCH v4 0/4] " Vladislav Shpilevoy via Tarantool-patches
2021-09-09 10:21 ` Vladimir Davydov via Tarantool-patches
2021-09-09 10:45 ` Oleg Babin via Tarantool-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80d3adb29643f6147acd4c28e0c244ca80df784f.1631124536.git.babinoleg@mail.ru \
--to=tarantool-patches@dev.tarantool.org \
--cc=imun@tarantool.org \
--cc=olegrok@tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v4 2/4] fiber: pass struct fiber into lbox_pushfiber instead of id' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox