[Tarantool-patches] [PATCH v3] lua/utils: fix fiber->fid print in cord_on_yield
Igor Munkin
imun at tarantool.org
Mon May 17 11:22:11 MSK 2021
Cyrill,
I've checked the patch into master.
On 14.05.21, Cyrill Gorcunov wrote:
<snipped>
> ---
> From: Cyrill Gorcunov <gorcunov at gmail.com>
> Date: Fri, 14 May 2021 13:18:13 +0300
>
> This fixes a nit in commit 6af4737789042b1e6673c421686bb4394a61f4a1
> ("fiber: use uint64_t for fiber IDs").
>
> Since lua_pushfstring doesn't support %llu format [1] it
> breaks the test
>
> app-tap/gh-1700-abort-recording-on-fiber-switch.test.lua
>
> [1] https://www.lua.org/manual/5.1/manual.html#lua_pushfstring
>
> Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
> ---
> 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
>
--
Best regards,
IM
More information about the Tarantool-patches
mailing list