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_gsm.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_gsm.c')
-rw-r--r-- | codecs/codec_gsm.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index df20d9b2a..e9a85bc38 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -203,8 +203,6 @@ static void gsm_destroy_stuff(struct ast_trans_pvt *pvt) gsm_destroy(tmp->gsm); } -static struct ast_module_lock me = { .usecnt = -1 }; - static struct ast_translator gsmtolin = { .name = "gsmtolin", .srcfmt = AST_FORMAT_GSM, @@ -213,7 +211,6 @@ static struct ast_translator gsmtolin = { .framein = gsmtolin_framein, .destroy = gsm_destroy_stuff, .sample = gsmtolin_sample, - .lockp = &me, .buffer_samples = BUFFER_SAMPLES, .buf_size = BUFFER_SAMPLES * 2, .desc_size = sizeof (struct gsm_translator_pvt ), @@ -229,7 +226,6 @@ static struct ast_translator lintogsm = { .frameout = lintogsm_frameout, .destroy = gsm_destroy_stuff, .sample = lintogsm_sample, - .lockp = &me, .desc_size = sizeof (struct gsm_translator_pvt ), .buf_size = (BUFFER_SAMPLES * GSM_FRAME_LEN + GSM_SAMPLES - 1)/GSM_SAMPLES, }; @@ -252,48 +248,41 @@ 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(&lintogsm); if (!res) res = ast_unregister_translator(&gsmtolin); - 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(&gsmtolin); + res = ast_register_translator(&gsmtolin, mod); if (!res) - res=ast_register_translator(&lintogsm); + res=ast_register_translator(&lintogsm, mod); else ast_unregister_translator(&gsmtolin); return res; } -const char *description(void) +static const char *description(void) { return "GSM/PCM16 (signed linear) Codec Translator"; } -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); |