[Tarantool-patches] [PATCH v8 1/4] box/func: factor out c function entry structure

Cyrill Gorcunov gorcunov at gmail.com
Fri Oct 30 12:51:57 MSK 2020


On Thu, Oct 29, 2020 at 11:15:51PM +0100, Vladislav Shpilevoy wrote:
...
> > +int
> > +module_sym_load(struct module_sym *mod_sym)
> > +{
> > +	assert(mod_sym->addr == NULL);
> > +
> > +	struct func_name name;
> > +	func_split_name(mod_sym->name, &name);
> > +
> > +	struct module *module = module_cache_find(name.package,
> > +						  name.package_end);
> > +	if (module == NULL) {
> > +		/* Try to find loaded module in the cache */
> > +		module = module_load(name.package, name.package_end);
> > +		if (module == NULL)
> > +			return -1;
> > +		if (module_cache_put(module)) {
> 
> 1. Please, use explicit != 0.
> https://github.com/tarantool/tarantool/wiki/Code-review-procedure#code-style

OK

> 
> > +			module_delete(module);
> > +			return -1;
> > +		}
> > +	}
> > +
> > +	mod_sym->addr = module_sym(module, name.sym);
> > +	if (mod_sym->addr == NULL)
> > +		return -1;
> 
> 2. If the module was loaded first time here, it is not unloaded in case of
> an error in this place.

Just like it was before the patch. The patch simply factor outs the old
code. It doesn't improve it (because, lets be honest this is a min problem
for module management -- we've to check for module symbol not at moment
of calling it but rather at the moment when we load a function). That
said the issue with module management is known and I think we need to
rework modules code more deeply, but not in this series. In the
series it remains exactly as it was.

> >  
> > +/**
> > + * Callable symbol bound to a module.
> > + */
> > +struct module_sym {
> > +	/**
> > +	 * Anchor for module membership.
> > +	 */
> > +	struct rlist item;
> > +	/**
> > +	 * For C functions, address of the function.
> > +	 */
> > +	box_function_f addr;
> > +	/**
> > +	 * Each stored function keeps a handle to the
> > +	 * dynamic library for the C callback.
> > +	 */
> 
> 3. Can't parse the comment. What is the 'C callback'?
> And why is this function stored? After you extracted it
> from struct func_c, it is not related to _func space, and
> is not stored.

It is stored in memory. The C callback is the function we
call, so we keep a pointer to a module. If shuch comment
confuses lets change it to something like "Each function
keeps a handle to the module where the symbol relies"?


More information about the Tarantool-patches mailing list