Merged revisions 142354 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r142354 | russell | 2008-09-10 11:39:53 -0500 (Wed, 10 Sep 2008) | 7 lines

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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142355 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/sched.c b/main/sched.c
index 712b85759b9b187b258675e9a4b3ebc67d9fef85..d62ca115e4ecf1c53d71492f20bce513ecd04ae9 100644 (file)
--- a/main/sched.c
+++ b/main/sched.c
@@ -254,7 +254,6 @@ static int sched_settime(struct timeval *t, int when)
                *t = now;
        *t = ast_tvadd(*t, ast_samp2tv(when, 1000));
        if (ast_tvcmp(*t, now) < 0) {
-               ast_debug(1, "Request to schedule in the past?!?!\n");
                *t = now;
        }
        return 0;
@@ -276,11 +275,9 @@ int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb cal
 {
        struct sched *tmp;
        int res = -1;
+
        DEBUG(ast_debug(1, "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++;
@@ -302,6 +299,7 @@ int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb cal
                ast_sched_dump(con);
 #endif
        ast_mutex_unlock(&con->lock);
+
        return res;
 }