From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 8C8FE469719 for ; Wed, 14 Oct 2020 16:36:29 +0300 (MSK) Received: by mail-lj1-f193.google.com with SMTP id x16so3258153ljh.2 for ; Wed, 14 Oct 2020 06:36:29 -0700 (PDT) From: Cyrill Gorcunov Date: Wed, 14 Oct 2020 16:35:35 +0300 Message-Id: <20201014133535.224573-5-gorcunov@gmail.com> In-Reply-To: <20201014133535.224573-1-gorcunov@gmail.com> References: <20201014133535.224573-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v8 4/4] test: box/cfunc -- add simple module test List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy Note that the test is disabled for a while since we need to update test-run first like | diff --git a/pretest_clean.lua b/pretest_clean.lua | index 9b5ac9d..b0280c4 100644 | --- a/pretest_clean.lua | +++ b/pretest_clean.lua | @@ -272,6 +272,7 @@ local function clean() | package = true, | pickle = true, | popen = true, | + cbox = true, | pwd = true, | socket = true, | strict = true, ie need to enable cbox module. Part-of #4642 Signed-off-by: Cyrill Gorcunov --- test/box/CMakeLists.txt | 2 + test/box/cbox.result | 134 ++++++++++++++++++++++++++++++++++++++++ test/box/cbox.test.lua | 51 +++++++++++++++ test/box/cfunc1.c | 49 +++++++++++++++ test/box/cfunc2.c | 112 +++++++++++++++++++++++++++++++++ test/box/suite.ini | 2 +- 6 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 test/box/cbox.result create mode 100644 test/box/cbox.test.lua create mode 100644 test/box/cfunc1.c create mode 100644 test/box/cfunc2.c diff --git a/test/box/CMakeLists.txt b/test/box/CMakeLists.txt index 06bfbbe9d..2afbeadc3 100644 --- a/test/box/CMakeLists.txt +++ b/test/box/CMakeLists.txt @@ -3,3 +3,5 @@ build_module(function1 function1.c) build_module(reload1 reload1.c) build_module(reload2 reload2.c) build_module(tuple_bench tuple_bench.c) +build_module(cfunc1 cfunc1.c) +build_module(cfunc2 cfunc2.c) diff --git a/test/box/cbox.result b/test/box/cbox.result new file mode 100644 index 000000000..234b57fff --- /dev/null +++ b/test/box/cbox.result @@ -0,0 +1,134 @@ +-- test-run result file version 2 +build_path = os.getenv("BUILDDIR") + | --- + | ... +package.cpath = build_path..'/test/box/?.so;'..build_path..'/test/box/?.dylib;'..package.cpath + | --- + | ... + +cbox = require('cbox') + | --- + | ... +fio = require('fio') + | --- + | ... + +ext = (jit.os == "OSX" and "dylib" or "so") + | --- + | ... + +cfunc_path = fio.pathjoin(build_path, "test/box/cfunc.") .. ext + | --- + | ... +cfunc1_path = fio.pathjoin(build_path, "test/box/cfunc1.") .. ext + | --- + | ... +cfunc2_path = fio.pathjoin(build_path, "test/box/cfunc2.") .. ext + | --- + | ... + +_ = pcall(fio.unlink(cfunc_path)) + | --- + | ... +fio.symlink(cfunc1_path, cfunc_path) + | --- + | - true + | ... + +-- +-- They all are sitting in cfunc.so +cfunc_nop = cbox.func.load('cfunc.cfunc_nop') + | --- + | ... +cfunc_fetch_evens = cbox.func.load('cfunc.cfunc_fetch_evens') + | --- + | ... +cfunc_multireturn = cbox.func.load('cfunc.cfunc_multireturn') + | --- + | ... +cfunc_args = cbox.func.load('cfunc.cfunc_args') + | --- + | ... + +-- +-- Make sure they all are callable +cfunc_nop() + | --- + | - true + | ... +cfunc_fetch_evens() + | --- + | - true + | ... +cfunc_multireturn() + | --- + | - true + | ... +cfunc_args() + | --- + | - true + | ... + +-- +-- Clean old function references and reload a new one. +_ = pcall(fio.unlink(cfunc_path)) + | --- + | ... +fio.symlink(cfunc2_path, cfunc_path) + | --- + | - true + | ... + +cbox.module.reload('cfunc') + | --- + | - true + | ... + +cfunc_nop() + | --- + | - true + | ... +cfunc_multireturn() + | --- + | - true + | - [1] + | - [1] + | ... +cfunc_fetch_evens({2,4,6}) + | --- + | - true + | ... +cfunc_fetch_evens({1,2,3}) -- error + | --- + | - null + | - invalid argument 1 != 2 + | ... +cfunc_args(1, "hello") + | --- + | - true + | - [1, 'hello'] + | ... +-- +-- Clean it up +cbox.func.unload('cfunc.cfunc_nop') + | --- + | - true + | ... +cbox.func.unload('cfunc.cfunc_fetch_evens') + | --- + | - true + | ... +cbox.func.unload('cfunc.cfunc_multireturn') + | --- + | - true + | ... +cbox.func.unload('cfunc.cfunc_args') + | --- + | - true + | ... + +-- +-- Cleanup the generated symlink +_ = pcall(fio.unlink(cfunc_path)) + | --- + | ... diff --git a/test/box/cbox.test.lua b/test/box/cbox.test.lua new file mode 100644 index 000000000..1228fac11 --- /dev/null +++ b/test/box/cbox.test.lua @@ -0,0 +1,51 @@ +build_path = os.getenv("BUILDDIR") +package.cpath = build_path..'/test/box/?.so;'..build_path..'/test/box/?.dylib;'..package.cpath + +cbox = require('cbox') +fio = require('fio') + +ext = (jit.os == "OSX" and "dylib" or "so") + +cfunc_path = fio.pathjoin(build_path, "test/box/cfunc.") .. ext +cfunc1_path = fio.pathjoin(build_path, "test/box/cfunc1.") .. ext +cfunc2_path = fio.pathjoin(build_path, "test/box/cfunc2.") .. ext + +_ = pcall(fio.unlink(cfunc_path)) +fio.symlink(cfunc1_path, cfunc_path) + +-- +-- They all are sitting in cfunc.so +cfunc_nop = cbox.func.load('cfunc.cfunc_nop') +cfunc_fetch_evens = cbox.func.load('cfunc.cfunc_fetch_evens') +cfunc_multireturn = cbox.func.load('cfunc.cfunc_multireturn') +cfunc_args = cbox.func.load('cfunc.cfunc_args') + +-- +-- Make sure they all are callable +cfunc_nop() +cfunc_fetch_evens() +cfunc_multireturn() +cfunc_args() + +-- +-- Clean old function references and reload a new one. +_ = pcall(fio.unlink(cfunc_path)) +fio.symlink(cfunc2_path, cfunc_path) + +cbox.module.reload('cfunc') + +cfunc_nop() +cfunc_multireturn() +cfunc_fetch_evens({2,4,6}) +cfunc_fetch_evens({1,2,3}) -- error +cfunc_args(1, "hello") +-- +-- Clean it up +cbox.func.unload('cfunc.cfunc_nop') +cbox.func.unload('cfunc.cfunc_fetch_evens') +cbox.func.unload('cfunc.cfunc_multireturn') +cbox.func.unload('cfunc.cfunc_args') + +-- +-- Cleanup the generated symlink +_ = pcall(fio.unlink(cfunc_path)) diff --git a/test/box/cfunc1.c b/test/box/cfunc1.c new file mode 100644 index 000000000..50c979d63 --- /dev/null +++ b/test/box/cfunc1.c @@ -0,0 +1,49 @@ +#include +#include +#include + +#include "module.h" + +/* + * Before the reload functions are just declared + * and simply exit with zero. + * + * After the module reload we should provide real + * functionality. + */ + +int +cfunc_nop(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + (void)ctx; + (void)args; + (void)args_end; + return 0; +} + +int +cfunc_fetch_evens(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + (void)ctx; + (void)args; + (void)args_end; + return 0; +} + +int +cfunc_multireturn(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + (void)ctx; + (void)args; + (void)args_end; + return 0; +} + +int +cfunc_args(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + (void)ctx; + (void)args; + (void)args_end; + return 0; +} diff --git a/test/box/cfunc2.c b/test/box/cfunc2.c new file mode 100644 index 000000000..7a4ece843 --- /dev/null +++ b/test/box/cfunc2.c @@ -0,0 +1,112 @@ +#include +#include +#include + +#include "module.h" + +/* + * Just make sure we've been called. + */ +int +cfunc_nop(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + (void)ctx; + (void)args; + (void)args_end; + return 0; +} + +/* + * Fetch first N even numbers (just to make sure the order of + * arguments is not screwed). + */ +int +cfunc_fetch_evens(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + int arg_count = mp_decode_array(&args); + if (arg_count != 1) { + return box_error_set(__FILE__, __LINE__, ER_PROC_C, "%s", + "invalid argument count"); + } + int field_count = mp_decode_array(&args); + if (field_count < 1) { + return box_error_set(__FILE__, __LINE__, ER_PROC_C, "%s", + "invalid array size"); + } + + for (int i = 0; i < field_count; i++) { + int val = mp_decode_uint(&args); + int needed = 2 * (i+1); + if (val != needed) { + char res[128]; + snprintf(res, sizeof(res), "%s %d != %d", + "invalid argument", val, needed); + return box_error_set(__FILE__, __LINE__, + ER_PROC_C, "%s", res); + } + } + + return 0; +} + +/* + * Return one element array twice. + */ +int +cfunc_multireturn(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + char tuple_buf[512]; + char *d = tuple_buf; + d = mp_encode_array(d, 1); + d = mp_encode_uint(d, 1); + assert(d <= tuple_buf + sizeof(tuple_buf)); + + box_tuple_format_t *fmt = box_tuple_format_default(); + box_tuple_t *tuple_a = box_tuple_new(fmt, tuple_buf, d); + if (tuple_a == NULL) + return -1; + int rc = box_return_tuple(ctx, tuple_a); + if (rc != 0) + return rc; + return box_return_tuple(ctx, tuple_a); +} + +/* + * Encode int + string pair back. + */ +int +cfunc_args(box_function_ctx_t *ctx, const char *args, const char *args_end) +{ + uint32_t arg_count = mp_decode_array(&args); + if (arg_count != 2) { + return box_error_set(__FILE__, __LINE__, ER_PROC_C, "%s", + "invalid argument count"); + } + + if (mp_typeof(*args) != MP_UINT) { + return box_error_set(__FILE__, __LINE__, ER_PROC_C, "%s", + "tuple field must be uint"); + } + uint32_t num = mp_decode_uint(&args); + + if (mp_typeof(*args) != MP_STR) { + return box_error_set(__FILE__, __LINE__, ER_PROC_C, "%s", + "tuple field must be string"); + } + const char *str = args; + uint32_t len = mp_decode_strl(&str); + + char tuple_buf[512]; + char *d = tuple_buf; + d = mp_encode_array(d, 2); + d = mp_encode_uint(d, num); + d = mp_encode_str(d, str, len); + assert(d <= tuple_buf + sizeof(tuple_buf)); + + box_tuple_format_t *fmt = box_tuple_format_default(); + box_tuple_t *tuple = box_tuple_new(fmt, tuple_buf, d); + if (tuple == NULL) + return -1; + + return box_return_tuple(ctx, tuple); +} diff --git a/test/box/suite.ini b/test/box/suite.ini index 793b8bf76..95fa6e660 100644 --- a/test/box/suite.ini +++ b/test/box/suite.ini @@ -2,7 +2,7 @@ core = tarantool description = Database tests script = box.lua -disabled = rtree_errinj.test.lua tuple_bench.test.lua +disabled = rtree_errinj.test.lua tuple_bench.test.lua cbox.test.lua long_run = huge_field_map_long.test.lua config = engine.cfg release_disabled = errinj.test.lua errinj_index.test.lua rtree_errinj.test.lua upsert_errinj.test.lua iproto_stress.test.lua gh-4648-func-load-unload.test.lua -- 2.26.2