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 0A7126ECDC; Thu, 15 Oct 2026 10:21:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0A7126ECDC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1792048863; bh=J/ysBGPfDyxZVwio4SnBXhK+ZLUioteNOJQHci28g+c=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=XaY11RaHFyayOhzpaS+vcWzL2jGHc4tM9FQXeWtSAhGmfJY1BKdFWK5YpNVekNUx/ 8iu3Tu1D/7S3CbNTe3wU6HBYouJIhDJVUxbz5YJukOsxu0gARzgLgbxlUhMhyqI1GD xQGYLFBfPK9X9mnocj2Khujn0G0cyg2vtG5PBS5A= Received: from send83.i.mail.ru (send83.i.mail.ru [89.221.237.178]) (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 8E3126ECDC for ; Thu, 15 Oct 2026 10:21:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8E3126ECDC Received: by exim-smtp-84d6fb566c-wtvxx with esmtpa (envelope-from ) id 1xHFls-00000000IBj-1SsJ; Thu, 15 Oct 2026 10:21:01 +0300 To: Sergey Kaplun , Sergey Bronnikov , Evgeniy Temirgaleev Date: Thu, 15 Oct 2026 10:20:55 +0300 Message-ID: <20261015072055.317299-1-m.elhimov@vk.team> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-618D5548: 2D073905AB669B7DC7D0F6C13AE992131BBC1708940B7EED0940CE22FA32A89D22359995DDC48805 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD99EAF3395699E20758DFD990F97E73A9B7844D6A57F61C66C182A05F538085040B9166908D7DDF7983DE06ABAFEAF67051C75AACF47540AF7608DD9D2B758CC29AF1470CB4BE18E90 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E9C44F3538ABC873EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667E1D4B08D42AEC87FA4A4B64F3D543D50524C7E9A4469227C99FF24ADF3D76F18EEF46B7454FC60B9742502CCDD46D0DB11811A4A51E3B096D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C355B626DF3F312CC635872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-87b9d050: 1 X-C1DE0DAB: 0D63561A33F958A5DE1F53F0E43D4BDF5002B1117B3ED6964FB44046AF344B2372305013E4AE841E823CB91A9FED034534781492E4B8EEAD0BC323893F80E328C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D65905640C84F4945DD41AB1994CF8BA1CC38C646DA2360A1C6119ED4B1BDFDEC031280088B7BEF5F07BB8341EE9D5BE9A0A7FB0F12227B978F0D664BBB8F9E6099493EA31BAF6F289499350E1BD188BD56E4C41F94D744909CE9D6718F459EE2962AE54DA86D399E591103B389C0A9E82E8 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWAIXgCqpuXqRe+eya20PhEY= X-Mailru-Sender: 689FA8AB762F73937C9FA53A4753B313C1FBFB55C71BAFE41D030DA47BBC0E00457742D1059F1ACE567B8845310477678B5D19FF33E2B21BC8157BDAF8912DC0981874AA068F0975204DA63403278206F52067E1A4DAC7CAC77752E0C033A69E3453F38A29522196 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] dbg: remove wrong GC state 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: Mikhail Elhimov via Tarantool-patches Reply-To: Mikhail Elhimov Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" It was copied originally by mistake from the LuaVela fork of LuaJIT. --- Branch: https://github.com/tarantool/luajit/tree/elhimov/gh-noticket-dbg-remove-wrong-gcstate src/luajit_dbg.py | 3 +- .../debug-extension-tests.py | 96 +++++++++++++++++-- 2 files changed, 87 insertions(+), 12 deletions(-) diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py index 1d553fb9..4ee2e70e 100644 --- a/src/luajit_dbg.py +++ b/src/luajit_dbg.py @@ -1246,7 +1246,6 @@ def gc_state(g): 3: 'SWEEPSTRING', 4: 'SWEEP', 5: 'FINALIZE', - 6: 'LAST', }.get(int(g['gc']['state']), 'INVALID') @@ -2841,7 +2840,7 @@ class LJState(dbg.LJBase): lj-state The command requires no args and dumps current VM and GC states: * VM state: -* GC state: +* GC state: * JIT state: ''' diff --git a/test/tarantool-debugger-tests/debug-extension-tests.py b/test/tarantool-debugger-tests/debug-extension-tests.py index b6e51185..8456dde9 100644 --- a/test/tarantool-debugger-tests/debug-extension-tests.py +++ b/test/tarantool-debugger-tests/debug-extension-tests.py @@ -133,6 +133,23 @@ elif machine == 'arm64' or machine == 'aarch64': else: raise Exception('Unknown architecture in testing') +GCS_PAUSE = 'PAUSE' +GCS_PROPAGATE = 'PROPAGATE' +GCS_ATOMIC = 'ATOMIC' +GCS_SWEEPSTRING = 'SWEEPSTRING' +GCS_SWEEP = 'SWEEP' +GCS_FINALIZE = 'FINALIZE' + +RX_VALID_GC_STATES = r'({})'.format('|'.join([ + GCS_PAUSE, + GCS_PROPAGATE, + GCS_ATOMIC, + GCS_SWEEPSTRING, + GCS_SWEEP, + GCS_FINALIZE, +])) +RX_INVALID_GC_STATE = r'INVALID' + class TestCaseBase(unittest.TestCase): @classmethod @@ -269,23 +286,24 @@ class TestLJArch(TestCaseBase): ) -class TestLJState(TestCaseBase): - extension_cmds = 'lj-state' - location = 'lj_cf_print' - lua_script = 'print(1)' - pattern = ( +def compose_lj_state_rx(rx_gc_state): + return ( r'VM state: [A-Z]+\n' - r'GC state: [A-Z]+\n' + r'GC state: ' + rx_gc_state + '\n' r'JIT state: [A-Z]+\n' ) -class TestLJGC(TestCaseBase): - extension_cmds = 'lj-gc' +class TestLJState(TestCaseBase): + extension_cmds = 'lj-state' location = 'lj_cf_print' lua_script = 'print(1)' - pattern = ( - r'GC stats: [A-Z]+\n' + pattern = compose_lj_state_rx(RX_VALID_GC_STATES) + + +def compose_gc_stats_rx(rx_gc_state): + return ( + r'GC stats: ' + rx_gc_state + '\n' r'\ttotal: \d+\n' r'\tthreshold: \d+\n' r'\tdebt: \d+\n' @@ -301,6 +319,64 @@ class TestLJGC(TestCaseBase): ) +class TestLJGC(TestCaseBase): + extension_cmds = 'lj-gc' + location = 'lj_cf_print' + lua_script = 'print(1)' + pattern = compose_gc_stats_rx(RX_VALID_GC_STATES) + + +class TestGCStateBase(TestCaseBase): + extension_cmds = ( + 'lj-state\n' + 'lj-gc\n' + ) + lua_script = ( + 'local obj = newproxy(true)\n' + 'getmetatable(obj).__gc = function() end\n' + 'obj = nil\n' + 'collectgarbage()\n' + ) + + @classmethod + def setUpClass(cls): + cls.pattern = ( + compose_lj_state_rx(cls.gc_state) + + compose_gc_stats_rx(cls.gc_state) + ) + super(TestGCStateBase, cls).setUpClass() + + +class TestGCStatePause(TestGCStateBase): + gc_state = GCS_PAUSE + location = 'gc_mark_start' + + +class TestGCStatePropagate(TestGCStateBase): + gc_state = GCS_PROPAGATE + location = 'propagatemark' + + +class TestGCStateAtomic(TestGCStateBase): + gc_state = GCS_ATOMIC + location = 'atomic' + + +class TestGCStateSweepString(TestGCStateBase): + gc_state = GCS_SWEEPSTRING + location = 'gc_sweep_str_chain' + + +class TestGCStateSweep(TestGCStateBase): + gc_state = GCS_SWEEP + location = 'gc_sweep' + + +class TestGCStateFinalize(TestGCStateBase): + gc_state = 'FINALIZE' + location = 'gc_finalize' + + STACK_RX = ( r'-+ Red zone:\s+\d+ slots -+\n' r'(' + RX_ADDR + r'\s+' + RX_FRAME + r' VALUE: nil\n?)*\n' -- 2.43.0