From: Cyrill Gorcunov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v2] lua/utils: fix fiber->fid print in cord_on_yield Date: Fri, 14 May 2021 13:32:51 +0300 [thread overview] Message-ID: <YJ5R0zqzmgCYk/K9@grain> (raw) In-Reply-To: <20210514101947.106581-1-gorcunov@gmail.com> This fixes a nit in commit 6af473778 (fiber: use uint64_t for fiber IDs). Since lua_pushfstring doesn't support %llu format it breaks the test app-tap/gh-1700-abort-recording-on-fiber-switch.test.lua Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- branch gorcunov/gh-5846-fid-name-fix src/lua/utils.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/lua/utils.c b/src/lua/utils.c index 0fbe700fc..3ce821374 100644 --- a/src/lua/utils.c +++ b/src/lua/utils.c @@ -1341,6 +1341,7 @@ void cord_on_yield(void) * code misbehaviour and failures, so stop its execution. */ if (unlikely(tvref(g->jit_base))) { + char buf[256]; /* * XXX: mcode is executed only in scope of Lua * world and one can obtain the corresponding Lua @@ -1348,10 +1349,12 @@ void cord_on_yield(void) */ struct lua_State *L = fiber()->storage.lua.stack; assert(L != NULL); - 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)", - (long long)fiber()->fid); + snprintf(buf, sizeof(buf), + "fiber %llu is switched while running the" + " compiled code (it's likely a function with" + " a yield underneath called via LuaJIT FFI)", + (long long)fiber()->fid); + lua_pushstring(L, buf); if (g->panic) g->panic(L); exit(EXIT_FAILURE); @@ -1376,11 +1379,14 @@ void cord_on_yield(void) * GC hook is active and the platform is forced to stop. */ if (unlikely(g->hookmask & HOOK_GC)) { + char buf[128]; struct lua_State *L = fiber()->storage.lua.stack; assert(L != NULL); - lua_pushfstring(L, "fiber %d is switched while running GC" - " finalizer (i.e. __gc metamethod)", - fiber()->fid); + snprintf(buf, sizeof(buf), + "fiber %llu is switched while running GC" + " finalizer (i.e. __gc metamethod)", + (long long)fiber()->fid); + lua_pushstring(L, buf); if (g->panic) g->panic(L); exit(EXIT_FAILURE); -- 2.31.1
next prev parent reply other threads:[~2021-05-14 10:32 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-14 10:19 [Tarantool-patches] [PATCH] lua/utils: fix fiber->fid print in Lua tracing Cyrill Gorcunov via Tarantool-patches 2021-05-14 10:32 ` Cyrill Gorcunov via Tarantool-patches [this message] 2021-05-14 10:41 ` [Tarantool-patches] [PATCH v2] lua/utils: fix fiber->fid print in cord_on_yield Igor Munkin via Tarantool-patches 2021-05-14 12:15 ` [Tarantool-patches] [PATCH v3] " Cyrill Gorcunov via Tarantool-patches 2021-05-17 7:36 ` Igor Munkin via Tarantool-patches 2021-05-17 8:22 ` Igor Munkin via Tarantool-patches 2021-05-17 8:22 ` Alexander V. Tikhonov 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=YJ5R0zqzmgCYk/K9@grain \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2] lua/utils: fix fiber->fid print in cord_on_yield' \ /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