dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Avoid potential deadlocks in channel_walk_locked, and detect serious failures 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3340 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-06-29 10:51:00 +00:00
parent e4eae0813e
commit 53b18116f3
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
channel.c
View File

@ -452,6 +452,8 @@ struct ast_channel *ast_channel_walk_locked(struct ast_channel *prev)
{
/* Returns next channel (locked) */
struct ast_channel *l, *ret=NULL;
int retries = 0;
retry:
ast_mutex_lock(&chlock);
l = channels;
if (!prev) {
@ -465,8 +467,21 @@ struct ast_channel *ast_channel_walk_locked(struct ast_channel *prev)
ret = l->next;
l = l->next;
}
if (ret)
ast_mutex_lock(&ret->lock);
if (ret) {
if (ast_mutex_trylock(&ret->lock)) {
if (retries < 10)
ast_log(LOG_DEBUG, "Avoiding deadlock for '%s'\n", ret->name);
else
ast_log(LOG_WARNING, "Avoided deadlock for '%s', %d retries!\n", ret->name, retries);
ast_mutex_unlock(&chlock);
if (retries < 10) {
usleep(1);
retries++;
goto retry;
} else
return NULL;
}
}
ast_mutex_unlock(&chlock);
return ret;