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 /res/res_convert.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 'res/res_convert.c')
-rw-r--r-- | res/res_convert.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/res/res_convert.c b/res/res_convert.c index be441bc4b..553075874 100644 --- a/res/res_convert.c +++ b/res/res_convert.c @@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/cli.h" #include "asterisk/file.h" -STANDARD_USECOUNT_DECL; +struct module_symbols *me; /*! \brief Split the filename to basename and extension */ static int split_ext(char *filename, char **name, char **ext) @@ -65,7 +65,7 @@ static int cli_audio_convert(int fd, int argc, char *argv[]) char *file_in = NULL, *file_out = NULL; char *name_in, *ext_in, *name_out, *ext_out; - STANDARD_INCREMENT_USECOUNT; + ast_atomic_fetchadd_int(&me->usecnt, +1); if (argc != 3 || ast_strlen_zero(argv[1]) || ast_strlen_zero(argv[2])) { ret = RESULT_SHOWUSAGE; @@ -116,7 +116,7 @@ fail_out: if (fs_in) ast_closestream(fs_in); - STANDARD_DECREMENT_USECOUNT; + ast_atomic_fetchadd_int(&me->usecnt, -1); return ret; } @@ -132,31 +132,25 @@ static struct ast_cli_entry audio_convert_cli={ { "convert" , NULL }, cli_audio_convert, "Convert audio files", usage_audio_convert }; -int unload_module(void) +static int unload_module(void *mod) { return ast_cli_unregister(&audio_convert_cli); } -int load_module(void) +static int load_module(void *mod) { + me = mod; return ast_cli_register(&audio_convert_cli); } -const char *description(void) +static const char *description(void) { return "File format conversion CLI command"; - -} - -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; } -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD1; |