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 1/4] fiber: rename ref to fiber_ref Date: Wed, 11 Aug 2021 23:33:28 +0300 [thread overview] Message-ID: <163ea2c0eb0172a784e29e5ea61f22e336e969a5.1628713520.git.babinoleg@mail.ru> (raw) In-Reply-To: <cover.1628713520.git.babinoleg@mail.ru> From: Oleg Babin <babinoleg@mail.ru> Ref is a lua reference to fiber storage. This patch just renames storage.lua.ref to storage_ref to underline that it's not a reference to fiber itself and needed only for fiber storage. --- src/lib/core/fiber.h | 2 +- src/lua/fiber.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/core/fiber.h b/src/lib/core/fiber.h index b85625ba7..593847df7 100644 --- a/src/lib/core/fiber.h +++ b/src/lib/core/fiber.h @@ -626,7 +626,7 @@ struct fiber { /** * Optional fiber.storage Lua reference. */ - int ref; + int storage_ref; } lua; /** * Iproto sync. diff --git a/src/lua/fiber.c b/src/lua/fiber.c index 38394666b..83dcbe2fa 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -670,7 +670,7 @@ lbox_fiber_name(struct lua_State *L) /** * Trigger invoked when the fiber has stopped execution of its - * current request. Only purpose - delete storage.lua.ref keeping + * 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 @@ -681,10 +681,10 @@ static int lbox_fiber_on_stop(struct trigger *trigger, void *event) { struct fiber *f = (struct fiber *) event; - int storage_ref = f->storage.lua.ref; + int storage_ref = f->storage.lua.storage_ref; assert(storage_ref > 0); luaL_unref(tarantool_L, LUA_REGISTRYINDEX, storage_ref); - f->storage.lua.ref = LUA_NOREF; + f->storage.lua.storage_ref = LUA_NOREF; trigger_clear(trigger); free(trigger); return 0; @@ -694,7 +694,7 @@ static int lbox_fiber_storage(struct lua_State *L) { struct fiber *f = lbox_checkfiber(L, 1); - int storage_ref = f->storage.lua.ref; + int storage_ref = f->storage.lua.storage_ref; if (storage_ref <= 0) { struct trigger *t = (struct trigger *) malloc(sizeof(*t)); @@ -706,7 +706,7 @@ lbox_fiber_storage(struct lua_State *L) trigger_add(&f->on_stop, t); lua_newtable(L); /* create local storage on demand */ storage_ref = luaL_ref(L, LUA_REGISTRYINDEX); - f->storage.lua.ref = storage_ref; + f->storage.lua.storage_ref = storage_ref; } lua_rawgeti(L, LUA_REGISTRYINDEX, storage_ref); return 1; -- 2.32.0
next prev parent reply other threads:[~2021-08-11 20:34 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-11 20:33 [Tarantool-patches] [PATCH 0/4] fiber: keep reference to userdata if fiber created once Oleg Babin via Tarantool-patches 2021-08-11 20:33 ` Oleg Babin via Tarantool-patches [this message] 2021-09-02 15:22 ` [Tarantool-patches] [PATCH 1/4] fiber: rename ref to fiber_ref Igor Munkin via Tarantool-patches 2021-09-02 18:00 ` Бабин Олег via Tarantool-patches 2021-08-11 20:33 ` [Tarantool-patches] [PATCH 2/4] fiber: pass struct fiber into lbox_pushfiber instead of id Oleg Babin via Tarantool-patches 2021-09-02 15:22 ` Igor Munkin via Tarantool-patches 2021-08-11 20:33 ` [Tarantool-patches] [PATCH 3/4] fiber: keep reference to userdata if fiber created once Oleg Babin via Tarantool-patches 2021-08-25 20:33 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-26 6:14 ` Oleg Babin via Tarantool-patches 2021-09-02 15:22 ` Igor Munkin via Tarantool-patches 2021-09-02 17:59 ` Бабин Олег via Tarantool-patches 2021-09-02 21:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-03 6:12 ` Oleg Babin via Tarantool-patches 2021-08-11 20:33 ` [Tarantool-patches] [PATCH 4/4] fiber: allocate on_stop triggers using mempool Oleg Babin via Tarantool-patches 2021-08-25 20:34 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-26 6:14 ` Oleg Babin via Tarantool-patches 2021-08-26 20:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-26 20:15 ` Oleg Babin via Tarantool-patches 2021-09-02 15:23 ` [Tarantool-patches] [PATCH 0/4] fiber: keep reference to userdata if fiber created once Igor Munkin via Tarantool-patches 2021-09-02 18:07 ` Бабин Олег 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=163ea2c0eb0172a784e29e5ea61f22e336e969a5.1628713520.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 1/4] fiber: rename ref to fiber_ref' \ /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