From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Bronnikov <sergeyb@tarantool.org> Cc: Maksim Kokryashkin <max.kokryashkin@gmail.com>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit v2 1/2] Print errors from __gc finalizers instead of rethrowing them. Date: Thu, 9 Nov 2023 15:14:49 +0300 [thread overview] Message-ID: <k3efpbwudeg5qgejtwrwjjjz5iy2ihzl4d5ur2i7k6qo7s2ez7@zjopgshkt4lt> (raw) In-Reply-To: <a67c82d5-11f2-45ab-be71-2be36199b30f@tarantool.org> Hi, Sergey! Thanks for the review! See my answers below. On Thu, Nov 09, 2023 at 03:03:46PM +0300, Sergey Bronnikov wrote: > Hi, Max > > > Thanks for the patch! LGTM > > See my comments below. > > Sergey > > On 11/8/23 00:06, Maksim Kokryashkin wrote: > > > <snipped> > > > diff --git a/test/tarantool-tests/lj-946-print-errors-from-gc-fin-custom.test.lua b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-custom.test.lua > > new file mode 100644 > > index 00000000..71efc260 > > --- /dev/null > > +++ b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-custom.test.lua > > @@ -0,0 +1,42 @@ > > +local tap = require('tap') > > +local test = tap.test('lj-946-print-errors-from-gc-fin-custom'):skipcond({ > > + ['Test requires JIT enabled'] = not jit.status(), > > +}) > > + > > +test:plan(2) > > + > > +local ffi = require('ffi') > > +local error_in_finalizer = false > > + > > +local function errfin_handler() > > + error_in_finalizer = true > > +end > > + > > +local function new_bad_cdata() > > + return ffi.gc(ffi.new('char [?]', 1024), 'uncallable string') > > +end > > + > > +local function test_f() > > + collectgarbage('collect') > > + -- Make GC aggressive enough to end the atomic phase before > > + -- exiting the trace. > > + collectgarbage('setstepmul', 400) > > + -- The number of iterations is empirical, just big enough for the > > + -- issue to strike. > > + for _ = 1, 4000 do > > Works fine with a number of iterations equal to 300, > > checked locally by running test 1000 times. Yep, works fine with smaller number of iterations under LuaJIT, but the story is different under Tarantool, that's why the number is so large. > > > + new_bad_cdata() > > + end > > +end > > + > > +jit.opt.start('hotloop=1') > > +-- Handler is registered but never called before the patch. > > +-- It should be called after the patch. > > +jit.attach(errfin_handler, 'errfin') > > +local status = pcall(test_f) > > +-- We have to stop GC now because any step raises the error due to > > +-- cursed cdata objects. > > +collectgarbage('stop') > > +test:ok(status, 'test function completed successfully') > > +test:ok(error_in_finalizer, 'error handler called') > > + > > +test:done(true) > > diff --git a/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua > > new file mode 100644 > > index 00000000..dfef11e5 > > --- /dev/null > > +++ b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua > > @@ -0,0 +1,11 @@ > > +local tap = require('tap') > > +local test = tap.test('lj-flush-on-trace'):skipcond({ > > + ['Test requires JIT enabled'] = not jit.status(), > > +}) > > + > > +test:plan(1) > > + > > +local script = require('utils').exec.makecmd(arg, { redirect = '2>&1' }) > > +local output = script() > > +test:like(output, '.*ERROR in finalizer:.*') > > testcase description is missed: Fixed. > > > TAP version 13 > 1..1 > ok - nil > > > +test:done(true) > > diff --git a/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default/script.lua b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default/script.lua > > new file mode 100644 > > index 00000000..fdd9ced1 > > --- /dev/null > > +++ b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default/script.lua > > @@ -0,0 +1,24 @@ > > +local ffi = require('ffi') > > + > > +local function new_bad_cdata() > > + return ffi.gc(ffi.new('char [?]', 1024), 'uncallable string') > > +end > > + > > +local function test_f() > > + collectgarbage('collect') > > + -- Make GC aggressive enough to end the atomic phase before > > + -- exiting the trace. > > + collectgarbage('setstepmul', 400) > > + -- The number of iterations is empirical, just big enough for the > > + -- issue to strike. > > + for _ = 1, 4000 do > > + new_bad_cdata() > > + end > > +end > > + > > +jit.opt.start('hotloop=1') > > +local status = pcall(test_f) > > +-- We have to stop GC now because any step raises the error due to > > +-- cursed cdata objects. > > +collectgarbage('stop') > > +assert(status, 'error is not rethrown') > > -- > > 2.39.3 (Apple Git-145) > > Here is the diff: === diff --git a/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua index f0d11f6f..f22b3997 100644 --- a/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua +++ b/test/tarantool-tests/lj-946-print-errors-from-gc-fin-default.test.lua @@ -7,5 +7,5 @@ test:plan(1) local script = require('utils').exec.makecmd(arg, { redirect = '2>&1' }) local output = script() -test:like(output, 'ERROR in finalizer:') +test:like(output, 'ERROR in finalizer:', 'error handler called') test:done(true)
next prev parent reply other threads:[~2023-11-09 12:14 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-07 21:06 [Tarantool-patches] [PATCH luajit v2 0/2] gc: handle errors in finalizers Maksim Kokryashkin via Tarantool-patches 2023-11-07 21:06 ` [Tarantool-patches] [PATCH luajit v2 1/2] Print errors from __gc finalizers instead of rethrowing them Maksim Kokryashkin via Tarantool-patches 2023-11-08 8:21 ` Sergey Kaplun via Tarantool-patches 2023-11-09 0:03 ` Maxim Kokryashkin via Tarantool-patches 2023-11-09 12:03 ` Sergey Bronnikov via Tarantool-patches 2023-11-09 12:14 ` Maxim Kokryashkin via Tarantool-patches [this message] 2023-11-09 13:14 ` Sergey Bronnikov via Tarantool-patches 2023-11-07 21:06 ` [Tarantool-patches] [PATCH luajit v2 2/2] Fix last commit Maksim Kokryashkin via Tarantool-patches 2023-11-08 8:37 ` Sergey Kaplun via Tarantool-patches 2023-11-09 0:04 ` Maxim Kokryashkin via Tarantool-patches 2023-11-09 12:08 ` Sergey Bronnikov via Tarantool-patches 2023-11-23 6:30 ` [Tarantool-patches] [PATCH luajit v2 0/2] gc: handle errors in finalizers Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=k3efpbwudeg5qgejtwrwjjjz5iy2ihzl4d5ur2i7k6qo7s2ez7@zjopgshkt4lt \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=sergeyb@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v2 1/2] Print errors from __gc finalizers instead of rethrowing them.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox