From e43bc6634dc60ca897a848ca3301f52c74330279 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Fri, 14 Apr 2006 14:08:19 +0000 Subject: 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 --- apps/app_mixmonitor.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'apps/app_mixmonitor.c') diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 43b5f7b95..d4e374a4b 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -57,7 +57,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0 -static const char *tdesc = "Mixed Audio Monitoring Application"; static const char *app = "MixMonitor"; static const char *synopsis = "Record a call and mix the audio during the recording"; static const char *desc = "" @@ -88,7 +87,7 @@ static const char *stop_desc = "" "on the current channel.\n" ""; -LOCAL_USER_DECL; +struct module_symbols *me; static const char *mixmonitor_spy_type = "MixMonitor"; @@ -169,7 +168,7 @@ static void *mixmonitor_thread(void *obj) struct ast_frame *f; char post_process[1024] = ""; - STANDARD_INCREMENT_USECOUNT; + ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1); name = ast_strdupa(mixmonitor->chan->name); @@ -282,7 +281,7 @@ out2: out: free(mixmonitor); - STANDARD_DECREMENT_USECOUNT; + ast_atomic_fetchadd_int(&__mod_desc->usecnt, -1); return NULL; } @@ -461,7 +460,7 @@ static struct ast_cli_entry cli_mixmonitor = { complete_mixmonitor_cli }; -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -474,7 +473,7 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { int res; @@ -485,21 +484,14 @@ int load_module(void) return res; } -const char *description(void) +static const char *description(void) { - return (char *) tdesc; + return "Mixed Audio Monitoring 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; -- cgit v1.2.3