[asterisk-commits] dvossel: branch 1.6.2 r286071 - /branches/1.6.2/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Sep 10 15:04:47 CDT 2010
Author: dvossel
Date: Fri Sep 10 15:04:43 2010
New Revision: 286071
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286071
Log:
Blocked revisions 286070 via svnmerge
........
r286070 | dvossel | 2010-09-10 15:03:50 -0500 (Fri, 10 Sep 2010) | 32 lines
Fixes sip extension state update DEADLOCK
PROBLEM:
In chan_sip, and all the other channel drivers, it is common for
us to hold the tech_pvt lock while we ask the Asterisk core about
an extension and context. Every time we do this the locking
order becomes, (1. tech_pvt lock ---> 2. global context lock). In
chan_sip when a dialog subscribes to a hint, that locking order
is reversed in the extensionstate callback which will occur outside
of the channel_driver's monitor loop. So, on an extension state
update we have (1. global context lock ----> 2. tech_pvt lock).
Typically when we have to do a reversed locking order like this
we'd just do some sort of deadlock avoidance to fix the problem...
That will not work here. There are more locks involved here than
just the context and tech_pvt. Those are the two that are colliding,
but it is impossible to give up the context lock because the global
hints list lock MUST be held as well and we can not give that lock
up during the extensionstate callback traversal... The locking order
for the context and hints are (1. global context lock ----> 2.
hints list lock). Deadlock avoidance is not an option here.
SOLUTION:
The solution this patch implements is to queue the extension state updates
into a list and send the NOTIFY messages out during the do_monitor pvt
traversal. This clears out the problem of having to hold the context
lock before the tech_pvt lock entirely.
(closes issue #17888)
Reported by: zerohalo
........
Modified:
branches/1.6.2/ (props changed)
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-blocked (original)
+++ branch-1.4-blocked Fri Sep 10 15:04:43 2010
@@ -1,1 +1,1 @@
-/branches/1.4:279344,281185
+/branches/1.4:279344,281185,286070
More information about the asterisk-commits
mailing list