mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h, modules are now expected to return all of their methods and flags into a structure 'mod_data', and are normally loaded with RTLD_NOW | RTLD_LOCAL, so symbols are resolved immediately and conflicts should be less likely. Only in a small number of cases (res_*, typically) modules are loaded RTLD_GLOBAL, so they can export symbols. The core of the change is only the two files loader.c and include/asterisk/module.h, all the rest is simply adaptation of the existing modules to the new API, a rather mechanical (but believe me, time and finger-consuming!) process whose detail you can figure out by svn diff'ing any single module. Expect some minor compilation issue after this change, please report it on mantis http://bugs.digium.com/view.php?id=6968 so we collect all the feedback in one place. I am just sorry that this change missed SVN version number 20000! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -121,8 +121,6 @@ static off_t vox_tell(struct ast_filestream *fs)
|
||||
return offset;
|
||||
}
|
||||
|
||||
static struct ast_format_lock me = { .usecnt = -1 };
|
||||
|
||||
static const struct ast_format vox_f = {
|
||||
.name = "vox",
|
||||
.exts = "vox",
|
||||
@@ -133,30 +131,27 @@ static const struct ast_format vox_f = {
|
||||
.tell = vox_tell,
|
||||
.read = vox_read,
|
||||
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
|
||||
.lockp = &me,
|
||||
.module = &mod_data, /* XXX */
|
||||
};
|
||||
|
||||
int load_module()
|
||||
static int load_module(void *mod)
|
||||
{
|
||||
return ast_format_register(&vox_f);
|
||||
}
|
||||
|
||||
int unload_module()
|
||||
static int unload_module(void *mod)
|
||||
{
|
||||
return ast_format_unregister(vox_f.name);
|
||||
}
|
||||
|
||||
int usecount()
|
||||
{
|
||||
return me.usecnt;
|
||||
}
|
||||
|
||||
const char *description()
|
||||
static const char *description(void)
|
||||
{
|
||||
return "Dialogic VOX (ADPCM) File Format";
|
||||
}
|
||||
|
||||
const char *key()
|
||||
static const char *key(void)
|
||||
{
|
||||
return ASTERISK_GPL_KEY;
|
||||
}
|
||||
|
||||
STD_MOD1;
|
||||
|
Reference in New Issue
Block a user