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 87625BA1AED; Thu, 13 Jun 2024 13:35:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 87625BA1AED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1718274941; bh=O3mWqe9Zfi2qkdGNbykrZrWNkLPWgEyi6nD1vHWnRX0=; 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=QzWuuBxkwo/foAvMJQ/z9RoKBw0KLvjnGU3DmDYCgHkE7ckeIcHKhQmBjn10zlAZC FvV2h0+C4/YEMujO7XolZTD4NS7Isyfe/058V06s8qa0NRJj8CP0FBLID6ujDuy3TP JtL2RU520HbTxeIO/1PFI4IVdBE2IShfJiEOkWms= Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [95.163.41.92]) (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 90634BA1AED for ; Thu, 13 Jun 2024 13:35:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 90634BA1AED Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1sHhnv-00000002JGU-1ZPm; Thu, 13 Jun 2024 13:35:39 +0300 Date: Thu, 13 Jun 2024 13:31:26 +0300 To: Sergey Bronnikov Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9AC8CA0B4439200FA19AE3EA0235AE0E7243ECEBF822142BF00894C459B0CD1B98F1CCEE48DBB77232CD5C4874F525AA3FB1AA067BECCDFAF1ADC5BD76F62FA0E42B98C014DDF718D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE743AE26858062A689EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006371ECA800C705ED7E68638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E85894C59340A22B5746BA5E263E65F5F39869F478ECD8D4CC7F00164DA146DAFE8445B8C89999728AA50765F79006375FFD5C25497261569FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C362968DCAA3E4B45B117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C2FFDA4F57982C5F42E808ACE2090B5E1725E5C173C3A84C3E478A468B35FE767089D37D7C0E48F6C8AA50765F7900637427B078F297B269AEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A543E4A0F15A0580255002B1117B3ED696C04A6AD32FBD785833EE06AFCD964888823CB91A9FED034534781492E4B8EEADB73CFAAED92B6E13BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF4753A00C18ACC0EEFDDF9DC5AE5B5AA249D3774DE3E125D75417ADCF4F237D3906D2A967A71B238004A26A3878DC1330CAB72B498CC37957A9453B7F28BC4B4B8148E81E295B01AA5F4332CA8FE04980913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojP/c/PTD82Al7wrIY91Z05Q== X-DA7885C5: 905194D38331DD49F255D290C0D534F974DDE7741E857C17FEAAD8641D2701BE0D64EE0195BC90E65B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9BD1FBF219E1BE2C67547C208FC02FA04FCC2E4259BF045B62E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v1 5/5] Use generic trace error for OOM during trace stitching. 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, Sergey! Thanks for the review! Please consider my answers below. On 06.06.24, Sergey Bronnikov wrote: > Sergey, > > > thanks for the patch! See my comments below. > > > Sergey > > On 22.04.2024 11:49, Sergey Kaplun wrote: > > From: Mike Pall > > > > Thanks to Sergey Kaplun. > > > > (cherry picked from commit b8b49bf3954b23e32e34187a6ada00021c26e172) > > > > The previous commit doesn't handle the case when the error code is > > `LUA_ERRMEM`. This patch adds a workaround by using the generic error > > message. > > > > Sergey Kaplun: > > * added the description and the test for the problem > > > > Part of tarantool/tarantool#9924 > > --- > > src/lj_ffrecord.c | 2 + > > .../lj-1166-error-stitch-oom-ir-buff.test.lua | 41 ++++++++++++++++++- > > ...j-1166-error-stitch-oom-snap-buff.test.lua | 37 +++++++++++++++-- > > 3 files changed, 75 insertions(+), 5 deletions(-) > > > > diff --git a/src/lj_ffrecord.c b/src/lj_ffrecord.c > > index ff14e9e4..d5fc081e 100644 > > --- a/src/lj_ffrecord.c > > +++ b/src/lj_ffrecord.c > > @@ -150,6 +150,8 @@ static void recff_stitch(jit_State *J) > > if (errcode) { > > if (errcode == LUA_ERRRUN) > > copyTV(L, L->top-1, L->top + (1 + LJ_FR2)); > > + else > > + setintV(L->top-1, (int32_t)LJ_TRERR_RECERR); > > lj_err_throw(L, errcode); /* Propagate errors. */ > > } > > } > > diff --git a/test/tarantool-tests/lj-1166-error-stitch-oom-ir-buff.test.lua b/test/tarantool-tests/lj-1166-error-stitch-oom-ir-buff.test.lua > > index e3a5397d..cf3ab0f5 100644 > > --- a/test/tarantool-tests/lj-1166-error-stitch-oom-ir-buff.test.lua > > +++ b/test/tarantool-tests/lj-1166-error-stitch-oom-ir-buff.test.lua > > +test:skipcond({ > > + -- luacheck: no global > > I made a patch that remove inline suppressions [1]. > > I propose to merge it and remove inline suppressions in your patch > series too. Ok, I'll remove these supressions after merging your patch and rebasing to the master. > > > > +-- We only need the abort reason in the test. > > +jparse.start('t') > Same comment as in previous mail - let's add a comment regarding 't'. See my answers here [1]. > > + > > -- XXX: Update hotcounts to avoid hash collisions. > > jit.opt.start('hotloop=1') > > - > > jit.on() > > > > mockalloc.mock() > > @@ -49,6 +58,28 @@ tracef() > > > > mockalloc.unmock() > Same comment as in previous mail - let's avoid name 'mock' here. But we actually mock the allocator here, don't we? Thus, I renamed the new allocated function to avoid confusion. If you insist, please suggest the correct name instead `mock` | `unmock`. > > > > test:done(true) [1]: https://lists.tarantool.org/pipermail/tarantool-patches/2024-June/029218.html -- Best regards, Sergey Kaplun