[asterisk-commits] tilghman: branch 1.6.0 r124967 - in /branches/1.6.0: ./ channels/ include/ast...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jun 24 20:13:38 2008
New Revision: 124967

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

................
r124966 | tilghman | 2008-06-24 20:08:37 -0500 (Tue, 24 Jun 2008) | 15 lines

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

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c
    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/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=124967&r1=124966&r2=124967
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Jun 24 20:13:38 2008
@@ -5208,10 +5208,11 @@
 	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 */

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=124967&r1=124966&r2=124967
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Tue Jun 24 20:13:38 2008
@@ -204,6 +204,20 @@
  * 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; \
@@ -1067,6 +1081,11 @@
 
 #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); \