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 /funcs/func_odbc.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 'funcs/func_odbc.c')
-rw-r--r-- | funcs/func_odbc.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index c76937fb4..56332e970 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -646,32 +646,25 @@ reload_out: return res; } -int unload_module(void) +static int unload_module(void *mod) { return odbc_unload_module(); } -int load_module(void) +static int load_module(void *mod) { return odbc_load_module(); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - if (! ast_mutex_trylock(&query_lock)) { - ast_mutex_unlock(&query_lock); - return 0; - } else { - return 1; - } -} +/* XXX need to revise usecount - set if query_lock is set */ -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_1, NULL, NULL, NULL); |