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 629C86F812; Fri, 13 Nov 2026 02:44:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 629C86F812 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1794527041; bh=oQeL4SS4v8mUJ8BvbaemEZX65KwhaVwCUHQ6nEDC4Tc=; 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=Lb2jFf3WQEtJkHOCRfkC0xtTyPWcmba05bxZlQYqoRnokZcSfP2GO54tPjnYKfadj pcf206PJcNQfB15wt68z4bccyr3u9bfspdT5tpb8s1cCMKFIP4L2WWBrFlcPguhjVv Ys2th+62NdjiArpm5SiSazERVijhZuKf8Z7rfldk= Received: from send242.i.mail.ru (send242.i.mail.ru [95.163.59.81]) (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 108D96F812 for ; Fri, 13 Nov 2026 02:42:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 108D96F812 Received: by exim-smtp-5cfb6649f-vjfzp with esmtpa (envelope-from ) id 1xReR6-00000000Ioc-3Lwo; Fri, 13 Nov 2026 02:42:33 +0300 To: Sergey Kaplun , Sergey Bronnikov , Evgeniy Temirgaleev Date: Fri, 13 Nov 2026 02:42:24 +0300 Message-ID: <182499f986d1c843d6ff9344c8ccfb74fa876063.1794522533.git.m.elhimov@vk.team> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-618D5548: E5D602929EA0260DC7D0F6C13AE992136972F2D4D38C2A0372197B577EDF39BEECB89C5C49362C35 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9089E34853A70B9B0844ACA3D068CF6F2201C2CED44CBEA70182A05F5380850409D996CEB65AF1FEC3DE06ABAFEAF670539738D546E7E9B4CC4E5300F674211BB89BD80B6B4489A2D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BF27F4FA2823CCF0EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375661F398E59D6539FAAE7E510BC5E9141E221BD0CFBDC08AF5BCC6687EE5569E9A68EEF46B7454FC60B9742502CCDD46D0DB11811A4A51E3B09090A508E0FED62991661749BA6B977356B91AC3BD56FC247B3661434B16C20ACC84D3B47A649675FE827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B55EFFB8B260DB51875ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A5FC4EA0426BB23C735002B1117B3ED696CFDB7DAF23774E409E040399BDE4761E823CB91A9FED034534781492E4B8EEAD01FFEFEB280F0BCCC79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D65991D8D3B6F43BA29D7AF9838F12C22CAD2FD58F69C0461422728AF4D661DD3A52DD7B8DD7DDC2EDDFB8341EE9D5BE9A0A1B0E9F8EB2B042E12F3E611DBA4EFD58211DD3B7A143432F9350E1BD188BD56E4C41F94D744909CE9D6718F459EE2962AE54DA86D399E591103B389C0A9E82E8 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWMEqUvd5Nog/3KofJT2Itw4= X-Mailru-Sender: CE01F6F06FBB9B4E14759DB66A5FA98A6D2CCDEA142062B5B951B70A5BD4BD8E097A130A8F03083438066306E4938E9FEAA2F645D7D0C73F8B67290C0B8F2C0D12EEFBA914E8A1CE696B58449F085A8023028798991C5DA182F85D6DCAB44FBA5FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 3/4] dbg: display fast function name along with ffid 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" Part of tarantool/tarantool#4808 --- src/luajit_dbg.py | 22 +++- .../debug-extension-tests.py | 121 ++++++++++++++---- 2 files changed, 109 insertions(+), 34 deletions(-) diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py index ceba4c58..db4b3f04 100644 --- a/src/luajit_dbg.py +++ b/src/luajit_dbg.py @@ -1178,6 +1178,11 @@ def frames(L): # LuaJIT macro implementations and structure access. +# Get FastFunc enum members and replace any single '_' with '.'. +FF_NAMES = EnumBasedList('FF__MAX', 'FastFunc', lambda x: + re.sub('(? : Lua function @ , upvalues, : C function - : fast function # + : fast function (#) * LJ_TTRACE: trace @ * LJ_TCDATA: cdata @ * LJ_TTAB: table @ (asize: , hmask: ) @@ -2997,7 +3007,7 @@ the type and some info related to it. * LJ_TFUNC: : Lua function @ , upvalues, : C function - : fast function # + : fast function (#) * LJ_TTRACE: trace @ * LJ_TCDATA: cdata @ * LJ_TTAB: table @ (asize: , hmask: ) diff --git a/test/tarantool-debugger-tests/debug-extension-tests.py b/test/tarantool-debugger-tests/debug-extension-tests.py index 8a3ef96a..9237d3f1 100644 --- a/test/tarantool-debugger-tests/debug-extension-tests.py +++ b/test/tarantool-debugger-tests/debug-extension-tests.py @@ -92,6 +92,9 @@ if LLDB: SET_EXEC = 'target create ' + LUAJIT_BINARY SET_RUN_ARGS = 'settings set target.run-args' + def modify_obj_cmd(obj, val): + return 'expression {} = {}'.format(obj, val) + def execute_process(cmd, timeout=TIMEOUT): # While executing extension commands LLDB might produce # errors that cannot be caught in extension. The internal @@ -128,6 +131,9 @@ else: SET_RUN_ARGS = 'set args' execute_process = execute_process_raw + def modify_obj_cmd(obj, val): + return 'set var {} = {}'.format(obj, val) + IS_DUALNUM = execute_process([ LUAJIT_BINARY, '-e', "print(require('ffi').abi('dualnum'))" ]).strip() == 'true' @@ -361,13 +367,31 @@ class TestLJStackFunc(TestCaseBase): pattern = STACK_RX +FFUNC_ARGS = ( + 'print,\n' + 'math.min,\n' + 'getmetatable(io.stdout).close,\n' + 'getmetatable(io.stdout).__gc,\n' + 'getmetatable(io.stdout).__tostring,\n' +) + + +FFUNC_RX = ( + r'fast function print \(#[0-9]+\)\n' + r'fast function math.min \(#[0-9]+\)\n' + r'fast function io.method.close \(#[0-9]+\)\n' + r'fast function io.method.__gc \(#[0-9]+\)\n' + r'fast function io.method.__tostring \(#[0-9]+\)\n' +) + + # Sorted in LJT order. GCO_ARGS = ( '"hello",\n' 'coroutine.create(function() end),\n' 'function() end,\n' - 'require,\n' - 'print,\n' + 'require,\n' + + FFUNC_ARGS + 'ffi.new("int*"),\n' '{1},\n' 'newproxy(),\n' @@ -378,8 +402,8 @@ GCO_RX = ( r'string \"hello\" @ ' + RX_ADDR + r'\n' r'thread @ ' + RX_ADDR + r'\n' r'Lua function @ ' + RX_ADDR + r', [0-9]+ upvalues, .+:[0-9]+\n' - r'C function @ ' + RX_ADDR + r'\n' - r'fast function #[0-9]+\n' + r'C function @ ' + RX_ADDR + r'\n' + + FFUNC_RX + r'cdata @ ' + RX_ADDR + r' \[\d+\] 0x0\n' r'table @ ' + RX_ADDR + r' \(asize: \d+, hmask: ' + RX_HASH + r'\)\n' r'userdata @ ' + RX_ADDR + r'\n' @@ -388,21 +412,9 @@ GCO_RX = ( class TestLJTV(TestCaseBase): location = 'lj_cf_print' - extension_cmds = ( - 'lj-tv L->base\n' - 'lj-tv L->base + 1\n' - 'lj-tv L->base + 2\n' - 'lj-tv L->base + 3\n' - 'lj-tv L->base + 4\n' - 'lj-tv L->base + 5\n' - 'lj-tv L->base + 6\n' - 'lj-tv L->base + 7\n' - 'lj-tv L->base + 8\n' - 'lj-tv L->base + 9\n' - 'lj-tv L->base + 10\n' - 'lj-tv L->base + 11\n' - 'lj-tv L->base + 12\n' - 'lj-tv L->base + 13\n' + extension_cmds = ''.join( + ('lj-tv L->base+{}\n'.format(i) + for i in range(4 + GCO_ARGS.count('\n') + 2)) ) # Sorted in LJT order. @@ -463,15 +475,9 @@ class TestLJTab(TestCaseBase): class TestLJGCo(TestCaseBase): location = 'lj_cf_print' - extension_cmds = ( - 'lj-gco ' + gcval('L->base + 0') + '\n' - 'lj-gco ' + gcval('L->base + 1') + '\n' - 'lj-gco ' + gcval('L->base + 2') + '\n' - 'lj-gco ' + gcval('L->base + 3') + '\n' - 'lj-gco ' + gcval('L->base + 4') + '\n' - 'lj-gco ' + gcval('L->base + 5') + '\n' - 'lj-gco ' + gcval('L->base + 6') + '\n' - 'lj-gco ' + gcval('L->base + 7') + '\n' + extension_cmds = ''.join( + ('lj-gco ' + gcval('L->base + {}'.format(i)) + '\n' + for i in range(GCO_ARGS.count('\n'))) ) lua_script = ( @@ -485,6 +491,65 @@ class TestLJGCo(TestCaseBase): pattern = GCO_RX +class TestLJGCoFFUnknown(TestCaseBase): + location = 'lj_cf_print' + + val = '((GCfuncC *)' + gcval('L->base') + ')' + extension_cmds = ( + 'lj-gco ' + val + '\n' + + modify_obj_cmd(val + '->ffid', 242) + '\n' + 'lj-gco ' + val + '\n' + + modify_obj_cmd(val + '->ffid', 253) + '\n' + 'lj-gco ' + val + '\n' + ) + + lua_script = 'print(pcall)' + + pattern = ( + r'fast function pcall \(#[0-9]+\)\n' + r'fast function unknown \(#242\)\n' + r'fast function unknown \(#253\)\n' + ) + + +class TestLJFuncFFKnown(TestCaseBase): + location = 'lj_cf_print' + extension_cmds = ''.join( + ('lj-func ' + gcval('L->base + {}'.format(i)) + '\n' + for i in range(FFUNC_ARGS.count('\n'))) + ) + + lua_script = ( + 'print(\n' + + FFUNC_ARGS + + ' 1\n' # Stub for the pattern. + ')\n' + ) + + pattern = FFUNC_RX + + +class TestLJFuncFFUnknown(TestCaseBase): + location = 'lj_cf_print' + + val = '((GCfuncC *)' + gcval('L->base') + ')' + extension_cmds = ( + 'lj-func ' + val + '\n' + + modify_obj_cmd(val + '->ffid', 242) + '\n' + 'lj-func ' + val + '\n' + + modify_obj_cmd(val + '->ffid', 253) + '\n' + 'lj-func ' + val + '\n' + ) + + lua_script = 'print(pcall)' + + pattern = ( + r'fast function pcall \(#[0-9]+\)\n' + r'fast function unknown \(#242\)\n' + r'fast function unknown \(#253\)\n' + ) + + PROTO_FUNC_SCRIPT = ( 'local uvname = false\n' 'local function testf(...)\n' -- 2.55.0