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 EA0CD1270B1C; Mon, 10 Mar 2025 17:51:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EA0CD1270B1C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1741618300; bh=5pWQG3W2m+N++fNCd+IVArU22H7hns/D4EDQbFajLOk=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=iLVT0kI9ymKhEQs15I5wVY/6h24W1FWj3hJ7fsUa6/CUiIiVZL6K7bi1wfM0l1n9V ohbpm+8iwimVVb7WE5IRCv5vXW+2M5BJHL4dxHIUeMQivawP8UqzCpPrpOZ0m8ADCL jrTQWJ0W4unAd/PCGW0qVWyW+uqhcVHQAAw8GOI0= Received: from send152.i.mail.ru (send152.i.mail.ru [89.221.237.247]) (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 4E1AB1270B17 for ; Mon, 10 Mar 2025 17:51:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4E1AB1270B17 Received: by exim-smtp-8cb569c79-b7mkz with esmtpa (envelope-from ) id 1treTi-00000000Jsz-1EUk; Mon, 10 Mar 2025 17:51:38 +0300 To: Sergey Bronnikov Date: Mon, 10 Mar 2025 17:51:34 +0300 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9C6CD12EFD8DA450F71680DDB0EEB9F52DD08B9A2C4E6567700894C459B0CD1B9DD8A3718E98DA1758E7FD94675F3356540745199FF1E98D447602AEF6CF861AE1BB59B39F4C00062 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77603ADE015AF816DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375666DAE1D1A19A1A03E212B395259D8340B163AB99D7AE6C33A55B99F12AAB1FEC8389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C008ED818AD11EC8E48941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6042F1592492B88C6CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C22490B49535A5146D2F676E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8B63C2306638BE4ABA3AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E7356C9A9530EBF72002C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A52627F3FCA718699A5002B1117B3ED6967CD8E507150A2C3592B673A2F5DDD7E7823CB91A9FED034534781492E4B8EEAD0BC323893F80E328C79554A2A72441328621D336A7BC284946AD531847A6065A17B107DEF921CE79BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF77DD89D51EBB7742D3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFB6AD95EF13CA909CE25E12B50D088EDC3CD06A1F859BE8F8FCA0CD4CEC26819A3066587AC4ADAE82F13513DA892F5B9DD06CEB3B00A4FC19DAD5AB2F78211277329B7FF2F944591B5F4332CA8FE04980913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVQiWK+2I7Y2ss6x5odR5DyE= X-Mailru-Sender: 520A125C2F17F0B1A9638AD358559B590B94169C0E824ED83DE06ABAFEAF6705059748B82FC7DE8DB7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 0/3] Fixes for the concat metamethod. 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" This patch set fixes the case of the OOM during the concatenation recording. Unfortunately, it takes 2 commits. See details in the corresponding letters. Also, it refactors tests using alloc injections -- now they use the single module with predefined functions. Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-1298-oom-on-concat-recording Note: CI is red due to problems with the integration testing. See also: https://github.com/tarantool/tarantool/pull/11220 Related issues: * https://github.com/tarantool/tarantool/issues/11055 * https://github.com/LuaJIT/LuaJIT/issues/1298 * https://github.com/LuaJIT/LuaJIT/issues/1338 Mike Pall (2): Restore state when recording __concat metamethod throws OOM. Fix state restore when recording __concat metamethod. Sergey Kaplun (1): test: unify helpers for a custom allocator setting src/lj_record.c | 58 +++++++---- test/tarantool-tests/CMakeLists.txt | 5 +- .../lj-1166-error-stitch-oom-ir-buff.test.lua | 2 +- ...j-1166-error-stitch-oom-snap-buff.test.lua | 2 +- .../lj-1166-error-stitch/allocinject.c | 52 ---------- ...j-1247-fin-tab-rehashing-on-trace.test.lua | 4 +- .../CMakeLists.txt | 2 - .../lj_1247_allocinject.c | 49 ---------- .../lj-1298-oom-on-concat-recording.test.lua | 53 ++++++++++ .../CMakeLists.txt | 2 + test/tarantool-tests/utils/allocinject.c | 97 +++++++++++++++++++ 11 files changed, 198 insertions(+), 128 deletions(-) delete mode 100644 test/tarantool-tests/lj-1166-error-stitch/allocinject.c delete mode 100644 test/tarantool-tests/lj-1247-fin-tab-rehashing-on-trace/CMakeLists.txt delete mode 100644 test/tarantool-tests/lj-1247-fin-tab-rehashing-on-trace/lj_1247_allocinject.c create mode 100644 test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua rename test/tarantool-tests/{lj-1166-error-stitch => utils}/CMakeLists.txt (64%) create mode 100644 test/tarantool-tests/utils/allocinject.c -- 2.48.1