From 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d Mon Sep 17 00:00:00 2001 From: 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: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b --- pbx/pbx_config.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'pbx/pbx_config.c') diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 21316deb0..2fc9fcd63 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -30,8 +30,6 @@ #include #include -#define STATIC_MODULE - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -53,7 +51,6 @@ static void FREE(void *ptr) #define FREE free #endif -static char *dtext = "Text Extension Configuration"; static char *config = "extensions.conf"; static char *registrar = "pbx_config"; @@ -1326,7 +1323,7 @@ static struct ast_cli_entry reload_extensions_cli = /*! * Standard module functions ... */ -STATIC_MODULE int unload_module(void) +static int unload_module(void *mod) { ast_cli_unregister(&context_add_extension_cli); if (static_config && !write_protect_config) @@ -1515,7 +1512,7 @@ static int pbx_load_module(void) return 0; } -STATIC_MODULE int load_module(void) +static int load_module(void *mod) { if (pbx_load_module()) return -1; @@ -1533,7 +1530,7 @@ STATIC_MODULE int load_module(void) return 0; } -STATIC_MODULE int reload(void) +static int reload(void *mod) { if (clearglobalvars_config) pbx_builtin_clear_globals(); @@ -1541,19 +1538,15 @@ STATIC_MODULE int reload(void) return 0; } -STATIC_MODULE int usecount(void) -{ - return 0; -} - -STATIC_MODULE const char *description(void) +static const char *description(void) { - return dtext; + return "Text Extension Configuration"; } -STATIC_MODULE const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } -STD_MOD(MOD_1, reload, NULL, NULL); +/* XXX really no usecount ? */ +STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL); -- cgit v1.2.3