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 08A2D6F3C7; Fri, 26 Mar 2021 10:50:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 08A2D6F3C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616745012; bh=UY7BQxYU+uwQbknOfd2dQyUtb8uQCpuCLyKukWG8soU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=rIuEbW2sCFwuMJQOQkef76srhSfx+DfgiIoBVNMRikkgPh9sDCQ3mYliH7r6qlem3 6Y5VIjfZCCrfEfI5L8m+M7bAAmrvGmpWUpBVTV3LGImMjLat6ozPtduej4UyVh+FXf VugOfmP7/ePcJE/b1u7t08DxqbuUhOqM332lRsGc= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (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 BA30E68F40 for ; Fri, 26 Mar 2021 10:44:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BA30E68F40 Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1lPh8m-00042u-Rf; Fri, 26 Mar 2021 10:44:21 +0300 To: Sergey Ostanevich , Igor Munkin Date: Fri, 26 Mar 2021 10:42:55 +0300 Message-Id: X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9064ADF4728AA0EE919EF87AC0718675712B828C563C11F50182A05F538085040F5AA9B860BE1A6B596DC25028CECEC57956D2229005EA07FD60E6CDC8140D9BD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE705B093C0FC4B30B9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006372E9841F416E2DCCD8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C5DD32608FC869F5DC7D783C1D3F37363F2F21B83E133BD7DA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE73AFA331E307B52169FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C397DCCBFEAAA0BC6A117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E73528A6D463EDFD0DBBC4224003CC83647689D4C264860C145E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C5DD32608FC869F5DC7D783C1D3F37363F2F21B83E133BD7D9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFF532FBFD8162E58C699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34E54F8089C01448AAA18E6110F3F24724CDC1013B12EFB686FAAFCEF9AB091AB94262E9353AB72A951D7E09C32AA3244C15879B75963895951EAAE6A8AB6A09971DD47778AE04E04D927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojapPp7P/VpAghN/BiTmfE3g== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB4150231DFAE68FF99C37CE200D0FCECB75CFCBC6A9BEAC0A3F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 12/30] test: adapt PUC Lua test with count hooks 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: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" LuaJIT does not check hooks at traces without defined -DLUAJIT_ENABLE_CHECKHOOK. For more information see or commit 6bce6b118eeb2bb7f36157de158e5cccf0ea68e5 (Add compile-time option LUAJIT_ENABLE_CHECKHOOK. Disabled by default.). This patch adapts these tests for LuaJIT by disabling JIT while testing count hooks. Closes tarantool/tarantool#5701 Part of tarantool/tarantool#5845 Part of tarantool/tarantool#4473 --- test/PUC-Lua-5.1-tests/db.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/PUC-Lua-5.1-tests/db.lua b/test/PUC-Lua-5.1-tests/db.lua index 6985c29..c1a635a 100644 --- a/test/PUC-Lua-5.1-tests/db.lua +++ b/test/PUC-Lua-5.1-tests/db.lua @@ -347,6 +347,18 @@ assert(debug.setupvalue(io.read, 1, 10) == nil) -- testing count hooks local a=0 +-- LuaJIT: LuaJIT does not check hooks at traces without defined +-- -DLUAJIT_ENABLE_CHECKHOOK. +-- For more information see or commit +-- 6bce6b118eeb2bb7f36157de158e5cccf0ea68e5 (Add compile-time +-- option LUAJIT_ENABLE_CHECKHOOK. Disabled by default.). +-- See also https://github.com/tarantool/tarantool/issues/5701 +-- Test is adapted for LuaJIT by disabling JIT while +-- testing count hooks. +local jit_is_enabled = jit.status() +if jit_is_enabled then + jit.off() +end debug.sethook(function (e) a=a+1 end, "", 1) a=0; for i=1,1000 do end; assert(1000 < a and a < 1012) debug.sethook(function (e) a=a+1 end, "", 4) @@ -359,6 +371,9 @@ debug.sethook(print, "", 2^24 - 1) -- count upperbound local f,m,c = debug.gethook() assert(({debug.gethook()})[3] == 2^24 - 1) debug.sethook() +if jit_is_enabled then + jit.on() +end -- tests for tail calls -- 2.31.0