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

24
formats/format_g726.c
View File

@@ -190,8 +190,6 @@ static off_t g726_tell(struct ast_filestream *fs)
return -1;
}
static struct ast_format_lock me = { .usecnt = -1 };
static const struct ast_format f[] = {
{
.name = "g726-40",
@@ -206,7 +204,7 @@ static const struct ast_format f[] = {
.read = g726_read,
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
.desc_size = sizeof(struct g726_desc),
.lockp = &me,
.module = &mod_data, /* XXX */
},
{
.name = "g726-32",
@@ -221,7 +219,7 @@ static const struct ast_format f[] = {
.read = g726_read,
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
.desc_size = sizeof(struct g726_desc),
.lockp = &me,
.module = &mod_data, /* XXX */
},
{
.name = "g726-24",
@@ -236,7 +234,7 @@ static const struct ast_format f[] = {
.read = g726_read,
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
.desc_size = sizeof(struct g726_desc),
.lockp = &me,
.module = &mod_data, /* XXX */
},
{
.name = "g726-16",
@@ -251,7 +249,7 @@ static const struct ast_format f[] = {
.read = g726_read,
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
.desc_size = sizeof(struct g726_desc),
.lockp = &me,
.module = &mod_data, /* XXX */
},
{ .format = 0 } /* terminator */
};
@@ -259,7 +257,7 @@ static const struct ast_format f[] = {
/*
* Module interface (load_module, unload_module, usecount, description, key)
*/
int load_module()
static int load_module(void *mod)
{
int i;
@@ -272,7 +270,7 @@ int load_module()
return 0;
}
int unload_module()
static int unload_module(void *mod)
{
int i;
@@ -283,18 +281,14 @@ int unload_module()
return(0);
}
int usecount()
{
return me.usecnt;
}
const char *description()
static const char *description(void)
{
return "Raw G.726 (16/24/32/40kbps) data";
}
const char *key()
static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
STD_MOD1;