[asterisk-commits] russell: branch 1.4 r142354 - /branches/1.4/main/sched.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Sep 10 11:39:53 2008
New Revision: 142354

URL: http://svn.digium.com/view/asterisk?view=rev&rev=142354
Log:
It is a normal situation that a task gets put in the scheduler that should run
as soon as possible.  Accept "0" as an acceptable time to run, and also treat
negative as "run now", and don't print a debug message about it.

(inspired by a message asking about the "request to schedule in the past"
 debug message on the -dev list)

Modified:
    branches/1.4/main/sched.c

Modified: branches/1.4/main/sched.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/sched.c?view=diff&rev=142354&r1=142353&r2=142354
==============================================================================
--- branches/1.4/main/sched.c (original)
+++ branches/1.4/main/sched.c Wed Sep 10 11:39:53 2008
@@ -201,7 +201,6 @@
 		*tv = now;
 	*tv = ast_tvadd(*tv, ast_samp2tv(when, 1000));
 	if (ast_tvcmp(*tv, now) < 0) {
-		ast_log(LOG_DEBUG, "Request to schedule in the past?!?!\n");
 		*tv = now;
 	}
 	return 0;
@@ -215,11 +214,9 @@
 {
 	struct sched *tmp;
 	int res = -1;
+
 	DEBUG(ast_log(LOG_DEBUG, "ast_sched_add()\n"));
-	if (!when) {
-		ast_log(LOG_NOTICE, "Scheduled event in 0 ms?\n");
-		return -1;
-	}
+
 	ast_mutex_lock(&con->lock);
 	if ((tmp = sched_alloc(con))) {
 		tmp->id = con->eventcnt++;
@@ -241,6 +238,7 @@
 		ast_sched_dump(con);
 #endif
 	ast_mutex_unlock(&con->lock);
+
 	return res;
 }