dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 84783 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84783 | russell | 2007-10-05 11:44:21 -0500 (Fri, 05 Oct 2007) | 4 lines

Do deadlock avoidance in a couple more places.  You can't lock two channels
at the same time without doing extra work to make sure it succeeds.
(closes issue #10895, patch by me)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@84784 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2007-10-05 16:49:16 +00:00
parent cee99650f4
commit f0db93aa78
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_zap.c
View File

@ -3475,7 +3475,11 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
return AST_BRIDGE_FAILED_NOWARN;
ast_channel_lock(c0);
ast_channel_lock(c1);
while (ast_channel_trylock(c1)) {
ast_channel_unlock(c0);
usleep(1);
ast_channel_lock(c0);
}
p0 = c0->tech_pvt;
p1 = c1->tech_pvt;
@ -3641,8 +3645,13 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
/* Here's our main loop... Start by locking things, looking for private parts,
and then balking if anything is wrong */
ast_channel_lock(c0);
ast_channel_lock(c1);
while (ast_channel_trylock(c1)) {
ast_channel_unlock(c0);
usleep(1);
ast_channel_lock(c0);
}
p0 = c0->tech_pvt;
p1 = c1->tech_pvt;