diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
commit | 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /codecs/codec_a_mu.c | |
parent | f9d382fc079246930a99640d7835d6ae3e4149db (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: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_a_mu.c')
-rw-r--r-- | codecs/codec_a_mu.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index 2f5400de6..51e38e9cf 100644 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -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); |