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 4F9BC6ECF8; Wed, 7 Oct 2026 19:33:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4F9BC6ECF8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1791390804; bh=XnAM155f1bGSDmqyG6AIp2J1xsAqF1vLcuvLLzgcc+o=; 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=PqdBGwxnp2hDcii8nmFOzQygu1vvsWuM2efmiYChHtXsATcvXm5AftD+yR6NecmCl xByA/e59eIsYLfsVF8ZBSpGTOObpOee9sniWBRq8psmt4QsgUYIxy/H+4Cmh56Cstq NY83eH+IPRedijLlMl7opJyQodyzzUz0tULwbXc0= Received: from send278.i.mail.ru (send278.i.mail.ru [95.163.59.117]) (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 1B69E6ECF8 for ; Wed, 7 Oct 2026 19:33:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1B69E6ECF8 Received: by exim-smtp-84d6fb566c-n49mq with esmtpa (envelope-from ) id 1xEUa1-000000002cO-3A7v; Wed, 07 Oct 2026 19:33:22 +0300 To: Sergey Kaplun , Sergey Bronnikov , Evgeniy Temirgaleev Date: Wed, 7 Oct 2026 19:33:15 +0300 Message-ID: <20261007163315.115049-1-m.elhimov@vk.team> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-618D5548: 2D9FAFB12D61FCDFF378A8CA21F699D6E5D5C35D7B3DCCE49C9ACF72AB392BD47BA39BDB4A7B5DA7 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9CB0CF91FF61D77F06E9ABAB2625A469193AD7CD0D335B508182A05F538085040D765CB668548F3F03DE06ABAFEAF6705E787312D4AA594D304F832934A048B104ED41D986C17A953 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE772FD67E8B75B52AFEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667A7F1054949754024475883D4898EFE10229D634E8BB60CC01F9BEEDDEA3DDA18EEF46B7454FC60B9742502CCDD46D0DB11811A4A51E3B09090A508E0FED62991661749BA6B977351DCA69B2CC609F68B3661434B16C20ACC84D3B47A649675FE827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B4D9723CD00C318F275ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A57D682ED6A44CA35F5002B1117B3ED696352F9CAA42562B70CA7E60A991436CA2823CB91A9FED034534781492E4B8EEAD42E5C09891E4E6C3F36E2E0160E5C55395B8A2A0B6518DF68C46860778A80D548E8926FB43031F38 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659CC0B15F8EEAC0C160AB33CC7B42558D7DF169A143840839AABBC9788DE0E16C9F40F16B1BDDB6346B8341EE9D5BE9A0AE7F2D5273AF0ABF3D2EDB5AF297EA91967B6F7757B41D8659350E1BD188BD56E4C41F94D744909CE9D6718F459EE2962AE54DA86D399E591103B389C0A9E82E8 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWIho/EPgk+xwDLEd9SnCO68= X-Mailru-Sender: 9404297511D70F1A7B5E4BE232D4685FC26B8BA33D5452C43DE06ABAFEAF6705E787312D4AA594D3A165F1893FAC5C751036CFC832F975CE5A92E71CC7C3152D493CB54E9A9D11381B6B970E2AF9E88A510CA7867B031959FEAC74B6516BD3BDB4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit v4] 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 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-September/030791.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 | 125 ++++++++++++++---- 2 files changed, 119 insertions(+), 42 deletions(-) diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py index 7c2d085f..1d553fb9 100644 --- a/src/luajit_dbg.py +++ b/src/luajit_dbg.py @@ -1121,6 +1121,11 @@ def frames(L): # LuaJIT macro implementations and structure access. +# Get FastFunc enum members and replace any single '_' with '.'. +FF_NAMES = EnumBasedList('FastFunc', 'FF__MAX', 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. @@ -2669,7 +2679,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): @@ -2713,7 +2723,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: ) @@ -2786,9 +2796,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): @@ -2932,7 +2940,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 5e369f00..b6e51185 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]+' @@ -320,13 +327,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' @@ -337,8 +362,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' @@ -347,26 +372,15 @@ 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. lua_script = ( 'local ffi = require("ffi")\n' + 'local math = require("math")\n' 'print(\n' ' nil,\n' ' false,\n' @@ -422,19 +436,14 @@ 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 = ( 'local ffi = require("ffi")\n' + 'local math = require("math")\n' 'print(\n' + GCO_ARGS + ' 1\n' # Stub for the pattern. @@ -444,6 +453,66 @@ 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 = ( + 'local math = require("math")\n' + '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