kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +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

28
res/res_clioriginate.c
View File

@@ -42,7 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
/*! The timeout for originated calls, in seconds */
#define TIMEOUT 30
STANDARD_USECOUNT_DECL;
static struct module_symbols *me;
static char orig_help[] =
" There are two ways to use this command. A call can be originated between a\n"
@@ -132,7 +132,7 @@ static int handle_orig(int fd, int argc, char *argv[])
if (ast_strlen_zero(argv[1]) || ast_strlen_zero(argv[2]))
return RESULT_SHOWUSAGE;
STANDARD_INCREMENT_USECOUNT;
ast_atomic_fetchadd_int(&me->usecnt, +1);
if (!strcasecmp("application", argv[2])) {
res = orig_app(argv[1], argv[3], argv[4]);
@@ -141,7 +141,7 @@ static int handle_orig(int fd, int argc, char *argv[])
} else
res = RESULT_SHOWUSAGE;
STANDARD_DECREMENT_USECOUNT;
ast_atomic_fetchadd_int(&me->usecnt, -1);
return res;
}
@@ -154,38 +154,32 @@ static char *complete_orig(const char *line, const char *word, int pos, int stat
if (pos != 2)
return NULL;
STANDARD_INCREMENT_USECOUNT;
ast_atomic_fetchadd_int(&me->usecnt, +1);
ret = ast_cli_complete(word, choices, state);
STANDARD_DECREMENT_USECOUNT;
ast_atomic_fetchadd_int(&me->usecnt, -1);
return ret;
}
int unload_module(void)
static int unload_module(void *mod)
{
return ast_cli_unregister(&cli_orig);
}
int load_module(void)
static int load_module(void *mod)
{
me = mod;
return ast_cli_register(&cli_orig);
}
const char *description(void)
static const char *description(void)
{
return "Call origination from the CLI";
}
int usecount(void)
{
return 0;
}
const char *key(void)
static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
STD_MOD(MOD_0 | NO_USECOUNT, NULL, NULL, NULL);