diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-14 17:42:55 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-14 17:42:55 +0000 |
| commit | 2f26951db771319589184e71861e024b38489516 (patch) | |
| tree | a98bf37d2c259e26031375a1325a68c0b575dcda /main | |
| parent | 525727c8a3caa148ceff6a63cbfddf4f14ffa6c3 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114119 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 5241ff8a3..394fd9061 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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. */ |