[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r319076 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon May 16 06:14:49 2011
New Revision: 319076

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319076
Log:
Add another deadlock avoidance

=== Thread ID: -1369711760 (do_monitor           started at [24733] chan_sip.c restart_monitor())
=== ---> Lock #0 (chan_sip.c): MUTEX 24226 handle_request_do &netlock 0xb55466a0 (1)
=== ---> Lock #1 (chan_sip.c): MUTEX 22130 local_attended_transfer transferer 0xa3278f8 (1)
=== ---> Waiting for Lock #2 (channel.c): MUTEX 1361 __ast_queue_frame chan 0xa8b0808 (1)
=== --- ---> Locked Here: channel.c line 6270 (ast_do_masquerade)
=== -------------------------------------------------------------------
===
=== Thread ID: -1378321552 (pbx_thread           started at [ 5042] pbx.c ast_pbx_start())
=== ---> Lock #0 (channel.c): MUTEX 6249 ast_do_masquerade channels 0xb6482388 (1)
=== ---> Lock #1 (channel.c): MUTEX 6246 ast_do_masquerade original 0xa5abc60 (2)
=== ---> Lock #2 (channel.c): MUTEX 6270 ast_do_masquerade clonechan 0xa8b0808 (1)
=== ---> Waiting for Lock #3 (chan_sip.c): MUTEX 6517 sip_indicate p 0xa3278f8 (1)
=== --- ---> Locked Here: chan_sip.c line 22130 (local_attended_transfer)
=== -------------------------------------------------------------------


Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/cel/cel_odbc.c   (props changed)
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c
    team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/distrotech-customers-trunk/sounds/Makefile   (props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 06:14:49 2011
@@ -1,4 +1,4 @@
 /team/irroot/app_queue-trunk:318983-319002
 /team/irroot/distrotech-customers:318992-318995,318997-319000
-/team/irroot/distrotech-customers-1.8:319062
+/team/irroot/distrotech-customers-1.8:319062,319075
 /team/irroot/t38gateway-trunk:318974-319016,319064,319067,319071

Propchange: team/irroot/distrotech-customers-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 06:14:49 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
 /team/irroot/app_queue-trunk/cel/cel_odbc.c:318983-319002
 /team/irroot/distrotech-customers/cel/cel_odbc.c:318992-319000
-/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062
+/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062,319075
 /team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319016,319064,319067,319071

Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=319076&r1=319075&r2=319076
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Mon May 16 06:14:49 2011
@@ -6625,7 +6625,9 @@
 	struct sip_pvt *p = ast->tech_pvt;
 	int res = 0;
 
-	sip_pvt_lock(p);
+	while (sip_pvt_trylock(p)) {
+		CHANNEL_DEADLOCK_AVOIDANCE(ast);
+	}
 	switch(condition) {
 	case AST_CONTROL_RINGING:
 		if (ast->_state == AST_STATE_RING) {

Propchange: team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 06:14:49 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
 /team/irroot/app_queue-trunk/configs/cel_odbc.conf.sample:318983-319002
 /team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-319000
-/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062
+/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062,319075
 /team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319016,319064,319067,319071

Propchange: team/irroot/distrotech-customers-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 06:14:49 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/sounds/Makefile:256426
 /team/irroot/app_queue-trunk/sounds/Makefile:318983-319002
 /team/irroot/distrotech-customers/sounds/Makefile:318992-319000
-/team/irroot/distrotech-customers-1.8/sounds/Makefile:319062
+/team/irroot/distrotech-customers-1.8/sounds/Makefile:319062,319075
 /team/irroot/t38gateway-trunk/sounds/Makefile:318974-319016,319064,319067,319071