diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 02:34:11 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 02:34:11 +0000 |
| commit | 6d937eee360431e9ef782942368d15263d7376ff (patch) | |
| tree | 5b9f31de4abfe65b58eab4424d3e6556492634ee /channels/chan_iax2.c | |
| parent | e8943c25e55dd214c40ab2f84feb9d916a44abfc (diff) | |
More expansion of the deadlock avoidance macro, including a macro to do locking
of the channel lock
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125020 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index aeae13b70..2432a6bb4 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2248,9 +2248,7 @@ retry: if (owner) { if (ast_channel_trylock(owner)) { ast_debug(3, "Avoiding IAX destroy deadlock\n"); - ast_mutex_unlock(&iaxsl[callno]); - usleep(1); - ast_mutex_lock(&iaxsl[callno]); + DEADLOCK_AVOIDANCE(&iaxsl[callno]); goto retry; } } |