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 E9730C74DCA; Wed, 21 Aug 2024 12:08:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E9730C74DCA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1724231282; bh=A22/7dSan1mxBaClCN1h92Zwwf64RVBTsVDpqDPIwuk=; 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=P4y+sQPNEP4JJMHk2LnWHYB27YpQtUKJsQXpAzquNBi6TfKuOXj4cr6EslT932Fjc eMbFRVJJW4jibLGoxZXyn/2HVDMfWrG9FgOQyMivOqfiYnwV3p6XlYEMekbHL3fYo0 /51bXKc80shjePQkjCqcYBkG7aUKn+1m1tynyMCw= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 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 CA878C6198E for ; Wed, 21 Aug 2024 11:59:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CA878C6198E Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1sghBa-00000005aRz-3IZp; Wed, 21 Aug 2024 11:59:23 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 21 Aug 2024 11:58:21 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD93D5A650E6D4F687E939B7AB30B7B6DDAE3559D94643A1A87182A05F53808504036529344780D6827D27678DDAA8063144BA030E4991907F2EFF80BD07D1CDB799799EF890AE2FCA9 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE74EC61905B8C6A847EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637680B37D8C6EC627A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D81F71FCA0519144D8C1F3096FD6B0A5BAA6AD1926871E981ECC7F00164DA146DAFE8445B8C89999728AA50765F7900637D0FEED2715E18529389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8B861051D4BA689FCF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B80B9CEB5436E71E375ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A5F9EE4EE9ECA2C9905002B1117B3ED696A6A4702E89FE2A908D59E407A97E9958823CB91A9FED034534781492E4B8EEAD69BF13FED57427F1C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF76E42FB4285B32695B891E5E42E17FE4A370C1A0F2D503FFAD18DAD27D2DD6FB792D7E5D32AAB0D0D14E51FF79EEE6038B128E8B050707DCB2A94BCD9D7316CEC507515875617F7FC226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojegttVMu7AX/8tSx18z4s1A== X-DA7885C5: 49AD163DD5931A35F255D290C0D534F972556F797D611CF131361647780BCBF91907691602CF828E5B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9B69A1676CF7782016DAC77899D9C4377F66166876FBDB6089E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 18/45] test: enable LuaJIT test 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" This patch moves the aforementioned test from the to the directory, includes it in , and names the subtest. Also, it slightly refactors the code to make it closer to our code style. The test is adjusted to be runable in the test suite by adding the `jit.flush()` to avoid collisions of traces. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/misc/hook_norecord.lua | 12 ------------ test/LuaJIT-tests/trace/hook_norecord.lua | 12 ++++++++++++ test/LuaJIT-tests/trace/index | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 test/LuaJIT-tests/misc/hook_norecord.lua create mode 100644 test/LuaJIT-tests/trace/hook_norecord.lua diff --git a/test/LuaJIT-tests/misc/hook_norecord.lua b/test/LuaJIT-tests/misc/hook_norecord.lua deleted file mode 100644 index 8e7cba05..00000000 --- a/test/LuaJIT-tests/misc/hook_norecord.lua +++ /dev/null @@ -1,12 +0,0 @@ - -if not jit or not jit.status or not jit.status() then return end - -local called = false -local function f() local x = "wrong"; called = true end -jit.off(f) -debug.sethook(f, "", 5) -for i=1,1000 do local a,b,c,d,e,f=1,2,3,4,5,6 end -assert(called) --- Check that no trace was generated. -assert(require("jit.util").traceinfo(1) == nil) - diff --git a/test/LuaJIT-tests/trace/hook_norecord.lua b/test/LuaJIT-tests/trace/hook_norecord.lua new file mode 100644 index 00000000..4c39bade --- /dev/null +++ b/test/LuaJIT-tests/trace/hook_norecord.lua @@ -0,0 +1,12 @@ +do --- Abort trace recording on any hook call. + local called = false + local function f() local x = "wrong"; called = true end + jit.off(f) + jit.flush() + debug.sethook(f, "", 5) + for _ = 1, 1000 do local a, b, c, d, e, f = 1, 2, 3, 4, 5, 6 end + assert(called) + -- Check that no trace was generated. + assert(require("jit.util").traceinfo(1) == nil) + debug.sethook() +end diff --git a/test/LuaJIT-tests/trace/index b/test/LuaJIT-tests/trace/index index 46c8f5d2..595a71d2 100644 --- a/test/LuaJIT-tests/trace/index +++ b/test/LuaJIT-tests/trace/index @@ -3,6 +3,7 @@ exit_growstack.lua exit_jfuncf.lua gc.lua gc64_slot_revival.lua +hook_norecord.lua phi snap.lua stitch.lua -- 2.45.2