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

This rather large commit changes the way modules are loaded.

Browse Source 
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:
Luigi Rizzo
2006-04-14 14:08:19 +00:00
parent 33a3a7375a
commit e43bc6634d
162 changed files with 1273 additions and 2386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
codecs/codec_speex.c
View File

@@ -337,8 +337,6 @@ static void lintospeex_destroy(struct ast_trans_pvt *arg)
speex_bits_destroy(&pvt->bits);
}
static struct ast_module_lock me = { .usecnt = -1 };
static struct ast_translator speextolin = {
.name = "speextolin",
.srcfmt = AST_FORMAT_SPEEX,
@@ -350,7 +348,6 @@ static struct ast_translator speextolin = {
.desc_size = sizeof(struct speex_coder_pvt),
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES * 2,
.lockp = &me,
};
static struct ast_translator lintospeex = {
@@ -365,10 +362,8 @@ static struct ast_translator lintospeex = {
.desc_size = sizeof(struct speex_coder_pvt),
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES * 2, /* XXX maybe a lot less ? */
.lockp = &me,
};
static void parse_config(void)
{
struct ast_config *cfg = ast_config_load("codecs.conf");
@@ -479,7 +474,7 @@ static void parse_config(void)
ast_config_destroy(cfg);
}
int reload(void)
static int reload(void *mod)
{
/*
* XXX reloading while there are active sessions is
@@ -487,48 +482,40 @@ int reload(void)
* wouldn't work anymore...
* maybe we shuld do a standard hangup localusers ?
*/
ast_mutex_lock(&me.lock);
ast_mutex_lock(&__mod_desc->lock);
parse_config();
ast_mutex_lock(&me.lock);
ast_mutex_lock(&__mod_desc->lock);
return 0;
}
int unload_module(void)
static int unload_module(void *mod)
{
int res;
ast_mutex_lock(&me.lock);
res = ast_unregister_translator(&lintospeex);
if (!res)
res = ast_unregister_translator(&speextolin);
if (me.usecnt)
res = -1;
ast_mutex_unlock(&me.lock);
res |= ast_unregister_translator(&speextolin);
return res;
}
int load_module(void)
static int load_module(void *mod)
{
int res;
parse_config();
res=ast_register_translator(&speextolin);
res=ast_register_translator(&speextolin, mod);
if (!res)
res=ast_register_translator(&lintospeex);
res=ast_register_translator(&lintospeex, mod);
else
ast_unregister_translator(&speextolin);
return res;
}
const char *description(void)
static const char *description(void)
{
return "Speex/PCM16 (signed linear) Codec Translator";
}
int usecount(void)
{
return me.usecnt;
}
const char *key()
static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
STD_MOD(MOD_1, reload, NULL, NULL);