[asterisk-commits] mmichelson: trunk r93626 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Dec 18 11:05:19 2007
New Revision: 93626

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93626
Log:
Merged revisions 93625 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r93625 | mmichelson | 2007-12-18 11:02:48 -0600 (Tue, 18 Dec 2007) | 6 lines

Rework deadlock avoidance used in ast_write, since it meant that agent channels which were being monitored
had one audio file recorded and one empty audio file saved.

(closes issue #11529, reported by atis patched by me)


........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=93626&r1=93625&r2=93626
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Dec 18 11:05:19 2007
@@ -2740,9 +2740,18 @@
 {
 	int res = -1;
 	struct ast_frame *f = NULL, *f2 = NULL;
-
+	int count = 0;
+
+	/*Deadlock avoidance*/
+	while(ast_channel_trylock(chan)) {
+		/*cannot goto done since the channel is not locked*/
+		if(count++ > 10) {
+			ast_debug(1, "Deadlock avoided for write to channel '%s'\n", chan->name);
+			return 0;
+		}
+		usleep(1);
+	}
 	/* Stop if we're a zombie or need a soft hangup */
-	ast_channel_lock(chan);
 	if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan))
 		goto done;
 
@@ -2886,20 +2895,9 @@
 			}
 		}
 
-		if (f) {
-			struct ast_channel *base = NULL;
-			if (!chan->tech->get_base_channel || chan == chan->tech->get_base_channel(chan))
-				res = chan->tech->write(chan, f);
-			else {
-				while (chan->tech->get_base_channel && (((base = chan->tech->get_base_channel(chan)) && ast_channel_trylock(base)) || base == NULL)) {
-					ast_channel_unlock(chan);
-					usleep(1);
-					ast_channel_lock(chan);
-				}
-				res = base->tech->write(base, f);
-				ast_channel_unlock(base);
-			}
-		} else
+		if (f) 
+			res = chan->tech->write(chan,f);
+		else
 			res = 0;
 		break;
 	case AST_FRAME_NULL: