kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

partial adaptation to the new module loading

Browse Source 
(not sure if it compiles, partly inspired by #9981 but
with adaptations)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-29 04:54:05 +00:00
parent 8682a7378d
commit 96e015a239
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
channels/chan_h323.c
View File

@@ -180,10 +180,6 @@ static struct io_context *io;
/** Protect the interface list (oh323_pvt) */ /** Protect the interface list (oh323_pvt) */
AST_MUTEX_DEFINE_STATIC(iflock); AST_MUTEX_DEFINE_STATIC(iflock);
/** Usage counter and associated lock */
static int usecnt = 0;
AST_MUTEX_DEFINE_STATIC(usecnt_lock);
/* Protect the monitoring thread, so only one process can kill or start it, and not /* Protect the monitoring thread, so only one process can kill or start it, and not
when it's doing something critical. */ when it's doing something critical. */
AST_MUTEX_DEFINE_STATIC(monlock); AST_MUTEX_DEFINE_STATIC(monlock);
@@ -534,13 +530,8 @@ static int oh323_hangup(struct ast_channel *c)
pvt->needdestroy = 1; pvt->needdestroy = 1;
/* Update usage counter */ /* Update usage counter */
ast_mutex_lock(&usecnt_lock);
usecnt--;
if (usecnt < 0) {
ast_log(LOG_WARNING, "Usecnt < 0\n");
}
ast_mutex_unlock(&usecnt_lock);
ast_mutex_unlock(&pvt->lock); ast_mutex_unlock(&pvt->lock);
ast_atomic_fetchadd_int(&__mod_desc->usecnt, -1);
ast_update_use_count(); ast_update_use_count();
return 0; return 0;
} }
@@ -734,9 +725,7 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c
ast_mutex_unlock(&pvt->lock); ast_mutex_unlock(&pvt->lock);
ch = ast_channel_alloc(1); ch = ast_channel_alloc(1);
/* Update usage counter */ /* Update usage counter */
ast_mutex_lock(&usecnt_lock); ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1);
usecnt++;
ast_mutex_unlock(&usecnt_lock);
ast_update_use_count(); ast_update_use_count();
ast_mutex_lock(&pvt->lock); ast_mutex_lock(&pvt->lock);
if (ch) { if (ch) {
@@ -2237,7 +2226,7 @@ static int h323_do_reload(void)
return 0; return 0;
} }
int reload(void) static int reload(void *mod)
{ {
return h323_reload(0, 0, NULL); return h323_reload(0, 0, NULL);
} }
@@ -2317,7 +2306,7 @@ static struct ast_rtp_protocol oh323_rtp = {
.set_rtp_peer= oh323_set_rtp_peer, .set_rtp_peer= oh323_set_rtp_peer,
}; };
int load_module() static int load_module(void *mod)
{ {
int res; int res;
ast_mutex_init(&userl.lock); ast_mutex_init(&userl.lock);
@@ -2385,7 +2374,7 @@ int load_module()
return res; return res;
} }
int unload_module() static int unload_module(void *mod)
{ {
struct oh323_pvt *p, *pl; struct oh323_pvt *p, *pl;
@@ -2459,18 +2448,14 @@ int unload_module()
return 0; return 0;
} }
int usecount() static const char *description(void)
{ {
return usecnt; return desc;
} }
const char *description() static const char *key(void)
{
return (char *) desc;
}
const char *key()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }
STD_MOD(MOD_1, reload, NULL, NULL);