From: Cyrill Gorcunov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v12 8/8] test: box/cfunc -- add cmod test Date: Mon, 18 Jan 2021 23:35:56 +0300 [thread overview] Message-ID: <20210118203556.281700-9-gorcunov@gmail.com> (raw) In-Reply-To: <20210118203556.281700-1-gorcunov@gmail.com> 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, | + cmod = true, | pwd = true, | socket = true, | strict = true, ie need to enable cmod module. Part-of #4642 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- test/box/CMakeLists.txt | 2 + test/box/cfunc1.c | 58 ++++++++++++ test/box/cfunc2.c | 132 ++++++++++++++++++++++++++ test/box/cmod.result | 199 ++++++++++++++++++++++++++++++++++++++++ test/box/cmod.test.lua | 70 ++++++++++++++ test/box/suite.ini | 2 +- 6 files changed, 462 insertions(+), 1 deletion(-) create mode 100644 test/box/cfunc1.c create mode 100644 test/box/cfunc2.c create mode 100644 test/box/cmod.result create mode 100644 test/box/cmod.test.lua 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/cfunc1.c b/test/box/cfunc1.c new file mode 100644 index 000000000..8f6d3990c --- /dev/null +++ b/test/box/cfunc1.c @@ -0,0 +1,58 @@ +#include <stdio.h> +#include <stdbool.h> +#include <msgpuck.h> + +#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; +} + +int +cfunc_sum(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..f6d826183 --- /dev/null +++ b/test/box/cfunc2.c @@ -0,0 +1,132 @@ +#include <stdio.h> +#include <stdbool.h> +#include <msgpuck.h> + +#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); +} + +/* + * Sum two integers. + */ +int +cfunc_sum(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"); + } + uint64_t a = mp_decode_uint(&args); + uint64_t b = mp_decode_uint(&args); + + char res[16]; + char *end = mp_encode_uint(res, a + b); + box_return_mp(ctx, res, end); + return 0; +} diff --git a/test/box/cmod.result b/test/box/cmod.result new file mode 100644 index 000000000..f8558c191 --- /dev/null +++ b/test/box/cmod.result @@ -0,0 +1,199 @@ +-- 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 + | --- + | ... + +cmod = require('cmod') + | --- + | ... +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 + | ... + +module, err = cmod.load('non-existing-cfunc') + | --- + | ... +assert(err ~= nil) + | --- + | - true + | ... + +-- +-- They all are sitting in cfunc.so +module, err = cmod.load('cfunc') + | --- + | ... +assert(err == nil) + | --- + | - true + | ... + +cfunc_nop, err = module:load('no-such-func') + | --- + | ... +assert(err ~= nil) + | --- + | - true + | ... +cfunc_nop, err = module:load('cfunc_nop') + | --- + | ... +assert(err == nil) + | --- + | - true + | ... +cfunc_fetch_evens, err = module:load('cfunc_fetch_evens') + | --- + | ... +assert(err == nil) + | --- + | - true + | ... +cfunc_multireturn, err = module:load('cfunc_multireturn') + | --- + | ... +assert(err == nil) + | --- + | - true + | ... +cfunc_args, err = module:load('cfunc_args') + | --- + | ... +assert(err == nil) + | --- + | - true + | ... +cfunc_sum, err = module:load('cfunc_sum') + | --- + | ... +assert(err == nil) + | --- + | - true + | ... + +-- +-- 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 + | ... + +module:reload() + | --- + | - 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'] + | ... +cfunc_sum(1) -- error + | --- + | - null + | - invalid argument count + | ... +cfunc_sum(1,2) + | --- + | - true + | - 3 + | ... + +-- +-- Clean them up +cfunc_nop:unload() + | --- + | - true + | ... +cfunc_multireturn:unload() + | --- + | - true + | ... +cfunc_fetch_evens:unload() + | --- + | - true + | ... +cfunc_args:unload() + | --- + | - true + | ... +cfunc_sum:unload() + | --- + | - true + | ... +module:unload() + | --- + | - true + | ... + +-- +-- Cleanup the generated symlink +_ = pcall(fio.unlink(cfunc_path)) + | --- + | ... diff --git a/test/box/cmod.test.lua b/test/box/cmod.test.lua new file mode 100644 index 000000000..e9837e693 --- /dev/null +++ b/test/box/cmod.test.lua @@ -0,0 +1,70 @@ +build_path = os.getenv("BUILDDIR") +package.cpath = build_path..'/test/box/?.so;'..build_path..'/test/box/?.dylib;'..package.cpath + +cmod = require('cmod') +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) + +module, err = cmod.load('non-existing-cfunc') +assert(err ~= nil) + +-- +-- They all are sitting in cfunc.so +module, err = cmod.load('cfunc') +assert(err == nil) + +cfunc_nop, err = module:load('no-such-func') +assert(err ~= nil) +cfunc_nop, err = module:load('cfunc_nop') +assert(err == nil) +cfunc_fetch_evens, err = module:load('cfunc_fetch_evens') +assert(err == nil) +cfunc_multireturn, err = module:load('cfunc_multireturn') +assert(err == nil) +cfunc_args, err = module:load('cfunc_args') +assert(err == nil) +cfunc_sum, err = module:load('cfunc_sum') +assert(err == nil) + +-- +-- 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) + +module:reload() + +cfunc_nop() +cfunc_multireturn() +cfunc_fetch_evens({2,4,6}) +cfunc_fetch_evens({1,2,3}) -- error +cfunc_args(1, "hello") +cfunc_sum(1) -- error +cfunc_sum(1,2) + +-- +-- Clean them up +cfunc_nop:unload() +cfunc_multireturn:unload() +cfunc_fetch_evens:unload() +cfunc_args:unload() +cfunc_sum:unload() +module:unload() + +-- +-- Cleanup the generated symlink +_ = pcall(fio.unlink(cfunc_path)) diff --git a/test/box/suite.ini b/test/box/suite.ini index e700d0b9e..fc16c5951 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 cmod.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.29.2
next prev parent reply other threads:[~2021-01-18 20:40 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-18 20:35 [Tarantool-patches] [PATCH v12 0/8] box: implement cmod Lua module Cyrill Gorcunov via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 1/8] box/func: factor out c function entry structure Cyrill Gorcunov via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 2/8] module_cache: move module handling into own subsystem Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:26 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-25 8:52 ` Cyrill Gorcunov via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 3/8] module_cache: improve naming Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:27 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-24 22:32 ` Cyrill Gorcunov via Tarantool-patches 2021-01-30 18:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-01 11:41 ` Cyrill Gorcunov via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 4/8] module_cache: direct update a cache value on reload Cyrill Gorcunov via Tarantool-patches 2021-01-19 12:46 ` Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:27 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-24 22:26 ` Cyrill Gorcunov via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 5/8] module_cache: rename calls to ref in module structure Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:27 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-25 10:29 ` Cyrill Gorcunov via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 6/8] module_cache: provide helpers to load and unload modules Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:28 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-18 20:35 ` [Tarantool-patches] [PATCH v12 7/8] box/cmod: implement cmod Lua module Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:28 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-25 16:50 ` Cyrill Gorcunov via Tarantool-patches 2021-01-30 18:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-18 20:35 ` Cyrill Gorcunov via Tarantool-patches [this message] 2021-01-24 16:28 ` [Tarantool-patches] [PATCH v12 8/8] test: box/cfunc -- add cmod test Vladislav Shpilevoy via Tarantool-patches 2021-01-24 16:26 ` [Tarantool-patches] [PATCH v12 0/8] box: implement cmod Lua module Vladislav Shpilevoy 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=20210118203556.281700-9-gorcunov@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v12 8/8] test: box/cfunc -- add cmod test' \ /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