[asterisk-commits] russell: branch 1.6.0 r126575 - in /branches/1.6.0: ./ include/asterisk/lock.h

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jun 30 11:09:52 2008
New Revision: 126575

URL: http://svn.digium.com/view/asterisk?view=rev&rev=126575
Log:
Merged revisions 126574 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r126574 | russell | 2008-06-30 11:07:25 -0500 (Mon, 30 Jun 2008) | 18 lines

Merged revisions 126573 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126573 | russell | 2008-06-30 11:05:08 -0500 (Mon, 30 Jun 2008) | 10 lines

Fix a typo in the non-DEBUG_THREADS version of the recently added DEADLOCK_AVOIDANCE()
macro.  This caused the lock to not actually be released, and as a result, not
avoid deadlocks at all.  This resolves the issues reported in the last while about
Asterisk locking up all over the place (and most commonly, in chan_iax2).

(closes issue #12927)
(closes issue #12940)
(closes issue #12925)
(potentially closes others ...)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/lock.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/lock.h?view=diff&rev=126575&r1=126574&r2=126575
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Mon Jun 30 11:09:52 2008
@@ -1082,14 +1082,14 @@
 #else /* !DEBUG_THREADS */
 
 #define	CHANNEL_DEADLOCK_AVOIDANCE(chan) \
-	ast_channel_lock(chan); \
+	ast_channel_unlock(chan); \
 	usleep(1); \
-	ast_channel_unlock(chan);
+	ast_channel_lock(chan);
 
 #define	DEADLOCK_AVOIDANCE(lock) \
-	ast_mutex_lock(lock); \
+	ast_mutex_unlock(lock); \
 	usleep(1); \
-	ast_mutex_unlock(lock);
+	ast_mutex_lock(lock);
 
 static inline int ast_rwlock_init(ast_rwlock_t *prwlock)
 {