kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +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

27
codecs/codec_a_mu.c
View File

@@ -111,8 +111,6 @@ static struct ast_frame *ulawtoalaw_sample(void)
return &f;
}
static struct ast_module_lock me = { .usecnt = -1 };
static struct ast_translator alawtoulaw = {
.name = "alawtoulaw",
.srcfmt = AST_FORMAT_ALAW,
@@ -121,7 +119,6 @@ static struct ast_translator alawtoulaw = {
.sample = alawtoulaw_sample,
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES,
.lockp = &me,
};
static struct ast_translator ulawtoalaw = {
@@ -132,24 +129,19 @@ static struct ast_translator ulawtoalaw = {
.sample = ulawtoalaw_sample,
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES,
.lockp = &me,
};
/*! \brief standard module glue */
int unload_module(void)
static int unload_module(void *mod)
{
int res;
ast_mutex_lock(&me.lock);
res = ast_unregister_translator(&ulawtoalaw);
res |= ast_unregister_translator(&alawtoulaw);
if (me.usecnt)
res = -1;
ast_mutex_unlock(&me.lock);
return res;
}
int load_module(void)
static int load_module(void *mod)
{
int res;
int x;
@@ -157,25 +149,22 @@ int load_module(void)
mu2a[x] = AST_LIN2A(AST_MULAW(x));
a2mu[x] = AST_LIN2MU(AST_ALAW(x));
}
res = ast_register_translator(&alawtoulaw);
res = ast_register_translator(&alawtoulaw, mod);
if (!res)
res = ast_register_translator(&ulawtoalaw);
res = ast_register_translator(&ulawtoalaw, mod);
else
ast_unregister_translator(&alawtoulaw);
return res;
}
const char *description(void)
static const char *description(void)
{
return "A-law and Mulaw direct Coder/Decoder";
}
int usecount(void)
{
return me.usecnt;
}
const char *key()
static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
STD_MOD(MOD_1, NULL, NULL, NULL);