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_h323.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_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 9951d1240..fc0c7f3c0 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -304,9 +304,7 @@ static int oh323_simulate_dtmf_end(const void *data) ast_mutex_lock(&pvt->lock); /* Don't hold pvt lock while trying to lock the channel */ while(pvt->owner && ast_channel_trylock(pvt->owner)) { - ast_mutex_unlock(&pvt->lock); - usleep(1); - ast_mutex_lock(&pvt->lock); + DEADLOCK_AVOIDANCE(&pvt->lock); } if (pvt->owner) { |