[asterisk-commits] rmudgett: branch 10 r367981 - in /branches/10: ./ channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed May 30 13:07:28 2012
New Revision: 367981

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=367981
Log:
Use the DEADLOCK_AVOIDANCE() macro instead.

(issue ASTERISK-19854)
........

Merged revisions 367980 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/channels/sig_pri.c
    branches/10/channels/sig_ss7.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/sig_pri.c?view=diff&rev=367981&r1=367980&r2=367981
==============================================================================
--- branches/10/channels/sig_pri.c (original)
+++ branches/10/channels/sig_pri.c Wed May 30 13:07:28 2012
@@ -1199,9 +1199,7 @@
 
 		/* Avoid deadlock */
 		sig_pri_unlock_private(pri->pvts[chanpos]);
-		ast_mutex_unlock(&pri->lock);
-		sched_yield();
-		ast_mutex_lock(&pri->lock);
+		DEADLOCK_AVOIDANCE(&pri->lock);
 		sig_pri_lock_private(pri->pvts[chanpos]);
 	}
 }

Modified: branches/10/channels/sig_ss7.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/sig_ss7.c?view=diff&rev=367981&r1=367980&r2=367981
==============================================================================
--- branches/10/channels/sig_ss7.c (original)
+++ branches/10/channels/sig_ss7.c Wed May 30 13:07:28 2012
@@ -312,9 +312,7 @@
 
 		/* Avoid deadlock */
 		sig_ss7_unlock_private(ss7->pvts[chanpos]);
-		ast_mutex_unlock(&ss7->lock);
-		sched_yield();
-		ast_mutex_lock(&ss7->lock);
+		DEADLOCK_AVOIDANCE(&ss7->lock);
 		sig_ss7_lock_private(ss7->pvts[chanpos]);
 	}
 }