From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) (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 8295444643A for ; Mon, 12 Oct 2020 03:44:30 +0300 (MSK) From: Timur Safin Date: Mon, 12 Oct 2020 03:44:11 +0300 Message-Id: <0abb1776e7eeca79aba354af000d70a68a95fc9d.1602463103.git.tsafin@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 2.X v3 3/3] module api: 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 Moved `luaL_checkibuf` to the public part of module api. Part of #5384 --- src/exports.h | 1 + src/lua/utils.h | 16 ++++++++-------- test/app-tap/module_api.c | 10 ++++++++++ test/app-tap/module_api.test.lua | 22 +++++++++++++++++++++- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/exports.h b/src/exports.h index ff0660e24..034b6c4a3 100644 --- a/src/exports.h +++ b/src/exports.h @@ -348,6 +348,7 @@ EXPORT(luaL_callmeta) EXPORT(luaL_cdef) EXPORT(luaL_checkany) EXPORT(luaL_checkcdata) +EXPORT(luaL_checkibuf) EXPORT(luaL_checkint64) EXPORT(luaL_checkinteger) EXPORT(luaL_checklstring) diff --git a/src/lua/utils.h b/src/lua/utils.h index e80e2b1a2..7658c67f8 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 * +luaL_checkibuf(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 7d8941bfb..502d734d2 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 = luaL_checkibuf(L, -1); + lua_pushboolean(L, buf != NULL); + return 1; +} + static int test_touint64(lua_State *L) { @@ -1183,6 +1192,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 6797f8150..17f4ff477 100755 --- a/test/app-tap/module_api.test.lua +++ b/test/app-tap/module_api.test.lua @@ -38,6 +38,25 @@ local function test_pushcdata(test, module) test:is(gc_counter, 1, 'pushcdata gc') end +local function test_buffers(test, module) + test:plan(8) + 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(ibuf), 'checkibuf of ibuf') + test:ok(not module.checkibuf(pbuf), 'checkibuf of pointer to ibuf data') +end + local function test_tuples(test, module) test:plan(8) @@ -194,7 +213,7 @@ local function test_iscdata(test, module) end local test = require('tap').test("module_api", function(test) - test:plan(32) + test:plan(33) local status, module = pcall(require, 'module_api') test:is(status, true, "module") test:ok(status, "module is loaded") @@ -221,6 +240,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("validate", test_tuples, module) space:drop() -- 2.20.1