diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
commit | e43bc6634dc60ca897a848ca3301f52c74330279 (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /formats/format_pcm.c | |
parent | 33a3a7375a4917455495c08c8602bfe453580fd1 (diff) |
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
Diffstat (limited to 'formats/format_pcm.c')
-rw-r--r-- | formats/format_pcm.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 889e7afc2..c2b626240 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -414,8 +414,6 @@ static off_t au_tell(struct ast_filestream *fs) return offset - AU_HEADER_SIZE; } -static struct ast_format_lock me = { .usecnt = -1 }; - static const struct ast_format alaw_f = { .name = "alaw", .exts = "alaw|al", @@ -426,7 +424,7 @@ static const struct ast_format alaw_f = { .tell = pcm_tell, .read = pcm_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, - .lockp = &me, + .module = &mod_data, /* XXX */ #ifdef REALTIME_WRITE .open = pcma_open, .rewrite = pcma_rewrite, @@ -444,7 +442,7 @@ static const struct ast_format pcm_f = { .tell = pcm_tell, .read = pcm_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, - .lockp = &me, + .module = &mod_data, /* XXX */ }; static const struct ast_format au_f = { @@ -459,10 +457,10 @@ static const struct ast_format au_f = { .tell = au_tell, .read = pcm_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, /* this many shorts */ - .lockp = &me, + .module = &mod_data, /* XXX */ }; -int load_module() +static int load_module(void *mod) { int index; @@ -476,23 +474,20 @@ int load_module() || ast_format_register(&au_f); } -int unload_module() +static int unload_module(void *mod) { return ast_format_unregister(pcm_f.name) || ast_format_unregister(alaw_f.name) || ast_format_unregister(au_f.name); } -int usecount() -{ - return me.usecnt; -} - -const char *description() +static const char *description(void) { return "Raw/Sun uLaw/ALaw 8khz Audio support (PCM,PCMA,AU)"; } -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; |