kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

This rather large commit changes the way modules are loaded.

Browse Source 
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
This commit is contained in:
Luigi Rizzo
2006-04-14 14:08:19 +00:00
parent 33a3a7375a
commit e43bc6634d
162 changed files with 1273 additions and 2386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pbx/pbx_config.c
View File

@@ -30,8 +30,6 @@
#include <ctype.h>
#include <errno.h>
#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)
static const char *description(void)
{
return 0;
return "Text Extension Configuration";
}
STATIC_MODULE const char *description(void)
{
return dtext;
}
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);