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 31E326EC5A; Fri, 16 Oct 2026 17:49:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 31E326EC5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1792162148; bh=2R8XtqtIJ0l8fWVxy+ZeNF40V3kAYrtO/0qTlE/XmG4=; 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=XyjIGR26yaQJeMzxN8xh4W9TORE1SftfjhqnZDH0IC9BznsxqzeBtA6kZvzhMnG48 ieUlHbKv/1v/ZEdC0kSu5xMeaKqWL+83OiPBZLER+eIHDcXSo3HI+SqCb9EJs/Z1p8 c3QOcASYj9FpvtrO4SsGLxa/Z6dIm7uXz7DLkENA= Received: from send82.i.mail.ru (send82.i.mail.ru [89.221.237.177]) (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 B4AA56EC5A for ; Fri, 16 Oct 2026 17:49:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B4AA56EC5A Received: by exim-smtp-canary-30-cb6b8b7df-glpj9 with esmtpa (envelope-from ) id 1xHjF3-000000003WX-2Jsf; Fri, 16 Oct 2026 17:49:06 +0300 Message-ID: Date: Fri, 16 Oct 2026 17:49:04 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Mikhail Elhimov , Sergey Kaplun , Evgeniy Temirgaleev Cc: tarantool-patches@dev.tarantool.org References: <20261007163315.115049-1-m.elhimov@vk.team> <20261015213833.380877-1-m.elhimov@vk.team> Content-Language: en-US In-Reply-To: <20261015213833.380877-1-m.elhimov@vk.team> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-618D5548: 9686811261A0BD2DA6D5EE0DB6E1EC8DC544E31F0F326005C98A17E6341C2A86150BD01109ADFBBC X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9D5ABD805758C3F0B718B9D47019D1B3CCE896383C09544C6182A05F5380850409A1CC209F6FB424D3DE06ABAFEAF6705FD793AC112C00E1C23776D882C4CCDF95E522EEE8CA89B86 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A34C649281B21B01EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667E1D4B08D42AEC87A2C106434938771189BBBBD128D779E27C07634592686AA9389733CBF5DBD5E9D5E8D9A59859A8B636DA1BED736F9328CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB86D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3EBF4D8D28E8B690335872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5CDCAC2D102BEBC145002B1117B3ED696ABA5EF137E4C82C73D2BBC1EF78EDEBE823CB91A9FED034534781492E4B8EEAD27E9584FBD6BDD31BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADB58128AB1E6D661A716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D6595F39434757A96BD5C6C613C39B1D054DFDDBECB95A2FC880B22A0CCEFF42123462DD154DEDD34DE4B8341EE9D5BE9A0A4F134531D0709DED042E8CA856AD2AF5065C03B0C75C7727C7CEAA0681F5848F4C41F94D744909CE2512F26BEC029E55448553D2254B8D95CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWPCX4h2h1/NSl/VZul3y37o= X-Mailru-Sender: 689FA8AB762F73937C9FA53A4753B3139C274FBE60F8AE1964127910B8AC79D903A89CDDC63106E1EF86D5F70DA33880E41E8EF7A07863ECB274557F927329BE2DDF8182D28ACDB545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: Re: [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: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Mikhail, thanks for the patch! LGTM Sergey On 10/16/26 00:38, Mikhail Elhimov wrote: > 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('(? + > + > def mref(typename, obj): > return dbg.cast(typename, obj['ptr64'] if LJ_GC64 else obj['ptr32']) > > @@ -1691,6 +1696,11 @@ def ir_kint64(ir): > > # Dumpers. > > +def dump_fast_function(ffid): > + ffname = FF_NAMES[ffid] if ffid < len(FF_NAMES) else 'unknown' > + return 'fast function {} (#{})'.format(ffname, ffid) > + > + > # GCobj dumpers. > > def dump_lj_gco_str(gcobj): > @@ -1714,7 +1724,7 @@ def dump_lj_gco_proto(gcobj): > > def dump_lj_gco_func(gcobj): > func = dbg.cast('struct GCfuncC *', gcobj) > - ffid = func['ffid'] > + ffid = int(func['ffid']) > > if ffid == 0: > pt = funcproto(func) > @@ -1727,7 +1737,7 @@ def dump_lj_gco_func(gcobj): > elif ffid == 1: > return 'C function @ {}'.format(strx64(func['f'])) > else: > - return 'fast function #{}'.format(int(ffid)) > + return dump_fast_function(ffid) > > > def dump_lj_gco_trace(gcobj): > @@ -2061,7 +2071,7 @@ def dump_proto(proto): > startbc = proto_bc(proto) > func_loc = proto_loc(proto) > # Location has the following format: '{chunk}:{firstline}'. > - dump = '{func_loc}-{lastline}\n'.format( > + dump = '{func_loc}-{lastline}'.format( > func_loc=func_loc, > lastline=proto['firstline'] + proto['numline'], > ) > @@ -2070,22 +2080,22 @@ def dump_proto(proto): > return '=> ' + 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'