From 96e015a239d0f130669bddcfb07f478c6c56b6f8 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Sat, 29 Apr 2006 04:54:05 +0000
Subject: [PATCH] partial adaptation to the new module loading (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
---
channels/chan_h323.c | 33 +++++++++------------------------
1 file changed, 9 insertions(+), 24 deletions(-)
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 4879c269c3..4f50e40390 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -180,10 +180,6 @@ static struct io_context *io;
/** Protect the interface list (oh323_pvt) */
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
when it's doing something critical. */
AST_MUTEX_DEFINE_STATIC(monlock);
@@ -534,13 +530,8 @@ static int oh323_hangup(struct ast_channel *c)
pvt->needdestroy = 1;
/* 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_atomic_fetchadd_int(&__mod_desc->usecnt, -1);
ast_update_use_count();
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);
ch = ast_channel_alloc(1);
/* Update usage counter */
- ast_mutex_lock(&usecnt_lock);
- usecnt++;
- ast_mutex_unlock(&usecnt_lock);
+ ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1);
ast_update_use_count();
ast_mutex_lock(&pvt->lock);
if (ch) {
@@ -2237,7 +2226,7 @@ static int h323_do_reload(void)
return 0;
}
-int reload(void)
+static int reload(void *mod)
{
return h323_reload(0, 0, NULL);
}
@@ -2317,7 +2306,7 @@ static struct ast_rtp_protocol oh323_rtp = {
.set_rtp_peer= oh323_set_rtp_peer,
};
-int load_module()
+static int load_module(void *mod)
{
int res;
ast_mutex_init(&userl.lock);
@@ -2385,7 +2374,7 @@ int load_module()
return res;
}
-int unload_module()
+static int unload_module(void *mod)
{
struct oh323_pvt *p, *pl;
@@ -2459,18 +2448,14 @@ int unload_module()
return 0;
}
-int usecount()
-{
- return usecnt;
-}
-
-const char *description()
+static const char *description(void)
{
- return (char *) desc;
+ return desc;
}
-const char *key()
+static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
+STD_MOD(MOD_1, reload, NULL, NULL);
--
GitLab