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 /apps/app_record.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 'apps/app_record.c')
-rw-r--r-- | apps/app_record.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/apps/app_record.c b/apps/app_record.c index 864714f56..38d6437e7 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -29,8 +29,6 @@ #include <stdio.h> #include <string.h> -#define STATIC_MODULE - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -46,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/options.h" -static char *tdesc = "Trivial Record Application"; static char *app = "Record"; @@ -343,7 +340,7 @@ static int record_exec(struct ast_channel *chan, void *data) return res; } -STATIC_MODULE int unload_module(void) +static int unload_module(void *mod) { int res; @@ -354,26 +351,19 @@ STATIC_MODULE int unload_module(void) return res; } -STATIC_MODULE int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, record_exec, synopsis, descrip); } -STATIC_MODULE const char *description(void) -{ - return tdesc; -} - -STATIC_MODULE int usecount(void) +static const char *description(void) { - int res; - STANDARD_USECOUNT(res); - return res; + return "Trivial Record Application"; } -STATIC_MODULE const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } -STD_MOD(MOD_1, NULL, NULL, NULL); +STD_MOD1; |