Use the DEADLOCK_AVOIDANCE() macro instead.

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@367981 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 4825d12884e2179da69649f73ac4f753e169b865..fd01f506063163956845898895fedc4af729872d 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -1199,9 +1199,7 @@ static void sig_pri_lock_owner(struct sig_pri_span *pri, int chanpos)
 
                /* 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]);
        }
 }

diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c
index 263d57498a75f70aacc81cc022c0ccdf28503674..a8a38878879540de06819f0c0f18dc71c5de1936 100644 (file)
--- a/channels/sig_ss7.c
+++ b/channels/sig_ss7.c
@@ -312,9 +312,7 @@ static void sig_ss7_lock_owner(struct sig_ss7_linkset *ss7, int chanpos)
 
                /* 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]);
        }
 }