From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, gorcunov@gmail.com, sergepetrenko@tarantool.org Subject: [Tarantool-patches] [PATCH 02/16] test: don't use IBUF_SHARED in the tests Date: Sat, 20 Mar 2021 01:42:39 +0100 [thread overview] Message-ID: <f80e6e04e1165dc285e9ddf903ee423def9f5030.1616200860.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1616200860.git.v.shpilevoy@tarantool.org> In msgpack test it is used only to check that 'struct ibuf *' can be passed to encode() functions. But soon IBUF_SHARED will be deleted, and its alternative won't be yield-tolerant. This means it can't be used in this test. There are yields between the buffer usages. In varbinary test it is used in a too complicated way to be able to put it back normally. And otherwise its usage does not make much sense - without put() it is going to be created from the scratch on non-first usage until a yield. In the module_api test it is used to check if some function works with 'struct ibuf *'. Can be done without IBUF_SHARED. Part of #5632 --- test/app-tap/module_api.test.lua | 4 +++- test/app/msgpack.result | 7 +++++-- test/app/msgpack.test.lua | 5 +++-- test/box/varbinary_type.result | 3 +-- test/box/varbinary_type.test.lua | 3 +-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/test/app-tap/module_api.test.lua b/test/app-tap/module_api.test.lua index c43d8eacd..28e33a02d 100755 --- a/test/app-tap/module_api.test.lua +++ b/test/app-tap/module_api.test.lua @@ -1,5 +1,6 @@ #!/usr/bin/env tarantool +local ffi = require('ffi') local fio = require('fio') box.cfg{log = "tarantool.log"} @@ -45,6 +46,7 @@ local function test_buffers(test, module) local bufalloc = buffer.static_alloc("char", 128) local ibuf = buffer.ibuf() local pbuf = ibuf:alloc(128) + local ibuf_ptr = ffi.cast('struct ibuf *', ibuf) test:ok(not module.toibuf(nil), 'toibuf of nil') test:ok(not module.toibuf({}), 'toibuf of {}') @@ -52,7 +54,7 @@ local function test_buffers(test, module) test:ok(not module.toibuf(box.NULL), 'toibuf of box.NULL') test:ok(not module.toibuf(buffer.reg1), 'toibuf of reg1') test:ok(not module.toibuf(bufalloc), 'toibuf of allocated buffer') - test:ok(module.toibuf(buffer.IBUF_SHARED), "toibuf of ibuf*") + test:ok(module.toibuf(ibuf_ptr), "toibuf of ibuf*") test:ok(module.toibuf(ibuf), 'toibuf of ibuf') test:ok(not module.toibuf(pbuf), 'toibuf of pointer to ibuf data') end diff --git a/test/app/msgpack.result b/test/app/msgpack.result index ddf06fc9d..faee66029 100644 --- a/test/app/msgpack.result +++ b/test/app/msgpack.result @@ -206,10 +206,10 @@ msgpack.decode(buf.rpos, buf:size() - 1) - error: 'msgpack.decode: invalid MsgPack' ... -- Provide a buffer. Try both 'struct ibuf' and 'struct ibuf *'. -buf = buffer.IBUF_SHARED +buf_storage = buffer.ibuf() --- ... -buf:reset() +buf = ffi.cast('struct ibuf *', buf_storage) --- ... size = msgpack.encode({a = 1, b = 2}, buf) @@ -219,6 +219,9 @@ size = msgpack.encode({a = 1, b = 2}, buf) --- - {'a': 1, 'b': 2} ... +buf_storage = nil +--- +... buf = buffer.ibuf() --- ... diff --git a/test/app/msgpack.test.lua b/test/app/msgpack.test.lua index 17e05df5c..f5299f550 100644 --- a/test/app/msgpack.test.lua +++ b/test/app/msgpack.test.lua @@ -65,10 +65,11 @@ msgpack.encode({1, 2, 3}, buf) msgpack.decode(buf.rpos, buf:size() - 1) -- Provide a buffer. Try both 'struct ibuf' and 'struct ibuf *'. -buf = buffer.IBUF_SHARED -buf:reset() +buf_storage = buffer.ibuf() +buf = ffi.cast('struct ibuf *', buf_storage) size = msgpack.encode({a = 1, b = 2}, buf) (msgpack.decode(buf.rpos, size)) +buf_storage = nil buf = buffer.ibuf() size = msgpack.encode({c = 3, d = 4}, buf) (msgpack.decode(buf.rpos, size)) diff --git a/test/box/varbinary_type.result b/test/box/varbinary_type.result index 9620ee39e..5aa2996df 100644 --- a/test/box/varbinary_type.result +++ b/test/box/varbinary_type.result @@ -40,8 +40,7 @@ test_run:cmd("setopt delimiter ';'") - true ... function encode_bin(bytes) - local tmpbuf = buffer.IBUF_SHARED - tmpbuf:reset() + local tmpbuf = buffer.ibuf() local p = tmpbuf:alloc(3 + #bytes) p[0] = 0x91 p[1] = 0xC4 diff --git a/test/box/varbinary_type.test.lua b/test/box/varbinary_type.test.lua index 3c6b66246..7b9a1e721 100644 --- a/test/box/varbinary_type.test.lua +++ b/test/box/varbinary_type.test.lua @@ -16,8 +16,7 @@ ffi = require('ffi') test_run:cmd("setopt delimiter ';'") function encode_bin(bytes) - local tmpbuf = buffer.IBUF_SHARED - tmpbuf:reset() + local tmpbuf = buffer.ibuf() local p = tmpbuf:alloc(3 + #bytes) p[0] = 0x91 p[1] = 0xC4 -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-03-20 0:47 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-20 0:42 [Tarantool-patches] [PATCH 00/16] Cord buffer, static alloc, and Lua GC bug Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 01/16] fio: don't use shared buffer in pread() Vladislav Shpilevoy via Tarantool-patches 2021-03-22 7:19 ` Cyrill Gorcunov via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 10/16] uri: replace static_alloc with ffi stash and ibuf Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 11/16] buffer: remove static_alloc() from Lua Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 12/16] lua: use lua_pushfstring() instead of tt_sprintf() Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 13/16] sio: rework sio_strfaddr() Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 14/16] sio: increase SERVICE_NAME_MAXLEN size Vladislav Shpilevoy via Tarantool-patches 2021-03-21 21:58 ` Cyrill Gorcunov via Tarantool-patches 2021-03-22 22:32 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 6:56 ` Cyrill Gorcunov via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 15/16] sio: introduce and use sio_snprintf() Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 16/16] buffer: remove Lua registers Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-03-22 7:35 ` [Tarantool-patches] [PATCH 02/16] test: don't use IBUF_SHARED in the tests Cyrill Gorcunov via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 03/16] tuple: pass global ibuf explicitly where possible Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 04/16] iconv: take errno before reseting the context Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 05/16] cord_buf: introduce cord_buf API Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 06/16] cord_buf: introduce ownership management Vladislav Shpilevoy via Tarantool-patches 2021-03-22 16:48 ` Serge Petrenko via Tarantool-patches 2021-03-22 22:32 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 7:46 ` Serge Petrenko via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 07/16] buffer: implement ffi stash Vladislav Shpilevoy via Tarantool-patches 2021-03-23 0:29 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 08/16] uuid: replace static_alloc with " Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 09/16] uuid: drop tt_uuid_str() from Lua Vladislav Shpilevoy via Tarantool-patches 2021-03-21 16:38 ` [Tarantool-patches] [PATCH 00/16] Cord buffer, static alloc, and Lua GC bug Vladislav Shpilevoy via Tarantool-patches 2021-03-22 7:52 ` Cyrill Gorcunov via Tarantool-patches 2021-03-22 7:56 ` Konstantin Osipov via Tarantool-patches 2021-03-22 17:17 ` Serge Petrenko via Tarantool-patches 2021-03-23 23:45 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-24 13:28 ` Kirill Yukhin 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=f80e6e04e1165dc285e9ddf903ee423def9f5030.1616200860.git.v.shpilevoy@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 02/16] test: don'\''t use IBUF_SHARED in the tests' \ /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