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 6/8] module_cache: provide helpers to load and unload modules Date: Mon, 18 Jan 2021 23:35:54 +0300 [thread overview] Message-ID: <20210118203556.281700-7-gorcunov@gmail.com> (raw) In-Reply-To: <20210118203556.281700-1-gorcunov@gmail.com> We need to be able to load and unload modules without functions bound to them, just plain dlopen inside. This is a part of API for future patches. Part-of #4642 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/module_cache.c | 47 +++++++++++++++++++++++++++++++----------- src/box/module_cache.h | 19 +++++++++++++++++ 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/box/module_cache.c b/src/box/module_cache.c index ae874caab..cb580f342 100644 --- a/src/box/module_cache.c +++ b/src/box/module_cache.c @@ -198,7 +198,7 @@ module_find(const char *package, const char *package_end, * for cases of a function reload. */ static struct module * -module_load(const char *package, const char *package_end) +module_dlopen(const char *package, const char *package_end) { char path[PATH_MAX]; if (module_find(package, package_end, path, sizeof(path)) != 0) @@ -338,16 +338,10 @@ module_sym_load(struct module_sym *mod_sym) struct func_name_desc d; parse_func_name(mod_sym->name, &d); - struct module *module = module_cache_find(d.package, d.package_end); - if (module == NULL) { - module = module_load(d.package, d.package_end); - if (module == NULL) - return -1; - if (module_cache_add(module) != 0) { - module_delete(module); - return -1; - } - } + size_t len = d.package_end - d.package; + struct module *module = module_load(d.package, len); + if (module == NULL) + return -1; mod_sym->addr = module_sym(module, d.sym); if (mod_sym->addr == NULL) @@ -437,6 +431,34 @@ module_cache_update(const char *name, const char *name_end, return 0; } +/** + * Load a new module. + */ +struct module * +module_load(const char *path, size_t path_len) +{ + struct module *module = module_cache_find(path, &path[path_len]); + if (module == NULL) { + module = module_dlopen(path, &path[path_len]); + if (module == NULL) + return NULL; + if (module_cache_add(module) != 0) { + module_delete(module); + return NULL; + } + } + return module; +} + +/** + * Unload a module. + */ +void +module_unload(struct module *module) +{ + module_gc(module); +} + int module_reload(const char *package, const char *package_end, struct module **module) @@ -448,7 +470,8 @@ module_reload(const char *package, const char *package_end, return 0; } - struct module *new = module_load(package, package_end); + size_t len = package_end - package; + struct module *new = module_dlopen(package, &package[len]); if (new == NULL) return -1; diff --git a/src/box/module_cache.h b/src/box/module_cache.h index feb1f2266..87108ae81 100644 --- a/src/box/module_cache.h +++ b/src/box/module_cache.h @@ -107,6 +107,25 @@ int module_sym_call(struct module_sym *mod_sym, struct port *args, struct port *ret); +/** + * Load a module. + * + * @param path path to a module file without extension. + * @param path_len length of @path. + * + * @return pointer to a module or NULL on error. + */ +struct module * +module_load(const char *path, size_t path_len); + +/** + * Unload a module. + * + * @param module pointer to a module. + */ +void +module_unload(struct module *module); + /** * Reload a module and all associated symbols. * -- 2.29.2
next prev parent reply other threads:[~2021-01-18 20:39 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 ` Cyrill Gorcunov via Tarantool-patches [this message] 2021-01-24 16:28 ` [Tarantool-patches] [PATCH v12 6/8] module_cache: provide helpers to load and unload modules 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 ` [Tarantool-patches] [PATCH v12 8/8] test: box/cfunc -- add cmod test Cyrill Gorcunov via Tarantool-patches 2021-01-24 16:28 ` 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-7-gorcunov@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v12 6/8] module_cache: provide helpers to load and unload modules' \ /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