kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "loader: Add support for built-in modules."

Browse Source
This commit is contained in:
Jenkins2
2018-01-22 16:35:09 -06:00
committed by Gerrit Code Review
parent cec16d8e4f 25cb1ab05b
commit d4e9f7c940
2 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
main/loader.c
View File

@@ -112,6 +112,9 @@ static char buildopt_sum[33] = AST_BUILDOPT_SUM;
AST_VECTOR(module_vector, struct ast_module *);
/* Built-in module registrations need special handling at startup */
static unsigned int loader_ready;
/*!
* \brief Internal flag to indicate all modules have been initially loaded.
*/
@@ -149,6 +152,8 @@ struct ast_module {
unsigned int declined:1;
/*! This module is being held open until it's time to shutdown. */
unsigned int keepuntilshutdown:1;
/*! The module is built-in. */
unsigned int builtin:1;
} flags;
AST_DLLIST_ENTRY(ast_module) entry;
char resource[0];
@@ -156,6 +161,13 @@ struct ast_module {
static AST_DLLIST_HEAD_STATIC(module_list, ast_module);
/*
* module_list is cleared by its constructor possibly after
* we start accumulating built-in modules, so we need to
* use another list (without the lock) to accumulate them.
*/
static struct module_list builtin_module_list;
static int module_vector_strcasecmp(struct ast_module *a, struct ast_module *b)
{
return strcasecmp(a->resource, b->resource);
@@ -445,6 +457,22 @@ void ast_module_register(const struct ast_module_info *info)
{
struct ast_module *mod;
if (!loader_ready) {
mod = ast_calloc(1, sizeof(*mod) + strlen(info->name) + 1);
if (!mod) {
/* We haven't even reached main() yet, if we can't
* allocate memory at this point just give up. */
exit(2);
}
strcpy(mod->resource, info->name); /* safe */
mod->info = info;
mod->flags.builtin = 1;
AST_DLLIST_INSERT_TAIL(&builtin_module_list, mod, entry);
/* ast_module_register for built-in modules is run again during module preload. */
return;
}
/*
* This lock protects resource_being_loaded as well as the module
* list. Normally we already have a lock on module_list when we
@@ -1726,6 +1754,17 @@ int load_modules(unsigned int preload_only)
AST_DLLIST_LOCK(&module_list);
/*
* All built-in modules have registered the first time, now it's time to complete
* the registration and add them to the priority list.
*/
loader_ready = 1;
while ((resource_being_loaded = AST_DLLIST_REMOVE_HEAD(&builtin_module_list, entry))) {
/* ast_module_register doesn't finish when first run by built-in modules. */
ast_module_register(resource_being_loaded->info);
}
cfg = ast_config_load2(AST_MODULE_CONFIG, "" /* core, can't reload */, config_flags);
if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_WARNING, "No '%s' found, no modules will be loaded.\n", AST_MODULE_CONFIG);