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 --- channels/chan_mgcp.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'channels/chan_mgcp.c') diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 6fda77a48..ffba65f70 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -137,7 +137,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define INADDR_NONE (in_addr_t)(-1) #endif -static const char desc[] = "Media Gateway Control Protocol (MGCP)"; static const char tdesc[] = "Media Gateway Control Protocol (MGCP)"; static const char config[] = "mgcp.conf"; @@ -242,8 +241,6 @@ static int amaflags = 0; static int adsi = 0; -static int usecnt =0; -AST_MUTEX_DEFINE_STATIC(usecnt_lock); /* SC: transaction id should always be positive */ static unsigned int oseq; @@ -1057,9 +1054,7 @@ static int mgcp_hangup(struct ast_channel *ast) } /* SC: Decrement use count */ - ast_mutex_lock(&usecnt_lock); - usecnt--; - ast_mutex_unlock(&usecnt_lock); + ast_atomic_fetchadd_int(&__mod_desc->usecnt, -1); ast_update_use_count(); /* SC: Decrement use count */ @@ -1480,9 +1475,7 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state) if (i->amaflags) tmp->amaflags = i->amaflags; sub->owner = tmp; - ast_mutex_lock(&usecnt_lock); - usecnt++; - ast_mutex_unlock(&usecnt_lock); + ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1); ast_update_use_count(); tmp->callgroup = i->callgroup; tmp->pickupgroup = i->pickupgroup; @@ -4323,10 +4316,11 @@ static int reload_config(void) } /*! \brief load_module: PBX load module - initialization ---*/ -int load_module() +static int load_module(void *mod) { int res; + __mod_desc = mod; sched = sched_context_create(); if (!sched) { ast_log(LOG_WARNING, "Unable to create schedule context\n"); @@ -4377,13 +4371,13 @@ static int mgcp_reload(int fd, int argc, char *argv[]) return 0; } -int reload(void) +static int reload(void *mod) { mgcp_reload(0, 0, NULL); return 0; } -int unload_module() +static int unload_module(void *mod) { struct mgcp_endpoint *e; struct mgcp_gateway *g; @@ -4455,17 +4449,14 @@ int unload_module() return 0; } -int usecount() -{ - return usecnt; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } -const char *description() +static const char *description(void) { - return (char *) desc; + return "Media Gateway Control Protocol (MGCP)"; } + +STD_MOD(MOD_1, reload, NULL, NULL); -- cgit v1.2.3