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 F00066ECE0; Fri, 16 Oct 2026 00:38:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F00066ECE0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1792100319; bh=PBEzQiXEyIx730CDTCjPNFz5ozeJ2v1sWa83gbWu1uU=; 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=YxZlR/05sjPmaIYIH1Y1reYOVzvgAyOAsMc3MUimvAxlF8CY2/Iy3I4uB8gmRGOUX D6xtVM6TbRiUBJsfN5PAVsdGX4jXd1Qmh+BqACXAL2r5DC9Y29+wH0GxvdRz/SmlF/ 9Jsdp7Rhmse+//fmbZqaBxSyH0xewTtJBnsEi/k8= Received: from send277.i.mail.ru (send277.i.mail.ru [95.163.59.116]) (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 5838B6ECE0 for ; Fri, 16 Oct 2026 00:38:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5838B6ECE0 Received: by exim-smtp-canary-30-cb6b8b7df-hx92j with esmtpa (envelope-from ) id 1xHT9p-00000000PnF-10so; Fri, 16 Oct 2026 00:38:37 +0300 To: Sergey Kaplun , Sergey Bronnikov , Evgeniy Temirgaleev Date: Fri, 16 Oct 2026 00:38:33 +0300 Message-ID: <20261015213833.380877-1-m.elhimov@vk.team> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261007163315.115049-1-m.elhimov@vk.team> References: <20261007163315.115049-1-m.elhimov@vk.team> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-618D5548: A8F0DD33FB49587C06104296DCCA83D26700B4383C6EC940CAB3A2F92C4540E0202A987721BD62BE X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5ABD805758C3F0B2DC1331E446A96F959C082B041B0C28F182A05F53808504000BD92D0652A94D83DE06ABAFEAF6705555D01E848BF455E60A8EA93BDA6C40E39E8B8BCDB49C505 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C4FDA87F74E4A9F6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667E1D4B08D42AEC87640CE7E5D4AFD4548CDEC7F773F71678EB285543C3974C6F8EEF46B7454FC60B9742502CCDD46D0D062BEEFFB5F8EA3E2E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C34B556A7116F344E835872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-87b9d050: 1 X-C1DE0DAB: 0D63561A33F958A5A2E73EBE823768515002B1117B3ED696C3CE1CC27ABA9CBD9E040399BDE4761E823CB91A9FED034534781492E4B8EEAD0BE004AA24E73514C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659C78812A1C5E35547B3070E5C62AB0C2AF4BF051A9D52B66C7A11231C64B69CDCDEEC2D4BFA06D124B8341EE9D5BE9A0AD93D93DAC2D0B832D331799F98ACD31511096D2E3FE3084E9350E1BD188BD56E4C41F94D744909CE9D6718F459EE2962AE54DA86D399E591103B389C0A9E82E8 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWIetW9m9uqWknNR0l9D9uPM= X-Mailru-Sender: 689FA8AB762F73937C9FA53A4753B313D691F91C1BF2241287C5C6A656E0E25CAD41945D5663C27B567B8845310477678B5D19FF33E2B21BC8157BDAF8912DC0981874AA068F0975204DA63403278206F52067E1A4DAC7CAC77752E0C033A69E3453F38A29522196 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit v5] 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 --- Changes in v5: * Dropped unnecessary changes * Rebased onto https://lists.tarantool.org/pipermail/tarantool-patches/2026-October/030858.html Changes in v4: * Adjusted mapping of enum member to name ('_' is replaced with '.' only if it is not preceded by another '_') * Added tests of various ff (including unknown) * Reduced code duplication * Fixed typos Changes in v3: * Fixed fast function regexp in tests Changes in v2: * Format is changed to 'ffname (#ffid)' * Replaced single '_' with '.' in ffname * Adjusted tests to check mapping This patch is to be applied after https://lists.tarantool.org/pipermail/tarantool-patches/2026-October/030858.html Branch: https://github.com/tarantool/luajit/tree/elhimov/gh-4808-display-fast-function-name Related issue: https://github.com/tarantool/tarantool/issues/4808 src/luajit_dbg.py | 36 ++++-- .../debug-extension-tests.py | 122 ++++++++++++++---- 2 files changed, 116 insertions(+), 42 deletions(-) diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py index a4d7820e..a685ecfa 100644 --- a/src/luajit_dbg.py +++ b/src/luajit_dbg.py @@ -1125,6 +1125,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('(? ' + str(npc_from + delta).zfill(4) for bcnum in range(0, int(proto['sizebc'])): - dump += (str(bcnum).zfill(4) + ' ' + dump_bc( + dump += '\n' + str(bcnum).zfill(4) + ' ' + dump_bc( startbc[bcnum], jmp_format=jmp_format, jmp_ctx=bcnum, proto=proto, - ) + '\n') + ) return dump def dump_func(func): - ffid = func['ffid'] + ffid = int(func['ffid']) if ffid == 0: pt = funcproto(func) return dump_proto(pt) elif ffid == 1: - return 'C function @ {}\n'.format(strx64(func['f'])) + return 'C function @ {}'.format(strx64(func['f'])) else: - return 'fast function #{}\n'.format(int(ffid)) + return dump_fast_function(ffid) # FFI dumpers. @@ -2667,7 +2677,7 @@ function: ''' def execute(self, arg): - dbg.write('{}'.format(dump_func(dbg.cast('GCfuncC *', dbg.eval(arg))))) + dbg.write(dump_func(dbg.cast('GCfuncC *', dbg.eval(arg))) + '\n') class LJGC(dbg.LJBase): @@ -2711,7 +2721,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: ) @@ -2784,9 +2794,7 @@ function: ''' def execute(self, arg): - dbg.write('{}'.format( - dump_proto(dbg.cast('GCproto *', dbg.eval(arg))) - )) + dbg.write(dump_proto(dbg.cast('GCproto *', dbg.eval(arg))) + '\n') class LJDumpStack(dbg.LJBase): @@ -2931,7 +2939,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 359163e9..bbd53dcc 100644 --- a/test/tarantool-debugger-tests/debug-extension-tests.py +++ b/test/tarantool-debugger-tests/debug-extension-tests.py @@ -35,6 +35,10 @@ if LLDB: '--source-quietly', '--source' ] + + def modify_obj_cmd(obj, val): + return 'expression {} = {}'.format(obj, val) + else: # GDB. INFERIOR_ARGS = '--args' @@ -43,6 +47,9 @@ else: # Don't run any initialization scripts. RUN_CMD_FILE = ['--batch', '--nx', '--quiet', '--command'] + def modify_obj_cmd(obj, val): + return 'set var {} = {}'.format(obj, val) + TEST_VERBOSE = os.getenv('DEBUGGER_TEST_VERBOSE', default=False) RX_ADDR = r'0x[a-f0-9]+' @@ -334,13 +341,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' @@ -351,8 +376,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' @@ -361,21 +386,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. @@ -436,15 +449,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 = ( @@ -458,6 +465,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.43.0