Merged revisions 124965 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r124965 | tilghman | 2008-06-24 19:46:24 -0500 (Tue, 24 Jun 2008) | 7 lines

Pvt deadlock causes some channels to get stuck in Reserved status.
(closes issue #12621)
 Reported by: fabianoheringer
 Patches:
       20080612__bug12621.diff.txt uploaded by Corydon76 (license 14)
 Tested by: fabianoheringer

........

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2b1ea8a..54d8b43 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -5196,10 +5196,11 @@ static struct ast_frame  *dahdi_read(struct ast_channel *ast)
        int index;
        void *readbuf;
        struct ast_frame *f;
-       
 
-       ast_mutex_lock(&p->lock);
-       
+       while (ast_mutex_trylock(&p->lock)) {
+               CHANNEL_DEADLOCK_AVOIDANCE(ast);
+       }
+
        index = dahdi_get_index(ast, p, 0);
        
        /* Hang up if we don't really exist */

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 516c462..3f261c6 100644 (file)
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -261,6 +261,20 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
  * used during deadlock avoidance, to preserve the original location where
  * a lock was originally acquired.
  */
+#define CHANNEL_DEADLOCK_AVOIDANCE(chan) \
+       do { \
+               const char *__filename, *__func, *__mutex_name; \
+               int __lineno; \
+               int __res = ast_find_lock_info(&chan->lock_dont_use, &__filename, &__lineno, &__func, &__mutex_name); \
+               ast_channel_unlock(chan); \
+               usleep(1); \
+               if (__res < 0) { /* Shouldn't ever happen, but just in case... */ \
+                       ast_channel_lock(chan); \
+               } else { \
+                       __ast_pthread_mutex_lock(__filename, __lineno, __func, __mutex_name, &chan->lock_dont_use); \
+               } \
+       } while (0)
+
 #define DEADLOCK_AVOIDANCE(lock) \
        do { \
                const char *__filename, *__func, *__mutex_name; \
@@ -1405,6 +1419,11 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
 
 #else /* !DEBUG_THREADS */
 
+#define        CHANNEL_DEADLOCK_AVOIDANCE(chan) \
+       ast_channel_lock(chan); \
+       usleep(1); \
+       ast_channel_unlock(chan);
+
 #define        DEADLOCK_AVOIDANCE(lock) \
        ast_mutex_lock(lock); \
        usleep(1); \