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 E716BB006DF; Mon, 13 May 2024 14:57:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E716BB006DF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1715601478; bh=+ndCvuoQYNm6ZZTW7Wp/yT5TgriTlSEtzXBF4z4sROM=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=JvnuiqfThFOk76YeyESmnAw2O5+i8hRMcaHUAiQe12Bu6QdVYfEXJrp4CpvoHf0vS wOT6/t2q4VBYLkuPS4ZFzvbQZJNEQh0nPaak0gFve/FnrAPLV0gFmCnTbzgTB2H0Y6 cKt/OZPtNCiKKilFx3aPcch9kE1LrKk/AXJQKPIw= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [95.163.41.100]) (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 19211B006DF for ; Mon, 13 May 2024 14:57:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 19211B006DF Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1s6UJX-00000005Har-1lKv; Mon, 13 May 2024 14:57:55 +0300 Date: Mon, 13 May 2024 14:53:44 +0300 To: Maxim Kokryashkin Message-ID: References: <7c0a7be30070d085d6ddd3b56c4338686e1c2baa.1713773432.git.skaplun@tarantool.org> <27ej4kuqyymxku5bezfm4e3ooj22iy7vxjng5mq6odg2m44ct6@ntzy3uf677hk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <27ej4kuqyymxku5bezfm4e3ooj22iy7vxjng5mq6odg2m44ct6@ntzy3uf677hk> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9FE60AC74BBEF0CF04EAACC96EBE9F46C9B51F3F288ED3121182A05F5380850404C228DA9ACA6FE273A623D836730F4FAD27678DDAA806314BAB6221606A5A92F1C32CF11B01418A488EE2A1A7F2CFE66 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72AC9FB60380F23AEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637279A5203CF71F5518638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8929F57A09D9DA2D9A0BB36D8E171E019F96584C54713F450CC7F00164DA146DAFE8445B8C89999728AA50765F790063793270F7220657A0A389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8ED96AA85C75E140D117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C2FFDA4F57982C5F42E808ACE2090B5E1725E5C173C3A84C317B107DEF921CE79089D37D7C0E48F6C8AA50765F7900637C970FD8DF19C51D2EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A58DD14A38B8614EE05002B1117B3ED69632CDA99C9B896FB0CA7E60A991436CA2823CB91A9FED034534781492E4B8EEADA3A806F356AF31D6 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF3AD37B657735E6D529DA5EDF37A71AB9911B44B325226ED6F990D0309A4F73BF327C9FD717F33718A198138DB11F6B951D0CDC43814EDA41E9E08A069004CD18EBF18FCFFF2BD2665F4332CA8FE04980913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojcheZ1TQj/oc9YR1yWG/ELg== X-DA7885C5: 5D713A5E54D6BB1AF255D290C0D534F90CFAC8CAF33B162D7A560F41904174ACBBB5809208CA3D495B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9BB4C9F78E1FCBFBDD81904926408BF4D8AADD4EB568E18537E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v1 3/5] test: allow `jit.parse` to return aborted traces 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 Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Maxim! Thanks for the review! Added a comment as you suggested and force-pushed the branch. On 05.05.24, Maxim Kokryashkin wrote: > Hi, Sergey! > Thanks for the patch! > LGTM, except for a single nit below. > On Mon, Apr 22, 2024 at 11:49:56AM UTC, Sergey Kaplun wrote: > > @@ -87,9 +88,17 @@ local header_handlers = { > > ctx.parsing_trace = nil > > ctx.parsing = nil > > end, > > - abort = function(ctx, trace_num) > > + abort = function(ctx, trace_num, line) > > local traces = ctx.traces > > assert(ctx.parsing_trace == trace_num) > > + > > + local aborted_traces = ctx.aborted_traces > > + if not aborted_traces[trace_num] then > > + aborted_traces[trace_num] = {} > > + end > > + traces[trace_num].abort_reason = line:match('-- (.+)$') > Please drop a comment explaining the regexp. Added: =================================================================== diff --git a/test/tarantool-tests/utils/jit/parse.lua b/test/tarantool-tests/utils/jit/parse.lua index 0ce7f7c8..f853437d 100644 --- a/test/tarantool-tests/utils/jit/parse.lua +++ b/test/tarantool-tests/utils/jit/parse.lua @@ -96,6 +96,8 @@ local header_handlers = { if not aborted_traces[trace_num] then aborted_traces[trace_num] = {} end + -- The reason is mentioned after "-- " at the end of the + -- string. traces[trace_num].abort_reason = line:match('-- (.+)$') table.insert(aborted_traces[trace_num], traces[trace_num]) =================================================================== > > + table.insert(aborted_traces[trace_num], traces[trace_num]) > > + > > -- Best regards, Sergey Kaplun