From e43bc6634dc60ca897a848ca3301f52c74330279 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Fri, 14 Apr 2006 14:08:19 +0000 Subject: 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 --- formats/format_gsm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'formats/format_gsm.c') diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 423088c17..46d943394 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -156,8 +156,6 @@ static off_t gsm_tell(struct ast_filestream *fs) return (offset/GSM_FRAME_SIZE)*GSM_SAMPLES; } -static struct ast_format_lock me = { .usecnt = -1 }; - static const struct ast_format gsm_f = { .name = "gsm", .exts = "gsm", @@ -168,30 +166,27 @@ static const struct ast_format gsm_f = { .tell = gsm_tell, .read = gsm_read, .buf_size = 2*GSM_FRAME_SIZE + AST_FRIENDLY_OFFSET, /* 2 gsm frames */ - .lockp = &me, + .module = &mod_data, /* XXX */ }; -int load_module() +static int load_module(void *mod) { return ast_format_register(&gsm_f); } -int unload_module() +static int unload_module(void *mod) { return ast_format_unregister(gsm_f.name); } -int usecount() -{ - return me.usecnt; -} - -const char *description() +static const char *description(void) { return "Raw GSM data"; } -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; -- cgit v1.2.3