[asterisk-commits] mmichelson: branch 1.6.0 r114119 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Apr 14 12:42:55 2008
New Revision: 114119

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

................
r114118 | mmichelson | 2008-04-14 12:42:20 -0500 (Mon, 14 Apr 2008) | 19 lines

Merged revisions 114117 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114117 | mmichelson | 2008-04-14 12:41:03 -0500 (Mon, 14 Apr 2008) | 11 lines

Increase the retry count when attempting to show channels. This apparently
cleared an issue someone was seeing when attempting to show channels when
the load was high.

(closes issue #11667)
Reported by: falves11
Patches:
      11677.txt uploaded by russell (license 2)
Tested by: falves11


........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=114119&r1=114118&r2=114119
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Mon Apr 14 12:42:55 2008
@@ -1086,7 +1086,7 @@
 	struct ast_channel *c;
 	const struct ast_channel *_prev = prev;
 
-	for (retries = 0; retries < 10; retries++) {
+	for (retries = 0; retries < 200; retries++) {
 		int done;
 		AST_RWLIST_RDLOCK(&channels);
 		AST_RWLIST_TRAVERSE(&channels, c, chan_list) {
@@ -1127,7 +1127,7 @@
 		done = c == NULL || ast_channel_trylock(c) == 0;
 		if (!done) {
 			ast_debug(1, "Avoiding %s for channel '%p'\n", msg, c);
-			if (retries == 9) {
+			if (retries == 199) {
 				/* We are about to fail due to a deadlock, so report this
 				 * while we still have the list lock.
 				 */