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 9B2AD6ECCE; Wed, 9 Sep 2026 16:07:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9B2AD6ECCE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1788959257; bh=sTLnRdO5W5Gw/dUd39F297Jt33Y2PREfKj5a00AZ54A=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=LBIne6gxcGPzeb2k+mEZnsk9/U76cNyf7BWC71d+hfZeoPJm5dxTej37z5IaFulGd +oZpjjHixJB+Ok5YG6P0JhR+cgd8p1qHVKsTyOsUMM0ZxG1SnmXEfm7wp9U+mTH+qH vfcB/5qCWpL5Gy+uvsYx0DPGuDcexhOxD3toQmtg= Received: from send149.i.mail.ru (send149.i.mail.ru [89.221.237.244]) (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 6F1C86ECCE for ; Wed, 9 Sep 2026 16:07:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6F1C86ECCE Received: by exim-smtp-569b45c49c-gldhb with esmtpa (envelope-from ) id 1x4I1W-00000000FP2-0HeG; Wed, 09 Sep 2026 16:07:34 +0300 To: Sergey Kaplun , Sergey Bronnikov , Evgeniy Temirgaleev Date: Wed, 9 Sep 2026 16:07:30 +0300 Message-ID: <20260909130730.362946-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: 493C767FFF376C77411046492FDDF80675A55C00FB46E6052E93FAEE2E2E83E3AD89C82B53AB2875 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD978AFEFB3096932CFC34E637AD4A5ED55052A85A58ACE887D182A05F538085040AFF033756C5A4F8B3DE06ABAFEAF6705D49CF4AC2AC4C07C6D4245662B348710421CDA9B766B0189 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BF6702EC5472AA0FEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566A08549CA5D9647617B27BA991181B8594632F527EE2C0664C7D32077052DA6AA8EEF46B7454FC60B9742502CCDD46D0D5FF72824B19451C62E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3536B758DA41ACB7635872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-87b9d050: 1 X-C1DE0DAB: 0D63561A33F958A5E22BEEF2E70F300E5002B1117B3ED6961717A65234265A33219207EC0A953D2C823CB91A9FED034534781492E4B8EEAD0BE004AA24E73514C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659A0E89DAD5DB6ABC7FCF99C70925AA62F736EC13453D11307226B1EBD4883BDD0CFC7A45B2C062EEEB8341EE9D5BE9A0A4D69E002A1F6F0A26F420BA7EF15DB2B2A106FFF1157F30F9350E1BD188BD56E4C41F94D744909CE9D6718F459EE2962AE54DA86D399E591103B389C0A9E82E8 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWEg1jXmJGi9FtEW4g7DlDWI= X-Mailru-Sender: 689FA8AB762F73937C9FA53A4753B31333FD4E09055818678CBEF2B63054E9B5B08478236707C210567B8845310477678B5D19FF33E2B21BC8157BDAF8912DC0981874AA068F0975204DA63403278206F52067E1A4DAC7CAC77752E0C033A69E3453F38A29522196 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] 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 --- This patch is to be applied after the 'avoid hardcoded enums' patch. 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 | 17 +++++++++++------ .../debug-extension-tests.py | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py index 1ac1d275..262fdad1 100644 --- a/src/luajit_dbg.py +++ b/src/luajit_dbg.py @@ -1682,8 +1682,11 @@ def ir_kint64(ir): # Dumpers. +FF_NAMES = EnumBasedList('FastFunc', 'FF__MAX', cut_prefix, 'FF_') + # GCobj dumpers. + def dump_lj_gco_str(gcobj): return 'string {body} @ {address}'.format( body=strdata(gcobj), @@ -1705,7 +1708,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) @@ -1718,7 +1721,8 @@ def dump_lj_gco_func(gcobj): elif ffid == 1: return 'C function @ {}'.format(strx64(func['f'])) else: - return 'fast function #{}'.format(int(ffid)) + ffname = FF_NAMES[ffid] if ffid < len(FF_NAMES) else "unknown" + return 'fast function #{}({})'.format(ffid, ffname) def dump_lj_gco_trace(gcobj): @@ -2068,7 +2072,7 @@ def dump_proto(proto): def dump_func(func): - ffid = func['ffid'] + ffid = int(func['ffid']) if ffid == 0: pt = funcproto(func) @@ -2076,7 +2080,8 @@ def dump_func(func): elif ffid == 1: return 'C function @ {}\n'.format(strx64(func['f'])) else: - return 'fast function #{}\n'.format(int(ffid)) + ffname = FF_NAMES[ffid] if ffid < len(FF_NAMES) else "unknown" + return 'fast function #{}({})\n'.format(ffid, ffname) # FFI dumpers. @@ -2702,7 +2707,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: ) @@ -2921,7 +2926,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 9989032b..40a27c3a 100644 --- a/test/tarantool-debugger-tests/debug-extension-tests.py +++ b/test/tarantool-debugger-tests/debug-extension-tests.py @@ -338,7 +338,7 @@ GCO_RX = ( 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'fast function #[0-9]+\(\w+\)\n' 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' -- 2.43.0