diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
commit | e43bc6634dc60ca897a848ca3301f52c74330279 (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /res/res_features.c | |
parent | 33a3a7375a4917455495c08c8602bfe453580fd1 (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: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_features.c')
-rw-r--r-- | res/res_features.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/res/res_features.c b/res/res_features.c index b114d23c0..f29ec9d45 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -142,8 +142,6 @@ AST_MUTEX_DEFINE_STATIC(parking_lock); static pthread_t parking_thread; -LOCAL_USER_DECL; - char *ast_parking_ext(void) { return parking_ext; @@ -2201,14 +2199,16 @@ static int load_config(void) return ast_add_extension2(con, 1, ast_parking_ext(), 1, NULL, NULL, parkcall, strdup(""), FREE, registrar); } -int reload(void) { +static int reload(void *mod) +{ return load_config(); } -int load_module(void) +static int load_module(void *mod) { int res; + __mod_desc = mod; AST_LIST_HEAD_INIT(&feature_list); memset(parking_ext, 0, sizeof(parking_ext)); memset(parking_con, 0, sizeof(parking_con)); @@ -2230,7 +2230,7 @@ int load_module(void) } -int unload_module(void) +static int unload_module(void *mod) { STANDARD_HANGUP_LOCALUSERS; @@ -2242,25 +2242,14 @@ int unload_module(void) return ast_unregister_application(parkedcall); } -const char *description(void) +static const char *description(void) { return "Call Features Resource"; } -int usecount(void) -{ - /* Never allow parking to be unloaded because it will - unresolve needed symbols in the dialer */ -#if 0 - int res; - STANDARD_USECOUNT(res); - return res; -#else - return 1; -#endif -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_0 | NO_UNLOAD, reload, NULL, NULL); |