kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@68731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-11 15:25:48 +00:00
parent ebfa098f5e
commit b1e34e49e1
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channel.c
View File

@@ -771,19 +771,29 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
/* exit if chan not found or mutex acquired successfully */ /* exit if chan not found or mutex acquired successfully */
done = (c == NULL) || (ast_mutex_trylock(&c->lock) == 0); done = (c == NULL) || (ast_mutex_trylock(&c->lock) == 0);
/* this is slightly unsafe, as we _should_ hold the lock to access c->name */ /* this is slightly unsafe, as we _should_ hold the lock to access c->name */
if (!done && c) if (!done && c) {
ast_log(LOG_DEBUG, "Avoiding %s for '%s'\n", msg, c->name); ast_log(LOG_DEBUG, "Avoiding %s for '%s'\n", msg, c->name);
if (retries == 9) {
/* We are about to fail due to a deadlock, so report this
* while we still have the list lock.
*/
ast_log(LOG_WARNING, "Avoided %s for '%p', %d retries!\n", msg, c, retries);
/* As we have deadlocked, we will skip this channel and see if
* there is another match.
* NOTE: No point doing this for a full-name match, as there
* can be no more matches.
*/
if (!(name && !namelen)) {
prev = c;
retries = -1;
}
}
}
ast_mutex_unlock(&chlock); ast_mutex_unlock(&chlock);
if (done) if (done)
return c; return c;
usleep(1); usleep(1);
} }
/*
* c is surely not null, but we don't have the lock so cannot
* access c->name
*/
ast_log(LOG_WARNING, "Avoided %s for '%p', %d retries!\n",
msg, c, retries);
return NULL; return NULL;
} }