From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp60.i.mail.ru (smtp60.i.mail.ru [217.69.128.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 05CAD469719 for ; Tue, 6 Oct 2020 22:00:10 +0300 (MSK) From: Sergey Kaplun Date: Tue, 6 Oct 2020 21:59:42 +0300 Message-Id: <20201006185942.19266-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] fiber: fix build for disabled fiber top List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko , Serge Petrenko Cc: tarantool-patches@dev.tarantool.org In case when we build without `ENABLE_FIBER_TOP` neither `struct fiber` contains `clock_stat` field nor `FIBER_TIME_RES` constant is defined. This patch adds corresponding ifdef directive to avoid compilation errors. --- Branch: https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-lua-fiber-fix-build-for-disabled-fiber-top src/lua/fiber.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lua/fiber.c b/src/lua/fiber.c index efb0a4921..edbd06ebc 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -282,9 +282,11 @@ lbox_fiber_statof(struct fiber *f, void *cb_ctx, bool backtrace) lua_pushnumber(L, f->csw); lua_settable(L, -3); +#if ENABLE_FIBER_TOP lua_pushliteral(L, "time"); lua_pushnumber(L, f->clock_stat.cputime / (double) FIBER_TIME_RES); lua_settable(L, -3); +#endif /* ENABLE_FIBER_TOP */ lua_pushliteral(L, "memory"); lua_newtable(L); -- 2.28.0