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 98BDBC59682; Fri, 23 Aug 2024 18:15:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 98BDBC59682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1724426103; bh=hEEaWz9dQHH8v1FJZWmqyX2vhHdq5JkQ92EuGBCV1hM=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ueFgLzauEtlmdrWurCdOf8kM/JSt0+nbqppYxRJmRSj450mzl/XB4H+lHTFYeDU/R seFSRUoIY4AAkNvpO3T77sdWedoy7EIqGk5BtS3OYIlKNU+mulQsHd8risKJwp3nV4 d4DhudlI91lon9/rjGACKLWE2a4JqL9tO1yUKJOw= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (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 845E9C59682 for ; Fri, 23 Aug 2024 18:15:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 845E9C59682 Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1shW0D-0000000BQfT-3LGy; Fri, 23 Aug 2024 18:15:02 +0300 Content-Type: multipart/alternative; boundary="------------V0UQlnOyT3K8JnuJN4e56ubE" Message-ID: <4a143fda-c66e-4fdc-99ce-8b01a7738370@tarantool.org> Date: Fri, 23 Aug 2024 18:15:01 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9A67092BE052B1D9E7C3016B9E717C765DAE1D83801017009182A05F538085040E9239E70B625856033594132A326AF8B7AC77A58DAD4889BAE61B31A8F196B694787F701E01DBF3D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BF6699A3AA9BACA6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374D4854EC7C9372F88638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8212E06A711D9B9267BF32CE2F9FC1D2FAB5AA7F5FA0CF8EFCC7F00164DA146DAFE8445B8C89999728AA50765F7900637F6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F7900637FD857C154FD18C88D81D268191BDAD3DBD4B6F7A4D31EC0BE2F48590F00D11D6D81D268191BDAD3D78DA827A17800CE784F5BB69103A07C0EC76A7562686271ED91E3A1F190DE8FD2E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3CD42BCEBB57B85E635872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A54DAD97637EB750FA5002B1117B3ED696FB4309145A4F5992715D9AB585B0EB04823CB91A9FED034534781492E4B8EEAD14747542773C033FBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF57C35549DD691F2147226AEBDB8513FDBD42ACDCEEC3CAB96A8E66063CBFAA95792D7E5D32AAB0D02FB0CAD32ADFBF84879667E2D1E8EE15BE35873CFFDA6A7215CE02F68832E51D5F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojPqZSx9J9Ex0qml+x6h29JA== X-Mailru-Sender: 520A125C2F17F0B1E52FEF5D219D6140B4527D7E4CB26FB259CE5507EA7BF3A13E921F093DC4C4030152A3D17938EB451EB5A0BCEC6A560B3DDE9B364B0DF289BE2DA36745F2EEB5CEBA01FB949A1F1EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 19/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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------V0UQlnOyT3K8JnuJN4e56ubE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sergey, On 21.08.2024 11:58, Sergey Kaplun wrote: > 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. Also, the number of > iterations for the compiled loop inside the hook is increased to avoid > hotcount collisions. > > Part of tarantool/tarantool#9398 > --- thanks for the patch! LGTM > test/LuaJIT-tests/misc/hook_record.lua | 8 -------- > test/LuaJIT-tests/trace/hook_record.lua | 7 +++++++ > test/LuaJIT-tests/trace/index | 1 + > 3 files changed, 8 insertions(+), 8 deletions(-) > delete mode 100644 test/LuaJIT-tests/misc/hook_record.lua > create mode 100644 test/LuaJIT-tests/trace/hook_record.lua > > diff --git a/test/LuaJIT-tests/misc/hook_record.lua b/test/LuaJIT-tests/misc/hook_record.lua > deleted file mode 100644 > index 6f1646de..00000000 > --- a/test/LuaJIT-tests/misc/hook_record.lua > +++ /dev/null > @@ -1,8 +0,0 @@ > - > -if not jit or not jit.status or not jit.status() then return end > - > -debug.sethook(function() for i=1,100 do end end, "", 10) > -for i=1,10 do end > -debug.sethook() > -assert((require("jit.util").traceinfo(1))) > - > diff --git a/test/LuaJIT-tests/trace/hook_record.lua b/test/LuaJIT-tests/trace/hook_record.lua > new file mode 100644 > index 00000000..684e1139 > --- /dev/null > +++ b/test/LuaJIT-tests/trace/hook_record.lua > @@ -0,0 +1,7 @@ > +do --- Recording traces inside the hook. > + jit.flush() > + debug.sethook(function() for _ = 1, 1000 do end end, "", 10) > + for _ = 1, 10 do end > + debug.sethook() > + assert((require("jit.util").traceinfo(1))) > +end > diff --git a/test/LuaJIT-tests/trace/index b/test/LuaJIT-tests/trace/index > index 595a71d2..63af7870 100644 > --- a/test/LuaJIT-tests/trace/index > +++ b/test/LuaJIT-tests/trace/index > @@ -4,6 +4,7 @@ exit_jfuncf.lua > gc.lua > gc64_slot_revival.lua > hook_norecord.lua > +hook_record.lua > phi > snap.lua > stitch.lua --------------V0UQlnOyT3K8JnuJN4e56ubE Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Sergey,

On 21.08.2024 11:58, Sergey Kaplun wrote:
This patch moves the aforementioned test from the <misc> to the <trace/>
directory, includes it in <index>, 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. Also, the number of
iterations for the compiled loop inside the hook is increased to avoid
hotcount collisions.

Part of tarantool/tarantool#9398
---
thanks for the patch! LGTM
 test/LuaJIT-tests/misc/hook_record.lua  | 8 --------
 test/LuaJIT-tests/trace/hook_record.lua | 7 +++++++
 test/LuaJIT-tests/trace/index           | 1 +
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 test/LuaJIT-tests/misc/hook_record.lua
 create mode 100644 test/LuaJIT-tests/trace/hook_record.lua

diff --git a/test/LuaJIT-tests/misc/hook_record.lua b/test/LuaJIT-tests/misc/hook_record.lua
deleted file mode 100644
index 6f1646de..00000000
--- a/test/LuaJIT-tests/misc/hook_record.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if not jit or not jit.status or not jit.status() then return end
-
-debug.sethook(function() for i=1,100 do end end, "", 10)
-for i=1,10 do end
-debug.sethook()
-assert((require("jit.util").traceinfo(1)))
-
diff --git a/test/LuaJIT-tests/trace/hook_record.lua b/test/LuaJIT-tests/trace/hook_record.lua
new file mode 100644
index 00000000..684e1139
--- /dev/null
+++ b/test/LuaJIT-tests/trace/hook_record.lua
@@ -0,0 +1,7 @@
+do --- Recording traces inside the hook.
+  jit.flush()
+  debug.sethook(function() for _ = 1, 1000 do end end, "", 10)
+  for _ = 1, 10 do end
+  debug.sethook()
+  assert((require("jit.util").traceinfo(1)))
+end
diff --git a/test/LuaJIT-tests/trace/index b/test/LuaJIT-tests/trace/index
index 595a71d2..63af7870 100644
--- a/test/LuaJIT-tests/trace/index
+++ b/test/LuaJIT-tests/trace/index
@@ -4,6 +4,7 @@ exit_jfuncf.lua
 gc.lua
 gc64_slot_revival.lua
 hook_norecord.lua
+hook_record.lua
 phi
 snap.lua
 stitch.lua
--------------V0UQlnOyT3K8JnuJN4e56ubE--