[svn-commits] russell: trunk r281576 - in /trunk: ./ main/sched.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Aug 10 13:05:40 2010
New Revision: 281576

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=281576
Log:
Merged revisions 281575 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r281575 | russell | 2010-08-10 13:05:07 -0500 (Tue, 10 Aug 2010) | 16 lines
  
  Merged revisions 281574 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r281574 | russell | 2010-08-10 13:04:32 -0500 (Tue, 10 Aug 2010) | 9 lines
    
    Don't move the time threshold for running scheduled events on every iteration.
    
    Instead, only calculate the time threshold each time ast_sched_runq() is called.
    
    (closes issue #17742)
    Reported by: schmidts
    Patches:
          sched.c.patch uploaded by schmidts (license 1077)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/sched.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/sched.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/sched.c?view=diff&rev=281576&r1=281575&r2=281576
==============================================================================
--- trunk/main/sched.c (original)
+++ trunk/main/sched.c Tue Aug 10 13:05:40 2010
@@ -604,13 +604,13 @@
 		
 	ast_mutex_lock(&con->lock);
 
+	when = ast_tvadd(ast_tvnow(), ast_tv(0, 1000));
 	for (numevents = 0; (current = ast_heap_peek(con->sched_heap, 1)); numevents++) {
 		/* schedule all events which are going to expire within 1ms.
 		 * We only care about millisecond accuracy anyway, so this will
 		 * help us get more than one event at one time if they are very
 		 * close together.
 		 */
-		when = ast_tvadd(ast_tvnow(), ast_tv(0, 1000));
 		if (ast_tvcmp(current->when, when) != -1) {
 			break;
 		}