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 /apps/app_skel.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 'apps/app_skel.c')
-rw-r--r-- | apps/app_skel.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/apps/app_skel.c b/apps/app_skel.c index 25a431182..598170d2e 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/app.h" -static char *tdesc = "Trivial skeleton Application"; static char *app = "Skel"; static char *synopsis = "Skeleton application."; @@ -119,44 +118,26 @@ static int app_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; - res = ast_unregister_application(app); - - STANDARD_HANGUP_LOCALUSERS; - return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, app_exec, synopsis, descrip); } -int reload(void) -{ - /* This function will be called if a 'reload' is requested */ - - return 0; -} - -const char *description(void) +static const char *description(void) { - return tdesc; + return "Trivial skeleton Application"; } -int usecount(void) -{ - int res; - - STANDARD_USECOUNT(res); - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; |