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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Mark Michelson 18 years ago
parent e7daf63fd8
commit 0270776ca5

@ -1086,7 +1086,7 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
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 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
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.
*/

Loading…
Cancel
Save