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 /res/res_monitor.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 'res/res_monitor.c')
| -rw-r--r-- | res/res_monitor.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 6c00c593c..e570e726b 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -31,8 +31,6 @@ #include <sys/stat.h> #include <libgen.h> /* dirname() */ -#define STATIC_MODULE - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -647,7 +645,7 @@ static int unpause_monitor_action(struct mansession *s, struct message *m) } -STATIC_MODULE int load_module(void) +static int load_module(void *mod) { ast_register_application("Monitor", start_monitor_exec, monitor_synopsis, monitor_descrip); ast_register_application("StopMonitor", stop_monitor_exec, stopmonitor_synopsis, stopmonitor_descrip); @@ -663,7 +661,7 @@ STATIC_MODULE int load_module(void) return 0; } -STATIC_MODULE int unload_module(void) +static int unload_module(void *mod) { ast_unregister_application("Monitor"); ast_unregister_application("StopMonitor"); @@ -679,27 +677,14 @@ STATIC_MODULE int unload_module(void) return 0; } -STATIC_MODULE const char *description(void) +static const char *description(void) { return "Call Monitoring Resource"; } -STATIC_MODULE int usecount(void) -{ - /* Never allow monitor to be unloaded because it will - unresolve needed symbols in the channel */ -#if 0 - int res; - STANDARD_USECOUNT(res); - return res; -#else - return 1; -#endif -} - -STATIC_MODULE const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } -STD_MOD(MOD_0, NULL, NULL, NULL); /* MOD_0 because it exports some symbols */ +STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL); /* MOD_0 because it exports some symbols */ |