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 162A86ECDB; Thu, 24 Sep 2026 19:48:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 162A86ECDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1790268509; bh=4aB64UeN7eSmMS2ywizVpJCEECkK1yM7FrwnVvHYxO0=; 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=OfgWYr/3EOYdMCnudzYmJzt6U4uQtay0bqxKguVObpHeb9QbrwVmF2bi5YQCKB8AN Mseel4DRirMOKkPRL+bwBOwmBhYZkfvF6mo1sqiwYMId/qu6M7FISb8REcc9t85pl7 HS9Pumf9Jodnr0WZY9T+7GhAZcs1KV3fi6wGeEbw= Received: from send175.i.mail.ru (send175.i.mail.ru [95.163.59.14]) (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 90C846ECDB for ; Thu, 24 Sep 2026 19:48:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 90C846ECDB Received: by exim-smtp-5b54c96989-7p6kr with esmtpa (envelope-from ) id 1x9mcT-00000000JIi-3lRo; Thu, 24 Sep 2026 19:48:26 +0300 To: Sergey Kaplun , Sergey Bronnikov , Evgeniy Temirgaleev Date: Thu, 24 Sep 2026 19:48:21 +0300 Message-ID: <20260924164821.188162-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: 3DC2E5C095ECD32D8E7FD94675F33565EDEC7D63C463244AE9982AED78A67D84380311B88C9AB24D X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD923F1B5F87BDC70E6CCC9D307F2DF40D706C63A0570A9320A182A05F538085040F800AD2379A477863DE06ABAFEAF6705594E05F9204DF58D257A347601026CA8E14ECCED8CD6B7DB X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70186A8DAAA7CBDB1EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566D216EB99429A6A60DD2914B05C7896B095E312FBCD92F806AE61F7622F95AB068EEF46B7454FC60B9742502CCDD46D0D1D471462564A2E19BA3038C0950A5D36D5E8D9A59859A8B69F88CA9FCAE41F4D76E601842F6C81A1F004C906525384303E02D724532EE2C3F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7C590056E1B436ACBA43847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A5FE7676B6CEFF71DD5002B1117B3ED6965EAFA546BB3A98DA9E040399BDE4761E823CB91A9FED034534781492E4B8EEAD1DEE520572A35377C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659DA116AB37945AE548A40147D81F6AB8D30DA345985466F446A80FF85AA93B8EC9AE6A68ED09A77C7B8341EE9D5BE9A0A1753ADEB31BA8B90DFD5B04BCBD7FC079F6AF557CE80B90D9350E1BD188BD56E4C41F94D744909CE9D6718F459EE2962AE54DA86D399E591103B389C0A9E82E8 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWIJYFhl1tRS1l/VZul3y37o= X-Mailru-Sender: 49D287FBCBBF3A5C3B2EFE8832C895B58C7CDEB699FA37A63DE06ABAFEAF6705594E05F9204DF58DA165F1893FAC5C751036CFC832F975CE5A92E71CC7C3152D493CB54E9A9D11381B6B970E2AF9E88A510CA7867B031959FEAC74B6516BD3BDB4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit v2] 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 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 | 19 +++++++++++++------ .../debug-extension-tests.py | 6 ++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py index 5cd23a88..a564801b 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('(? : Lua function @ , upvalues, : C function - : fast function # + : fast function (#) * LJ_TTRACE: trace @ * LJ_TCDATA: cdata @ * LJ_TTAB: table @ (asize: , hmask: ) @@ -2932,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 5e369f00..86954909 100644 --- a/test/tarantool-debugger-tests/debug-extension-tests.py +++ b/test/tarantool-debugger-tests/debug-extension-tests.py @@ -326,7 +326,7 @@ GCO_ARGS = ( 'coroutine.create(function() end),\n' 'function() end,\n' 'require,\n' - 'print,\n' + 'math.min,\n' 'ffi.new("int*"),\n' '{1},\n' 'newproxy(),\n' @@ -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 math.min (#[0-9]+)\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' @@ -367,6 +367,7 @@ class TestLJTV(TestCaseBase): # Sorted in LJT order. lua_script = ( 'local ffi = require("ffi")\n' + 'local math = require("math")\n' 'print(\n' ' nil,\n' ' false,\n' @@ -435,6 +436,7 @@ class TestLJGCo(TestCaseBase): lua_script = ( 'local ffi = require("ffi")\n' + 'local math = require("math")\n' 'print(\n' + GCO_ARGS + ' 1\n' # Stub for the pattern. -- 2.43.0