Merged revisions 331775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331775 | mnicholson | 2011-08-12 14:03:31 -0500 (Fri, 12 Aug 2011) | 17 lines Merged revisions 331774 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r331774 | mnicholson | 2011-08-12 14:01:27 -0500 (Fri, 12 Aug 2011) | 11 lines Unlock the channel before calling update_queue. Holding the channel lock when calling update_queue which attempts to lock the queue lock can cause a deadlock. This deadlock involves the following chain: 1. hold chan lock -> wait queue lock 2. hold queue lock -> wait agent list lock 3. hold agent list lock -> wait chan list lock 4. hold chan list lock -> wait chan lock ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
28e2aa76b2
commit
c9f65ece49
1 changed files with 3 additions and 1 deletions
|
@ -5156,8 +5156,11 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
||||||
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
|
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
|
||||||
ast_channel_datastore_remove(qe->chan, tds);
|
ast_channel_datastore_remove(qe->chan, tds);
|
||||||
}
|
}
|
||||||
|
ast_channel_unlock(qe->chan);
|
||||||
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
|
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
|
||||||
} else {
|
} else {
|
||||||
|
ast_channel_unlock(qe->chan);
|
||||||
|
|
||||||
/* We already logged the TRANSFER on the queue_log, but we still need to send the AgentComplete event */
|
/* We already logged the TRANSFER on the queue_log, but we still need to send the AgentComplete event */
|
||||||
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
|
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
|
||||||
}
|
}
|
||||||
|
@ -5165,7 +5168,6 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
||||||
if (transfer_ds) {
|
if (transfer_ds) {
|
||||||
ast_datastore_free(transfer_ds);
|
ast_datastore_free(transfer_ds);
|
||||||
}
|
}
|
||||||
ast_channel_unlock(qe->chan);
|
|
||||||
ast_hangup(peer);
|
ast_hangup(peer);
|
||||||
res = bridge ? bridge : 1;
|
res = bridge ? bridge : 1;
|
||||||
ao2_ref(member, -1);
|
ao2_ref(member, -1);
|
||||||
|
|
Loading…
Reference in a new issue