[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r325530 - /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Jun 29 05:44:22 2011
New Revision: 325530

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325530
Log:
Remove Deadlock avoidance added to chan_sip.c these measures are resolved upstream

Modified:
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c

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=325530&r1=325529&r2=325530
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Wed Jun 29 05:44:22 2011
@@ -6148,10 +6148,7 @@
 	} else
 		ast_debug(1, "Hangup call %s, SIP callid %s\n", ast->name, p->callid);
 
-	while (sip_pvt_trylock(p)) {
-		CHANNEL_DEADLOCK_AVOIDANCE(ast);
-	}
-
+	sip_pvt_lock(p);
 	if (ast_test_flag(&p->flags[0], SIP_INC_COUNT) || ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) {
 		if (sipdebug)
 			ast_debug(1, "update_call_counter(%s) - decrement call limit counter on hangup\n", p->username);
@@ -6379,9 +6376,7 @@
 			return 0;
 		}
 		if (p) {
-			while (sip_pvt_trylock(p)) {
-				CHANNEL_DEADLOCK_AVOIDANCE(ast);
-			}
+			sip_pvt_lock(p);
 			if (p->t38.state == T38_ENABLED) {
 				/* drop frame, can't sent VOICE frames while in T.38 mode */
 				sip_pvt_unlock(p);
@@ -6680,9 +6675,7 @@
 	struct sip_pvt *p = ast->tech_pvt;
 	int res = 0;
 
-	while (sip_pvt_trylock(p)) {
-		CHANNEL_DEADLOCK_AVOIDANCE(ast);
-	}
+	sip_pvt_lock(p);
 	switch(condition) {
 	case AST_CONTROL_RINGING:
 		if (ast->_state == AST_STATE_RING) {
@@ -7309,10 +7302,7 @@
 	struct sip_pvt *p = ast->tech_pvt;
 	int faxdetected = FALSE;
 
-	while (sip_pvt_trylock(p)) {
-		CHANNEL_DEADLOCK_AVOIDANCE(ast);
-	}
-
+	sip_pvt_lock(p);
 	fr = sip_rtp_read(ast, p, &faxdetected);
 	p->lastrtprx = time(NULL);
 
@@ -28892,10 +28882,7 @@
 		return AST_RTP_GLUE_RESULT_FORBID;
 	}
 
-	while (sip_pvt_trylock(p)) {
-		CHANNEL_DEADLOCK_AVOIDANCE(chan);
-	}
-
+	sip_pvt_lock(p);
 	if (!(p->rtp)) {
 		sip_pvt_unlock(p);
 		return AST_RTP_GLUE_RESULT_FORBID;