diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-29 12:38:04 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-29 12:38:04 +0000 |
commit | 831b80f040a24651d30e174b107d1535f7194ec7 (patch) | |
tree | c174191e77cb02106581facc32eeb6f81817be39 /channel.c | |
parent | 7e88647e56d67fe3d01781e3e3a0d695c737792d (diff) |
Perform deadlock avoidance on initial entry, too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3343 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rwxr-xr-x | channel.c | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -451,14 +451,28 @@ void ast_channel_undefer_dtmf(struct ast_channel *chan) struct ast_channel *ast_channel_walk_locked(struct ast_channel *prev) { /* Returns next channel (locked) */ - struct ast_channel *l, *ret=NULL; + struct ast_channel *l, *ret; int retries = 0; retry: + ret=NULL; ast_mutex_lock(&chlock); l = channels; if (!prev) { - if (l) - ast_mutex_lock(&l->lock); + if (l) { + if (ast_mutex_trylock(&l->lock)) { + if (retries < 10) + ast_log(LOG_DEBUG, "Avoiding initial deadlock for '%s'\n", ret->name); + else + ast_log(LOG_WARNING, "Avoided initial 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 l; } |