kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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

25
res/res_monitor.c
View File

@@ -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 */