From: Cyrill Gorcunov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tml <tarantool-patches@dev.tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v3 00/10] fix say_x format and rework fibers Date: Wed, 12 May 2021 00:15:38 +0300 [thread overview] Message-ID: <YJrz+ucGkNO5aWtn@grain> (raw) In-Reply-To: <ca4e2b66-edf6-66e0-6ad8-241798471af2@tarantool.org> On Tue, May 11, 2021 at 10:13:01PM +0200, Vladislav Shpilevoy wrote: > Hi! Good job on the fixes, really! > > Although function lbox_fiber_statof() still uses lua_pushinteger(): > Thanks a huge for catching it, Vlad. Here is an update. Squashed to patch 1 "fiber: use uint64_t for fiber IDs" and force pushed. --- src/lua/fiber.c | 2 +- src/lua/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lua/fiber.c b/src/lua/fiber.c index eb6bcc612..0d28fce8c 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -267,7 +267,7 @@ lbox_fiber_statof(struct fiber *f, void *cb_ctx, bool backtrace) { struct lua_State *L = (struct lua_State *) cb_ctx; - lua_pushinteger(L, f->fid); + luaL_pushuint64(L, f->fid); lua_newtable(L); lua_pushliteral(L, "name"); diff --git a/src/lua/utils.c b/src/lua/utils.c index b5a6ca5b7..0fbe700fc 100644 --- a/src/lua/utils.c +++ b/src/lua/utils.c @@ -1348,10 +1348,10 @@ void cord_on_yield(void) */ struct lua_State *L = fiber()->storage.lua.stack; assert(L != NULL); - lua_pushfstring(L, "fiber %d is switched while running the" + lua_pushfstring(L, "fiber %llu is switched while running the" " compiled code (it's likely a function with" " a yield underneath called via LuaJIT FFI)", - fiber()->fid); + (long long)fiber()->fid); if (g->panic) g->panic(L); exit(EXIT_FAILURE); -- 2.31.1
next prev parent reply other threads:[~2021-05-11 21:15 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-04 15:58 Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 01/10] fiber: use uint64_t for fiber IDs Cyrill Gorcunov via Tarantool-patches 2021-05-10 18:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-10 21:40 ` Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 02/10] popen: fix say_x format arguments Cyrill Gorcunov via Tarantool-patches 2021-05-10 18:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-10 21:41 ` Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 03/10] raft: fix say_x arguments Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 04/10] box/error: fix argument for CustomError Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 05/10] xlog: fix say_x format Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 06/10] box/vynil: " Cyrill Gorcunov via Tarantool-patches 2021-05-10 18:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-10 21:51 ` Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 07/10] txn: " Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 08/10] limbo: " Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 09/10] wal: " Cyrill Gorcunov via Tarantool-patches 2021-05-10 18:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-10 21:55 ` Cyrill Gorcunov via Tarantool-patches 2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 10/10] say: fix CFORMAT specification Cyrill Gorcunov via Tarantool-patches 2021-05-10 18:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-10 21:58 ` Cyrill Gorcunov via Tarantool-patches 2021-05-11 20:13 ` [Tarantool-patches] [PATCH v3 00/10] fix say_x format and rework fibers Vladislav Shpilevoy via Tarantool-patches 2021-05-11 21:15 ` Cyrill Gorcunov via Tarantool-patches [this message] 2021-05-11 21:24 ` Cyrill Gorcunov via Tarantool-patches 2021-05-12 18:41 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-13 8:17 ` Cyrill Gorcunov via Tarantool-patches 2021-05-13 11:17 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-13 11:44 ` Cyrill Gorcunov via Tarantool-patches 2021-05-13 12:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-14 7:56 ` Kirill Yukhin 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=YJrz+ucGkNO5aWtn@grain \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 00/10] fix say_x format and rework fibers' \ /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