Perform deadlock avoidance on initial entry, too

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3343 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 17 insertions, 3 deletions

diff --git a/channel.c b/channel.c
index 510e0c0d1..4447c2755 100755
--- a/channel.c
+++ b/channel.c
@@ -451,14 +451,28 @@ void ast_channel_undefer_dtmf(struct ast_channel *chan)
 struct ast_channel *ast_channel_walk_locked(struct ast_channel *prev)
 {
 	/* Returns next channel (locked) */
-	struct ast_channel *l, *ret=NULL;
+	struct ast_channel *l, *ret;
 	int retries = 0;	
 retry:
+	ret=NULL;
 	ast_mutex_lock(&chlock);
 	l = channels;
 	if (!prev) {
-		if (l)
-			ast_mutex_lock(&l->lock);
+		if (l) {
+			if (ast_mutex_trylock(&l->lock)) {
+				if (retries < 10)
+					ast_log(LOG_DEBUG, "Avoiding initial deadlock for '%s'\n", ret->name);
+				else
+					ast_log(LOG_WARNING, "Avoided initial deadlock for '%s', %d retries!\n", ret->name, retries);
+				ast_mutex_unlock(&chlock);
+				if (retries < 10) {
+					usleep(1);
+					retries++;
+					goto retry;
+				} else
+					return NULL;
+			}
+		}
 		ast_mutex_unlock(&chlock);
 		return l;
 	}