aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-20 23:14:26 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-20 23:14:26 +0000
commita4c902b217eb40bc898df06e9671f537bb6b2881 (patch)
treeb89dcc84949dc5f5125a5e08ca6681caf7d0d8dd
parent32b50e2536745ac6e755acd4fbcc7d9bf816307a (diff)
Merged revisions 110396 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r110396 | russell | 2008-03-20 18:14:13 -0500 (Thu, 20 Mar 2008) | 17 lines Merged revisions 110395 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110395 | russell | 2008-03-20 18:13:56 -0500 (Thu, 20 Mar 2008) | 9 lines Shorten the ast_waitfor() timeout from 500 ms to 50 ms in the autoservice thread. This really should not make a difference except in very rare cases. That case would be that all of the channels in autoservice are not generating any frames. In that case, this change reduces the potential amount of time that a thread waits in ast_autoservice_stop() for the autoservice thread to wrap back around to the beginning of its loop. (closes issue #12266, reported by dimas) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@110397 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/autoservice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/autoservice.c b/main/autoservice.c
index 836dfab63..3b267a6ab 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -87,7 +87,7 @@ static void *autoservice_run(void *ign)
for (;;) {
struct ast_channel *mons[MAX_AUTOMONS], *chan;
struct asent *as;
- int x = 0, ms = 500;
+ int x = 0, ms = 50;
AST_LIST_LOCK(&aslist);