add support for per-module version numbers

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-06 18:31:29 +00:00
parent ab206439d8
commit 43cf15e339
4 changed files with 37 additions and 13 deletions

View File

@@ -51,6 +51,7 @@ struct module {
char *(*description)(void);
char *(*key)(void);
int (*reload)(void);
const char *(*version)(void);
void *lib;
char resource[256];
struct module *next;
@@ -252,6 +253,11 @@ int ast_module_reload(const char *name)
return reloaded;
}
static const char *unknown_version(void)
{
return "--unknown--";
}
static int __load_resource(const char *resource_name, const struct ast_config *cfg)
{
static char fn[256];
@@ -347,9 +353,17 @@ static int __load_resource(const char *resource_name, const struct ast_config *c
ast_log(LOG_WARNING, "No key routine in module %s\n", fn);
errors++;
}
m->reload = dlsym(m->lib, "reload");
if (m->reload == NULL)
m->reload = dlsym(m->lib, "_reload");
m->version = dlsym(m->lib, "version");
if (m->version == NULL)
m->version = dlsym(m->lib, "_version");
if (m->version == NULL)
m->version = unknown_version;
if (!m->key || !(key = m->key())) {
ast_log(LOG_WARNING, "Key routine returned NULL in module %s\n", fn);
key = NULL;
@@ -549,20 +563,23 @@ void ast_update_use_count(void)
}
int ast_update_module_list(int (*modentry)(char *module, char *description, int usecnt, char *like), char *like)
int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *version, const char *like),
const char *like)
{
struct module *m;
int unlock = -1;
int total_mod_loaded = 0;
if (ast_mutex_trylock(&modlock))
unlock = 0;
m = module_list;
while(m) {
total_mod_loaded += modentry(m->resource, m->description(), m->usecount(), like);
while (m) {
total_mod_loaded += modentry(m->resource, m->description(), m->usecount(), m->version(), like);
m = m->next;
}
if (unlock)
ast_mutex_unlock(&modlock);
return total_mod_loaded;
}