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 7A5CC5DF790; Mon, 11 Sep 2023 11:25:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7A5CC5DF790 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1694420737; bh=24QLnjZCPuu2snMLetNHZ7Pt7tfMwup2frg4kODfQ4I=; 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=Y0Mo+iSZgbWR4s9/6QAZjqlhjKRG0hgnW890SEfN5iMN9mWqX7tPYuM+9OLGifagz 3b/Ch42QKEalCWaY2PW+MkLU8IytZTzvyHLctE7WIN6oDYb5aL7B4WX3KAS9fvacFP 7mo/94Yasi0GByudbXrBKYGSLmawLuhym59hV/Tg= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76]) (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 C30CD5DF790 for ; Mon, 11 Sep 2023 11:25:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C30CD5DF790 Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1qfcEh-00AIDZ-1Z; Mon, 11 Sep 2023 11:25:35 +0300 Date: Mon, 11 Sep 2023 11:20:52 +0300 To: Maxim Kokryashkin 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: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD96201AD55A1C8F7DB4B94316895B7D143959E6F65F85AE25C182A05F5380850404C228DA9ACA6FE27BCB8BE820CD13CDB235F32D925ECD7976F41544D2BC8D8F7BBEB785991F343D9 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70A10A23A3B64B805EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063795DC1BB912715AE68638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D832D488CE8870FB97985CCE03260EE50B117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCA1EA7C6ECC12BCC4A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE0AC5B80A05675ACD985B8ACC81218E19D8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE3D56D36E97F3F038C03F1AB874ED89028C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637DBAA09C62585F9A4EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A52215260A2E1E5D6AB09B4F7D388E6FF5BC9D70AD38F4B40CF87CCE6106E1FC07E67D4AC08A07B9B0E753FA5741D1AD02CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFFC38278B25DDE13E88FB7A6229E451032467EE096FDD76F9D2A31C6D3217BD242A6269F78606922FA44234FD4F46A84390C0E453292D4D5B1FC332FF62525878E48CAC7CA610320002C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojGCuXuOfYMcalj0RDck9x/w== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769EE9803C914BA783D235F32D925ECD7976ECF975C7BB2667FDEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] Fix frame for more types of on-trace error messages. 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 patch! LGTM, with a few nits below. On 05.09.23, Maxim Kokryashkin wrote: > From: Mike Pall > > Thanks to Maxim Kokryashkin. > > (cherry-picked from commit d5bbf9cdb4c5eddc404a90bd44f077cfb3a57a90) > > This patch fixes the same issue with frame, as the previous Typo: s/frame,/the frame/ > one, but now for the table overflow error in the `err_msgv` > function. The test for the problem uses the table of GC > finalizers, although they are not required to reproduce the > issue. They only used to make the test as simple as possible. Typo: s/They only used/They are only used/ Minor: Feel free to add the similar comment to the test itself. > > Resolves tarantool/tarantool#562 > Part of tarantool/tarantool#8825 > --- > src/lj_err.c | 4 +++ > .../lj-1034-tabov-error-frame.test.lua | 27 +++++++++++++++++++ > 2 files changed, 31 insertions(+) > create mode 100644 test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > > diff --git a/src/lj_err.c b/src/lj_err.c > index 763746e6..46fb81ee 100644 > --- a/src/lj_err.c > +++ b/src/lj_err.c > diff --git a/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua b/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > new file mode 100644 > index 00000000..b7520d92 > --- /dev/null > +++ b/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua > @@ -0,0 +1,27 @@ > +local tap = require('tap') > +local ffi = require('ffi') > +local test = tap.test('lj-1034-tabov-error-frame'):skipcond({ > + ['Test requires JIT enabled'] = not jit.status(), > + ['Test requires GC64 mode enabled'] = not ffi.abi('gc64'), > + ['Disabled on MacOS due to #8652'] = jit.os == 'OSX', > +}) > + > +test:plan(2) > + Side note: The test requires ~6Gb of memory to see the error. Feel free to add the corresponding comment or ignore. > +-- luacheck: no unused > +local anchor = {} > +local function on_gc(t) end > + > +local function test_finalizers() > + local i = 1 > + while true do > + anchor[i] = ffi.gc(ffi.cast('void *', 0), on_gc) > + i = i + 1 > + end > +end Minor: Please use 2 spaces for indentation instead. > + > +local st, err = pcall(test_finalizers) > +st, err = pcall(test_finalizers) > +test:ok(st == false, 'error handled successfully') > +test:like(err, '^.+table overflow', 'error is table overflow') > +test:done(true) > -- > 2.41.0 > -- Best regards, Sergey Kaplun