kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-18 18:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a typo in the non-DEBUG_THREADS version of the recently added DEADLOCK_AVOIDANCE()

Browse Source 
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 ...)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@126573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-06-30 16:05:08 +00:00
parent af5c8fedce
commit 791f9b12d3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/lock.h
View File

@@ -712,9 +712,9 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c
#else /* !DEBUG_THREADS */ #else /* !DEBUG_THREADS */
#define DEADLOCK_AVOIDANCE(lock) \ #define DEADLOCK_AVOIDANCE(lock) \
ast_mutex_lock(lock); \ ast_mutex_unlock(lock); \
usleep(1); \ usleep(1); \
ast_mutex_unlock(lock); ast_mutex_lock(lock);
typedef pthread_mutex_t ast_mutex_t; typedef pthread_mutex_t ast_mutex_t;