diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-05-29 17:35:19 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-05-29 17:35:19 +0000 |
| commit | 6e5d843a719d87dc2b3833347fde404c4c228b77 (patch) | |
| tree | e50351cd486e0a7298a3de06f70964fe2b1de70b /channels/chan_agent.c | |
| parent | 9a535bd115207d8e5e721336fde015642c562dd0 (diff) | |
Merged revisions 118953 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r118953 | tilghman | 2008-05-29 12:20:16 -0500 (Thu, 29 May 2008) | 3 lines
Add some debugging code that ensures that when we do deadlock avoidance, we
don't lose the information about how a lock was originally acquired.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@118955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_agent.c')
| -rw-r--r-- | channels/chan_agent.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index decf022c4..8d22eadf9 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1520,9 +1520,7 @@ static int agent_logoff(const char *agent, int soft) ast_mutex_lock(&p->lock); while (p->owner && ast_channel_trylock(p->owner)) { - ast_mutex_unlock(&p->lock); - usleep(1); - ast_mutex_lock(&p->lock); + DEADLOCK_AVOIDANCE(&p->lock); } if (p->owner) { ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT); @@ -1530,9 +1528,7 @@ static int agent_logoff(const char *agent, int soft) } while (p->chan && ast_channel_trylock(p->chan)) { - ast_mutex_unlock(&p->lock); - usleep(1); - ast_mutex_lock(&p->lock); + DEADLOCK_AVOIDANCE(&p->lock); } if (p->chan) { ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT); |