[asterisk-commits] russell: branch 1.6.0 r110397 - in /branches/1.6.0: ./ main/autoservice.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Mar 20 18:14:26 2008
New Revision: 110397

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110397
Log:
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)

........

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

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

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

Modified: branches/1.6.0/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/autoservice.c?view=diff&rev=110397&r1=110396&r2=110397
==============================================================================
--- branches/1.6.0/main/autoservice.c (original)
+++ branches/1.6.0/main/autoservice.c Thu Mar 20 18:14:26 2008
@@ -87,7 +87,7 @@
 	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);