From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id D0C746EC5B; Wed, 12 May 2021 00:15:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D0C746EC5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1620767743; bh=HlsKm6Z93ARnR4pvrdTCX4LZMx6WWElt+ZmwF6AAMdo=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=EvMrfwrz+dz7YGT7fvdJd8218nvFfFgIORO1pntrRYug31WMw+j91vy5Y/kLjckW1 KGmAZ7sjs6l/6v1C5c6t/v/WQQIwy4dsEcrzAUkAoHTlH3pMHCpXafocteg+V6YQ+A AhUvrb0xM0JQA2FKSTs83DTz1eMx/IUdwusDM3gY= Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 5ADB06EC5B for ; Wed, 12 May 2021 00:15:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5ADB06EC5B Received: by mail-lf1-f50.google.com with SMTP id m11so14229258lfg.3 for ; Tue, 11 May 2021 14:15:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=vWkGQxupvuDHkGpOngt/Df5JCF0ivbwt1DT9dYO1/jo=; b=fq/KTI9zK0kIgnegn/M5Sakso1r8hnM16+2Mr7xstg2+M6Ufq9D2LtKX7b0HOP+HWI RTfXNmjbhh+tP0bO+BPrTNcFemhgMoDNvWlVJV8Qo3Y5JvcRUMeX9axJYKOUV8DFQSYF /4cke+dtfVzx5LbcUEMyAScVG35BBV6pOJO0lSVGumONhEQbUTxqRn1vQRtEvFeGOfc3 Taq8Y/VgemkG4cDSmiAa0zawKuuGHB2iEeD1+8hy0tPey19YleP3dDh0Z94YctFd5z8K Up3WaxY1wDd+axOIUee2mWXDthYVx7A2vmPnucQso+uxo9ldbXzSjJ8k7R52Ana70BZE W2xQ== X-Gm-Message-State: AOAM533h8DxCK/9aZTFPB/zj6dLF7vrLgOEW8az0iBUSFO+lIB4nM1PY oyTo9dt3OdkalaXDkA1mYahW4aCewwA= X-Google-Smtp-Source: ABdhPJwiPCwBK9pRHP6IGryCK3haPRowintPhfNdnQ5crUNTHtw+MOjRDUzPwNwgBvSdlhBELo6z1g== X-Received: by 2002:ac2:44af:: with SMTP id c15mr21857264lfm.651.1620767741193; Tue, 11 May 2021 14:15:41 -0700 (PDT) Received: from grain.localdomain ([5.18.171.94]) by smtp.gmail.com with ESMTPSA id u13sm3889908ljk.133.2021.05.11.14.15.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 14:15:40 -0700 (PDT) Received: by grain.localdomain (Postfix, from userid 1000) id 0566E5A000B; Wed, 12 May 2021 00:15:39 +0300 (MSK) Date: Wed, 12 May 2021 00:15:38 +0300 To: Vladislav Shpilevoy Message-ID: References: <20210504155819.290874-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.6 (2021-03-06) Subject: Re: [Tarantool-patches] [PATCH v3 00/10] fix say_x format and rework fibers X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Cyrill Gorcunov via Tarantool-patches Reply-To: Cyrill Gorcunov Cc: tml Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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