diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-06-25 02:34:11 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-06-25 02:34:11 +0000 |
| commit | 94c4089f4eebc7c28346f97265119d238a92afbe (patch) | |
| tree | 5b9f31de4abfe65b58eab4424d3e6556492634ee /channels/chan_iax2.c | |
| parent | 15093f2a63eb32e45ce42b6e00b14211d611e999 (diff) | |
More expansion of the deadlock avoidance macro, including a macro to do locking
of the channel lock
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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; } } |