kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +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

30
codecs/codec_adpcm.c
View File

@@ -27,6 +27,7 @@
* \ingroup codecs
*/
#include <fcntl.h>
#include <netinet/in.h>
#include <stdio.h>
@@ -326,8 +327,6 @@ static struct ast_frame *lintoadpcm_sample(void)
return &f;
}
struct ast_module_lock me = { .usecnt = -1 };
static struct ast_translator adpcmtolin = {
.name = "adpcmtolin",
.srcfmt = AST_FORMAT_ADPCM,
@@ -338,7 +337,6 @@ static struct ast_translator adpcmtolin = {
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES * 2,
.plc_samples = 160,
.lockp = &me,
};
static struct ast_translator lintoadpcm = {
@@ -351,7 +349,6 @@ static struct ast_translator lintoadpcm = {
.desc_size = sizeof (struct adpcm_encoder_pvt),
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES/ 2, /* 2 samples per byte */
.lockp = &me,
};
static void parse_config(void)
@@ -371,47 +368,40 @@ static void parse_config(void)
}
/*! \brief standard module glue */
int reload(void)
static int reload(void *mod)
{
parse_config();
return 0;
}
int unload_module(void)
static int unload_module(void *mod)
{
int res;
ast_mutex_lock(&me.lock);
res = ast_unregister_translator(&lintoadpcm);
res |= ast_unregister_translator(&adpcmtolin);
if (me.usecnt)
res = -1;
ast_mutex_unlock(&me.lock);
return res;
}
int load_module(void)
static int load_module(void *mod)
{
int res;
parse_config();
res = ast_register_translator(&adpcmtolin);
res = ast_register_translator(&adpcmtolin, mod);
if (!res)
res = ast_register_translator(&lintoadpcm);
res = ast_register_translator(&lintoadpcm, mod);
else
ast_unregister_translator(&adpcmtolin);
return res;
}
const char *description(void)
static const char *description(void)
{
return "Adaptive Differential PCM Coder/Decoder";
}
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);