From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp16.mail.ru (smtp16.mail.ru [94.100.176.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 0199B469719 for ; Wed, 14 Oct 2020 02:01:29 +0300 (MSK) From: Timur Safin Date: Wed, 14 Oct 2020 02:01:11 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 2.X v4 3/4] module api: introduced luaT_toibuf instead of luaL_checkibuf List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: v.shpilevoy@tarantool.org, alexander.turenko@tarantool.org Cc: tarantool-patches@dev.tarantool.org * made `luaL_checkibuf` public; * renamed it to `luaT_toibuf` to follow naming convention (it's not raising error, and is casting to ibuf type). Part of #5384 --- src/box/lua/merger.c | 4 ++-- src/exports.h | 1 + src/lua/msgpack.c | 2 +- src/lua/utils.c | 2 +- src/lua/utils.h | 16 ++++++++-------- test/app-tap/module_api.c | 10 ++++++++++ test/app-tap/module_api.test.lua | 23 ++++++++++++++++++++++- 7 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/box/lua/merger.c b/src/box/lua/merger.c index 583946c4c..17e237902 100644 --- a/src/box/lua/merger.c +++ b/src/box/lua/merger.c @@ -503,7 +503,7 @@ luaL_merge_source_buffer_fetch_impl(struct merge_source_buffer *source, source->ref = 0; } lua_pushvalue(L, -nresult + 1); /* Popped by luaL_ref(). */ - source->buf = luaL_checkibuf(L, -1); + source->buf = luaT_toibuf(L, -1); if (source->buf == NULL) { diag_set(IllegalParams, "Expected , "); return -1; @@ -1225,7 +1225,7 @@ lbox_merge_source_select(struct lua_State *L) lua_pushstring(L, "buffer"); lua_gettable(L, 2); if (!lua_isnil(L, -1)) { - if ((output_buffer = luaL_checkibuf(L, -1)) == NULL) + if ((output_buffer = luaT_toibuf(L, -1)) == NULL) return lbox_merge_source_select_usage(L, "buffer"); } diff --git a/src/exports.h b/src/exports.h index ff0660e24..9c56686db 100644 --- a/src/exports.h +++ b/src/exports.h @@ -415,6 +415,7 @@ EXPORT(luaT_istuple) EXPORT(luaT_pushtuple) EXPORT(luaT_state) EXPORT(luaT_tolstring) +EXPORT(luaT_toibuf) EXPORT(luaT_tuple_encode) EXPORT(luaT_tuple_new) EXPORT(mp_char2escape) diff --git a/src/lua/msgpack.c b/src/lua/msgpack.c index 4c4ada39c..24b0d2ccd 100644 --- a/src/lua/msgpack.c +++ b/src/lua/msgpack.c @@ -356,7 +356,7 @@ lua_msgpack_encode(lua_State *L) struct ibuf *buf; if (index > 1) { - buf = luaL_checkibuf(L, 2); + buf = luaT_toibuf(L, 2); if (buf == NULL) { return luaL_error(L, "msgpack.encode: argument 2 " "must be of type 'struct ibuf'"); diff --git a/src/lua/utils.c b/src/lua/utils.c index 3e1c491f8..004ea8ba5 100644 --- a/src/lua/utils.c +++ b/src/lua/utils.c @@ -1107,7 +1107,7 @@ luaL_iscallable(lua_State *L, int idx) } struct ibuf * -luaL_checkibuf(struct lua_State *L, int idx) +luaT_toibuf(struct lua_State *L, int idx) { if (lua_type(L, idx) != LUA_TCDATA) return NULL; diff --git a/src/lua/utils.h b/src/lua/utils.h index e80e2b1a2..5e902b94e 100644 --- a/src/lua/utils.h +++ b/src/lua/utils.h @@ -539,6 +539,14 @@ luaT_tolstring(lua_State *L, int idx, size_t *ssize); LUA_API int luaL_iscallable(lua_State *L, int idx); +/** + * Check if a value on @a L stack by index @a idx is an ibuf + * object. Both 'struct ibuf' and 'struct ibuf *' are accepted. + * Returns NULL, if can't convert - not an ibuf object. + */ +struct ibuf * +luaT_toibuf(struct lua_State *L, int idx); + /** \endcond public */ /** @@ -628,14 +636,6 @@ luaL_checkfinite(struct lua_State *L, struct luaL_serializer *cfg, struct lua_State * luaT_newthread(struct lua_State *L); -/** - * Check if a value on @a L stack by index @a idx is an ibuf - * object. Both 'struct ibuf' and 'struct ibuf *' are accepted. - * Returns NULL, if can't convert - not an ibuf object. - */ -struct ibuf * -luaL_checkibuf(struct lua_State *L, int idx); - /** * Check if a value on @a L stack by index @a idx is pointer at * char or const char. '(char *)NULL' is also considered a valid diff --git a/test/app-tap/module_api.c b/test/app-tap/module_api.c index 17048081f..a095416fe 100644 --- a/test/app-tap/module_api.c +++ b/test/app-tap/module_api.c @@ -155,6 +155,15 @@ test_checkint64(lua_State *L) return 1; } +static int +test_checkibuf(lua_State *L) +{ + struct ibuf *buf; + buf = luaT_toibuf(L, -1); + lua_pushboolean(L, buf != NULL); + return 1; +} + static int test_touint64(lua_State *L) { @@ -1242,6 +1251,7 @@ luaopen_module_api(lua_State *L) {"test_pushint64", test_pushint64 }, {"test_checkuint64", test_checkuint64 }, {"test_checkint64", test_checkint64 }, + {"checkibuf", test_checkibuf}, {"test_touint64", test_touint64 }, {"test_toint64", test_toint64 }, {"test_fiber", test_fiber }, diff --git a/test/app-tap/module_api.test.lua b/test/app-tap/module_api.test.lua index ab5c89c8c..ff251b338 100755 --- a/test/app-tap/module_api.test.lua +++ b/test/app-tap/module_api.test.lua @@ -38,6 +38,26 @@ local function test_pushcdata(test, module) test:is(gc_counter, 1, 'pushcdata gc') end +local function test_buffers(test, module) + test:plan(9) + local ffi = require('ffi') + local buffer = require('buffer') + + local bufalloc = buffer.static_alloc("char", 128) + local ibuf = buffer.ibuf() + local pbuf = ibuf:alloc(128) + + test:ok(not module.checkibuf(nil), 'checkibuf of nil') + test:ok(not module.checkibuf({}), 'checkibuf of {}') + test:ok(not module.checkibuf(1LL), 'checkibuf of 1LL') + test:ok(not module.checkibuf(box.NULL), 'checkibuf of box.NULL') + test:ok(not module.checkibuf(buffer.reg1), 'checkibuf of reg1') + test:ok(not module.checkibuf(bufalloc), 'checkibuf of allocated buffer') + test:ok(module.checkibuf(buffer.IBUF_SHARED), "checkibuf of ibuf*") + test:ok(module.checkibuf(ibuf), 'checkibuf of ibuf') + test:ok(not module.checkibuf(pbuf), 'checkibuf of pointer to ibuf data') +end + local function test_tuple_validate(test, module) test:plan(12) @@ -198,7 +218,7 @@ local function test_iscdata(test, module) end local test = require('tap').test("module_api", function(test) - test:plan(33) + test:plan(34) local status, module = pcall(require, 'module_api') test:is(status, true, "module") test:ok(status, "module is loaded") @@ -225,6 +245,7 @@ local test = require('tap').test("module_api", function(test) test:test("pushcdata", test_pushcdata, module) test:test("iscallable", test_iscallable, module) test:test("iscdata", test_iscdata, module) + test:test("buffers", test_buffers, module) test:test("tuple_validate", test_tuple_validate, module) space:drop() -- 2.20.1