[svn-commits] rizzo: trunk r89293 - in /trunk: apps/ include/asterisk/ main/ res/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Nov 15 10:20:47 CST 2007
Author: rizzo
Date: Thu Nov 15 10:20:47 2007
New Revision: 89293
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89293
Log:
access channel locks through ast_channel_lock/unlock/trylock and not
through ast_mutex primitives.
To detect all occurrences, I have renamed the lock field in struct ast_channel
so it is clear that it shouldn't be used directly.
There are some uses in res/res_features.c (see details of the diff)
that are error prone as they try and lock two channels without
caring about the order (or without explaining why it is safe).
Modified:
trunk/apps/app_channelredirect.c
trunk/apps/app_senddtmf.c
trunk/apps/app_softhangup.c
trunk/include/asterisk/channel.h
trunk/include/asterisk/lock.h
trunk/main/channel.c
trunk/main/manager.c
trunk/res/res_features.c
Modified: trunk/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_channelredirect.c?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/apps/app_channelredirect.c (original)
+++ trunk/apps/app_channelredirect.c Thu Nov 15 10:20:47 2007
@@ -81,7 +81,7 @@
res = ast_parseable_goto(chan2, args.label);
- ast_mutex_unlock(&chan2->lock);
+ ast_channel_unlock(chan2);
quit:
return res;
Modified: trunk/apps/app_senddtmf.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_senddtmf.c?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/apps/app_senddtmf.c (original)
+++ trunk/apps/app_senddtmf.c Thu Nov 15 10:20:47 2007
@@ -102,13 +102,13 @@
}
if (!digit) {
astman_send_error(s, m, "No digit specified");
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(chan);
return 0;
}
ast_senddigit(chan, *digit, 0);
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(chan);
astman_send_ack(s, m, "DTMF successfully queued");
return 0;
Modified: trunk/apps/app_softhangup.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_softhangup.c?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/apps/app_softhangup.c (original)
+++ trunk/apps/app_softhangup.c Thu Nov 15 10:20:47 2007
@@ -104,11 +104,11 @@
ast_log(LOG_WARNING, "Soft hanging %s up.\n", c->name);
ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);
if (!ast_test_flag(&flags, OPTION_ALL)) {
- ast_mutex_unlock(&c->lock);
+ ast_channel_unlock(c);
break;
}
}
- ast_mutex_unlock(&c->lock);
+ ast_channel_unlock(c);
}
return 0;
Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Nov 15 10:20:47 2007
@@ -421,7 +421,7 @@
directly, use ast_softhangup() */
time_t whentohangup; /*!< Non-zero, set to actual time when channel is to be hung up */
pthread_t blocker; /*!< If anyone is blocking, this is them */
- ast_mutex_t lock; /*!< Lock, can be used to lock a channel for some operations - see ast_channel_lock() */
+ ast_mutex_t lock_dont_use; /*!< Lock, can be used to lock a channel for some operations - see ast_channel_lock() */
const char *blockproc; /*!< Procedure causing blocking */
const char *appl; /*!< Current application */
Modified: trunk/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/lock.h?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Thu Nov 15 10:20:47 2007
@@ -1167,13 +1167,13 @@
#ifndef DEBUG_CHANNEL_LOCKS
/*! \brief Lock a channel. If DEBUG_CHANNEL_LOCKS is defined
in the Makefile, print relevant output for debugging */
-#define ast_channel_lock(x) ast_mutex_lock(&x->lock)
+#define ast_channel_lock(x) ast_mutex_lock(&x->lock_dont_use)
/*! \brief Unlock a channel. If DEBUG_CHANNEL_LOCKS is defined
in the Makefile, print relevant output for debugging */
-#define ast_channel_unlock(x) ast_mutex_unlock(&x->lock)
+#define ast_channel_unlock(x) ast_mutex_unlock(&x->lock_dont_use)
/*! \brief Try locking a channel. If DEBUG_CHANNEL_LOCKS is defined
in the Makefile, print relevant output for debugging */
-#define ast_channel_trylock(x) ast_mutex_trylock(&x->lock)
+#define ast_channel_trylock(x) ast_mutex_trylock(&x->lock_dont_use)
#else
struct ast_channel;
Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Nov 15 10:20:47 2007
@@ -778,7 +778,7 @@
headp = &tmp->varshead;
AST_LIST_HEAD_INIT_NOLOCK(headp);
- ast_mutex_init(&tmp->lock);
+ ast_mutex_init(&tmp->lock_dont_use);
AST_LIST_HEAD_INIT_NOLOCK(&tmp->datastores);
@@ -1136,7 +1136,7 @@
if (chan->pbx)
ast_log(LOG_WARNING, "PBX may not have been terminated properly on '%s'\n", chan->name);
free_cid(&chan->cid);
- ast_mutex_destroy(&chan->lock);
+ ast_mutex_destroy(&chan->lock_dont_use);
/* Close pipes if appropriate */
if ((fd = chan->alertpipe[0]) > -1)
close(fd);
@@ -2883,13 +2883,13 @@
if (!chan->tech->get_base_channel || chan == chan->tech->get_base_channel(chan))
res = chan->tech->write(chan, f);
else {
- while (chan->tech->get_base_channel && (((base = chan->tech->get_base_channel(chan)) && ast_mutex_trylock(&base->lock)) || base == NULL)) {
- ast_mutex_unlock(&chan->lock);
+ while (chan->tech->get_base_channel && (((base = chan->tech->get_base_channel(chan)) && ast_channel_trylock(base)) || base == NULL)) {
+ ast_channel_unlock(chan);
usleep(1);
- ast_mutex_lock(&chan->lock);
+ ast_channel_lock(chan);
}
res = base->tech->write(base, f);
- ast_mutex_unlock(&base->lock);
+ ast_channel_unlock(base);
}
} else
res = 0;
@@ -3541,7 +3541,7 @@
/* We need the clone's lock, too */
ast_channel_lock(clone);
- ast_debug(2, "Got clone lock for masquerade on '%s' at %p\n", clone->name, &clone->lock);
+ ast_debug(2, "Got clone lock for masquerade on '%s' at %p\n", clone->name, &clone->lock_dont_use);
/* Having remembered the original read/write formats, we turn off any translation on either
one */
@@ -4670,12 +4670,12 @@
return 0;
}
- res = ast_mutex_unlock(&chan->lock);
+ res = ast_mutex_unlock(&chan->lock_dont_use);
if (option_debug > 2) {
#ifdef DEBUG_THREADS
int count = 0;
- if ((count = chan->lock.reentrancy))
+ if ((count = chan->lock_dont_use.reentrancy))
ast_debug(3, ":::=== Still have %d locks (recursive)\n", count);
#endif
if (!res)
@@ -4700,12 +4700,12 @@
ast_debug(4, "====:::: Locking AST channel %s\n", chan->name);
- res = ast_mutex_lock(&chan->lock);
+ res = ast_mutex_lock(&chan->lock_dont_use);
if (option_debug > 3) {
#ifdef DEBUG_THREADS
int count = 0;
- if ((count = chan->lock.reentrancy))
+ if ((count = chan->lock_dont_use.reentrancy))
ast_debug(4, ":::=== Now have %d locks (recursive)\n", count);
#endif
if (!res)
@@ -4729,12 +4729,12 @@
ast_debug(3, "====:::: Trying to lock AST channel %s\n", chan->name);
- res = ast_mutex_trylock(&chan->lock);
+ res = ast_mutex_trylock(&chan->lock_dont_use);
if (option_debug > 2) {
#ifdef DEBUG_THREADS
int count = 0;
- if ((count = chan->lock.reentrancy))
+ if ((count = chan->lock_dont_use.reentrancy))
ast_debug(3, ":::=== Now have %d locks (recursive)\n", count);
#endif
if (!res)
Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Thu Nov 15 10:20:47 2007
@@ -1759,7 +1759,7 @@
}
res = ast_sendtext(c, textmsg);
- ast_mutex_unlock(&c->lock);
+ ast_channel_unlock(c);
if (res > 0)
astman_send_ack(s, m, "Success");
Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=89293&r1=89292&r2=89293
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Thu Nov 15 10:20:47 2007
@@ -2449,17 +2449,17 @@
static void do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tmpchan)
{
ast_moh_stop(chan);
- ast_mutex_lock(&chan->lock);
+ ast_channel_lock(chan);
ast_setstate(tmpchan, chan->_state);
tmpchan->readformat = chan->readformat;
tmpchan->writeformat = chan->writeformat;
ast_channel_masquerade(tmpchan, chan);
- ast_mutex_lock(&tmpchan->lock);
+ ast_channel_lock(tmpchan);
ast_do_masquerade(tmpchan);
/* when returning from bridge, the channel will continue at the next priority */
ast_explicit_goto(tmpchan, chan->context, chan->exten, chan->priority + 1);
- ast_mutex_unlock(&tmpchan->lock);
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(tmpchan);
+ ast_channel_unlock(chan);
}
/*!
@@ -2490,9 +2490,9 @@
chana = ast_get_channel_by_name_prefix_locked(channela, strlen(channela));
chanb = ast_get_channel_by_name_prefix_locked(channelb, strlen(channelb));
if (chana)
- ast_mutex_unlock(&chana->lock);
+ ast_channel_unlock(chana);
if (chanb)
- ast_mutex_unlock(&chanb->lock);
+ ast_channel_unlock(chanb);
/* send errors if any of the channels could not be found/locked */
if (!chana) {
@@ -3186,7 +3186,7 @@
ast_module_user_remove(u);
return 0;
}
- ast_mutex_unlock(¤t_dest_chan->lock);
+ ast_channel_unlock(current_dest_chan);
/* answer the channel if needed */
if (current_dest_chan->_state != AST_STATE_UP)
More information about the svn-commits
mailing list